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 68f7f864f6585508cf56f4bd62e27138a4c45172..964c3b3e1f0fb5863f71f5825cefa61557c78a93 100755 (executable)
--- 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