diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 14:55:57 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 14:55:57 +0100 |
| commit | 12721f654e1503ddcf78dd1f0066516bdd08f989 (patch) | |
| tree | 243ca03be403e9e906ad464675687f6c1dbb651d /git-tools/hooks/prepare-commit-msg | |
| parent | afae883619eb7d193b413b5599078a6f47ead408 (diff) | |
| parent | e55228712831a2422cc1c171a6a1160c20d25f1e (diff) | |
| download | forums-12721f654e1503ddcf78dd1f0066516bdd08f989.tar forums-12721f654e1503ddcf78dd1f0066516bdd08f989.tar.gz forums-12721f654e1503ddcf78dd1f0066516bdd08f989.tar.bz2 forums-12721f654e1503ddcf78dd1f0066516bdd08f989.tar.xz forums-12721f654e1503ddcf78dd1f0066516bdd08f989.zip | |
Merge branch 'ticket/p/9824' into develop-olympus
* ticket/p/9824:
[ticket/9824] Accept commit messages with less than perfect headings.
[ticket/9824] Allow empty lines after ticket reference.
[ticket/9824] Use printf instead of echo to render \n.
[ticket/9824] Handle empty commit messages in commit-msg hook.
[ticket/9824] Add space after [ticket/12345] in prepared commit message.
[ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
Diffstat (limited to 'git-tools/hooks/prepare-commit-msg')
| -rwxr-xr-x | git-tools/hooks/prepare-commit-msg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg index 2bf25e58a4..11d2b6b2f2 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -35,8 +35,8 @@ then # Branch is prefixed with 'ticket/', append ticket ID to message if [ "$branch" != "${branch##ticket/}" ]; then - tail="\n\nPHPBB3-${branch##ticket/}"; + tail="$(printf "\n\nPHPBB3-${branch##ticket/}")"; fi - echo "[$branch]$tail $(cat "$1")" > "$1" + echo "[$branch] $tail$(cat "$1")" > "$1" fi |