[PATCH 1/1] [Jaunty] UBUNTU: update the templates so that we have spaces following the title line

Tim Gardner tcanonical at tpi.com
Tue Dec 2 20:52:26 UTC 2008


Andy Whitcroft wrote:
> git tends to missrepresents the tag fields such as 'Bug: #' appending
> them to the title line if there is no blank line after it.  Add these
> blank lines to the templates to encourge them to be in the final
> commits.
> 
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  debian/commit-templates/bumpabi         |    1 +
>  debian/commit-templates/external-driver |    1 +
>  debian/commit-templates/missing-modules |    1 +
>  debian/commit-templates/newrelease      |    1 +
>  debian/commit-templates/patch           |    1 +
>  debian/commit-templates/sauce-patch     |    1 +
>  debian/commit-templates/update-configs  |    3 ++-
>  7 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/commit-templates/bumpabi b/debian/commit-templates/bumpabi
> index 2864baf..6c373c9 100644
> --- a/debian/commit-templates/bumpabi
> +++ b/debian/commit-templates/bumpabi
> @@ -1,2 +1,3 @@
>  UBUNTU: Bump ABI
> +
>  Ignore: yes
> diff --git a/debian/commit-templates/external-driver b/debian/commit-templates/external-driver
> index 1094903..decdc89 100644
> --- a/debian/commit-templates/external-driver
> +++ b/debian/commit-templates/external-driver
> @@ -12,6 +12,7 @@
>  # to the commit, and you can remove all other tags (except UBUNTU:).
>  #
>  UBUNTU: 
> +
>  ExternalDriver: 
>  Description:
>  Url:
> diff --git a/debian/commit-templates/missing-modules b/debian/commit-templates/missing-modules
> index 4ea28e4..f4872e7 100644
> --- a/debian/commit-templates/missing-modules
> +++ b/debian/commit-templates/missing-modules
> @@ -1,2 +1,3 @@
>  UBUNTU: build/modules: Add modules that have intentionally gone missing
> +
>  Ignore: yes
> diff --git a/debian/commit-templates/newrelease b/debian/commit-templates/newrelease
> index 4e7479e..5f8931c 100644
> --- a/debian/commit-templates/newrelease
> +++ b/debian/commit-templates/newrelease
> @@ -1,2 +1,3 @@
>  UBUNTU: Start new release
> +
>  Ignore: yes
> diff --git a/debian/commit-templates/patch b/debian/commit-templates/patch
> index 04947ee..35e0492 100644
> --- a/debian/commit-templates/patch
> +++ b/debian/commit-templates/patch
> @@ -20,6 +20,7 @@
>  # Ignore: yes will keep this commit from showing up in the changelog.
>  #
>  UBUNTU: 
> +
>  # OriginalAuthor: 
>  # OriginalLocation: 
>  # Bug: #
> diff --git a/debian/commit-templates/sauce-patch b/debian/commit-templates/sauce-patch
> index e470c11..a456c5c 100644
> --- a/debian/commit-templates/sauce-patch
> +++ b/debian/commit-templates/sauce-patch
> @@ -30,6 +30,7 @@
>  # Ignore: yes will keep this commit from showing up in the changelog.
>  #
>  UBUNTU: SAUCE: 
> +
>  # OriginalAuthor: 
>  # OriginalLocation: 
>  # Bug: 
> diff --git a/debian/commit-templates/update-configs b/debian/commit-templates/update-configs
> index fc53283..9120256 100644
> --- a/debian/commit-templates/update-configs
> +++ b/debian/commit-templates/update-configs
> @@ -1,4 +1,3 @@
> -UBUNTU: Updating configs
>  #
>  # This template is used for commit messages that don't need to
>  # show up in debian/changelog. Administrative stuff like config
> @@ -6,4 +5,6 @@ UBUNTU: Updating configs
>  # 'debian/rules insertchanges' from inserting this commit meesage
>  # as a changelog entry.
>  #
> +UBUNTU: Updating configs
> +
>  Ignore: yes

ACK

-- 
Tim Gardner tim.gardner at canonical.com




More information about the kernel-team mailing list