diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-08 01:07:27 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-08 01:07:27 +0100 |
| commit | d9567f121b11d3f5b068b85e7c862c27fc495005 (patch) | |
| tree | abdf0aae2fdb8befb3ab6cc7595af8f80dd27336 /git-tools | |
| parent | 9f8d258de484bebbe481213c66355f02164afb1f (diff) | |
| parent | 0a6db697e6f50551270c7bc3e61fb587b7043099 (diff) | |
| download | forums-d9567f121b11d3f5b068b85e7c862c27fc495005.tar forums-d9567f121b11d3f5b068b85e7c862c27fc495005.tar.gz forums-d9567f121b11d3f5b068b85e7c862c27fc495005.tar.bz2 forums-d9567f121b11d3f5b068b85e7c862c27fc495005.tar.xz forums-d9567f121b11d3f5b068b85e7c862c27fc495005.zip | |
Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-olympus
Diffstat (limited to 'git-tools')
| -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 284354081e..e1e05d67b8 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -18,7 +18,7 @@ branch="$(cat $GIT_DIR/HEAD | sed 's/ref: refs\/heads\///g')" # * only run when normal commit is made (without -m or -F; # not a merge, etc.) -# * also make sure the branch name begins with bug/ -if [ "$2" = "" ] && [ $(echo "$branch" | grep -e '^bug/') ]; then +# * also make sure the branch name begins with bug/ or feature/ +if [ "$2" = "" ] && [ $(echo "$branch" | grep -e '^\(bug\|feature\)/') ]; then echo "[$branch] $(cat $1)" > "$1" fi |