From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Sep 2015 03:00:04 +0000 (+1000)
Subject: do_merge: deref possible tags before saving the SHA1s
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=65e2d12e300c8eb8729af032f41b8124e44986c9;p=next-scripts

do_merge: deref possible tags before saving the SHA1s
---

diff --git a/do_merge b/do_merge
index a3df8e5..888dd25 100755
--- a/do_merge
+++ b/do_merge
@@ -162,7 +162,7 @@ for h in $heads; do
 	}
 	tab="\t"
 	[ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
-	printf "%s$tab%s\n" $tree $(git rev-parse "${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