git: revered merge detection logic in post-receive-email script
authorNikodemus Siivola <nikodemus@random-state.net>
Fri, 10 Jun 2011 10:46:04 +0000 (13:46 +0300)
committerNikodemus 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

index 947a568..af8377c 100755 (executable)
@@ -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