mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 04:30:29 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-olympus

Browse Source
This commit is contained in:
Nils Adermann 2010-03-08 01:07:27 +01:00
commit d9567f121b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-tools/hooks/prepare-commit-msg
View File

@ -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