diff options
| author | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-11-06 23:10:20 +0200 |
|---|---|---|
| committer | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-11-07 00:27:05 +0200 |
| commit | b56e52a70cb539a7e88b6395e391f62f5b533e5c (patch) | |
| tree | 12db5ca9949353b174c321d49e8ec95ced3ed197 /crawl-ref/git-hooks | |
| parent | 4cc5a6812537ba01f1c9ae96f5ad25e0a9f63134 (diff) | |
| download | crawl-ref-b56e52a70cb539a7e88b6395e391f62f5b533e5c.tar.gz crawl-ref-b56e52a70cb539a7e88b6395e391f62f5b533e5c.zip | |
Suppress CIA spam when merging between branches.
Diffstat (limited to 'crawl-ref/git-hooks')
| -rwxr-xr-x | crawl-ref/git-hooks/update | 8 |
1 files changed, 4 insertions, 4 deletions
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 |