diff options
Diffstat (limited to 'git-tools/hooks')
| -rwxr-xr-x | git-tools/hooks/commit-msg | 24 | ||||
| -rwxr-xr-x | git-tools/hooks/prepare-commit-msg | 10 |
2 files changed, 9 insertions, 25 deletions
diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg deleted file mode 100755 index db31d93698..0000000000 --- a/git-tools/hooks/commit-msg +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# A hook to append PHPBB3-<ticket_id> to ticket/<ticket_id> -# branches. -# -# This is a commit-msg hook. -# -# To install this you can either copy or symlink it to -# $GIT_DIR/hooks, example: -# -# ln -s ../../git-tools/hooks/commit-msg \\ -# .git/hooks/commit-msg - -if grep '^\[ticket/' "$1" -then - # get branch name - branch="$(git symbolic-ref HEAD)" - - # strip off refs/heads/ticket - ticket_id="$(echo "$branch" | sed "s/refs\/heads\/ticket\///g")" - - echo >> "$1" - echo "PHPBB3-$ticket_id" >> "$1" -fi diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg index 033cb187c7..2bf25e58a4 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -30,5 +30,13 @@ branch="$(echo "$branch" | sed "s/refs\/heads\///g")" # * also make sure the branch name begins with bug/ or feature/ if [ "$2" = "" ] then - echo "[$branch] $(cat "$1")" > "$1" + tail=""; + + # Branch is prefixed with 'ticket/', append ticket ID to message + if [ "$branch" != "${branch##ticket/}" ]; + then + tail="\n\nPHPBB3-${branch##ticket/}"; + fi + + echo "[$branch]$tail $(cat "$1")" > "$1" fi |