From b56e52a70cb539a7e88b6395e391f62f5b533e5c Mon Sep 17 00:00:00 2001
From: Eino Keskitalo <evktalo@users.sourceforge.net>
Date: Fri, 6 Nov 2009 23:10:20 +0200
Subject: Suppress CIA spam when merging between branches.

---
 crawl-ref/git-hooks/update | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/git-hooks')

diff --git a/crawl-ref/git-hooks/update b/crawl-ref/git-hooks/update
index a38deb2499..6e6dbcc37d 100755
--- a/crawl-ref/git-hooks/update
+++ b/crawl-ref/git-hooks/update
@@ -10,10 +10,10 @@ if [ -z "$GIT_DIR" ]; then
 	exit 1
 fi
 
-refname=${1#refs/heads/}
-[ "$refname" = "master" ] && refname=
+branchname=${1#refs/heads/}
+[ "$branchname" = "master" ] && branchname=
 oldhead=$2
 newhead=$3
-for merged in $(git-rev-list $newhead ^$oldhead | tac); do
-  $GIT_DIR/hooks/crawl-ref-cia $merged $refname
+for merged in $(git-rev-parse --symbolic-full-name --not --branches | egrep -v "^\^$1$" | git-rev-list --stdin $oldhead..$newhead | tac); do
+  $GIT_DIR/hooks/crawl-ref-cia $merged $branchname
 done
-- 
cgit v1.2.3-54-g00ecf