diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:08:29 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:08:29 +0100 |
| commit | 239cb56af09424825f6a83dea42dc3cb10d9a470 (patch) | |
| tree | c51e2073c99d5085e14a92be4fddd3f755b1fc23 /git-tools/hooks/prepare-commit-msg | |
| parent | e8def259ef26477e1f7ae2b338eac34142572458 (diff) | |
| parent | 7027489c8ebbd1f3a77a6357db8dc6e862cd978d (diff) | |
| download | forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.gz forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.bz2 forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.xz forums-239cb56af09424825f6a83dea42dc3cb10d9a470.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/10059] Fix two misspellings of consistent.
[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 |