projects
/
sbcl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5fb0e5
)
git: revered merge detection logic in post-receive-email script
author
Nikodemus Siivola
<nikodemus@random-state.net>
Fri, 10 Jun 2011 10:46:04 +0000
(13:46 +0300)
committer
Nikodemus Siivola
<nikodemus@random-state.net>
Fri, 10 Jun 2011 10:46:04 +0000
(13:46 +0300)
How hard can this be?
git/post-receive-email
patch
|
blob
|
history
diff --git
a/git/post-receive-email
b/git/post-receive-email
index
947a568
..
af8377c
100755
(executable)
--- a/
git/post-receive-email
+++ b/
git/post-receive-email
@@
-722,7
+722,7
@@
else
# Check for merges.
for rev in $revlist
do
- if ($no_merges && ! git rev-parse --verify --quiet "$rev"^2 > /dev/null)
+ if ($no_merges && git rev-parse --verify --quiet "$rev"^2 > /dev/null)
then
no_merges=false
fi