git.droids-corp.org
/
git-central.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
0800f02
..
88fec76
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 ]