From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 May 2014 04:21:20 +0000 (+1000)
Subject: do_merge: use rev-parse instead of show-ref --hash
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=464c1b04cdd5d8cb5c5f672eb0f0962c55362cc3;p=next-scripts

do_merge: use rev-parse instead of show-ref --hash

the latter may return more than one result :-(
---

diff --git a/do_merge b/do_merge
index 68f7f86..964c3b3 100755
--- a/do_merge
+++ b/do_merge
@@ -143,7 +143,7 @@ for h in $heads; do
 	}
 	tab="\t"
 	[ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
-	printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
+	printf "%s$tab%s\n" $tree $(git rev-parse "${h/\/*://}") >> $SHA1_FILE
 	$no_build && continue
 	$need_build || {
 		# See if we need to build after merging this tree