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

[git-central.git] / client / commit-msg-trac

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
 
 #!/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 ]
 grep -i '\(\(re\|refs\|qa\) #[0-9]\+\)\|\(no ticket\)' "$1" > /dev/null
 
 if [ $? -ne 0 ]