From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Dec 2012 03:40:47 +0000 (+1100)
Subject: do_merge: print the correct head of the scsi-post-merge tree
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=94d90179933d878799960214b9d9864996a1553a;p=next-scripts

do_merge: print the correct head of the scsi-post-merge tree
---

diff --git a/do_merge b/do_merge
index 63d90cc..0a95322 100755
--- a/do_merge
+++ b/do_merge
@@ -116,7 +116,7 @@ for h in $heads; do
 		fi
 	}
 
-	hlog=$(git log -1 --oneline $h) 2>/dev/null
+	hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
 	log Merging $h "($hlog)"
 	old_head=$(git rev-parse HEAD)
 	[ -x "../pre-merge/$tree" ] && {