From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Fri, 10 Jun 2011 10:46:04 +0000 (+0300)
Subject: git: revered merge detection logic in post-receive-email script
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b0f344469c3a4eae710959fdda9d07bae75476dd;p=sbcl.git

git: revered merge detection logic in post-receive-email script

  How hard can this be?
---

diff --git a/git/post-receive-email b/git/post-receive-email
index 947a568..af8377c 100755
--- 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