Let merges pass the client-side trac hook as they can already pass on the server...

diff --git a/client/commit-msg-trac b/client/commit-msg-trac
index 0800f02131d7ee9d33b753c23473219cfc255c3f..88fec76ce6db230a0d78841b7c09a0589d89c172 100644 (file)
--- a/client/commit-msg-trac
+++ b/client/commit-msg-trac
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if test -f $GIT_DIR/MERGE_MSG ; then
+       exit 0
+fi
+
 grep -i '\(\(re\|refs\|qa\) #[0-9]\+\)\|\(no ticket\)' "$1" > /dev/null
 
 if [ $? -ne 0 ]

diff --git a/tests/t1001-client-commit-msg-trac-merges.sh b/tests/t1001-client-commit-msg-trac-merges.sh
index 80206b5bf898cd0b05502a3339c978bb85a74a70..3cfbd72939c1dbb2781888dac5f2e89456574603 100644 (file)
--- a/tests/t1001-client-commit-msg-trac-merges.sh
+++ b/tests/t1001-client-commit-msg-trac-merges.sh
@@ -22,5 +22,14 @@ test_expect_success 'accepts merge' '
        git log -n 1 HEAD | grep "Merge branch"
 '
 
+test_expect_success 'accepts hand-editted merge' '
+       git checkout topic1 &&
+       echo "$test_name" >>file &&
+       git commit -a -m "line three. re #3222." &&
+       git checkout master &&
+       git merge --no-ff --no-commit topic1 &&
+       git commit -F .git/MERGE_MSG
+'
+
 test_done