do_merge: deref possible tags before saving the SHA1s

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index a3df8e5784ff976d4bee759bac91757c9e581cd3..888dd251c05bacfcb1e76ed33937adc87eda6034 100755 (executable)
--- 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