X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-export.sh;fp=tg-export.sh;h=486ec94ba00f97e831848648ecb6c37272d5e823;hp=1d0533e4dac05993775ad0aa4ef004eb5a01c252;hb=608626e5896f71da51467fedb6f461342df3f850;hpb=9b25e8482c536324a6ecdefdf8abc1c0b1dca83e

diff --git a/tg-export.sh b/tg-export.sh
index 1d0533e..486ec94 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -102,7 +102,7 @@ collapsed_commit()
 			echo "TopGit-driven merge of branches:"
 			echo
 			cut -f 2 "$playground/$name^parents"
-		} | git commit-tree "$(pretty_tree "refs/top-bases/$name")" \
+		} | git commit-tree "$(pretty_tree "$name" -b)" \
 			$(for p in $parent; do echo -p $p; done))"
 	fi
 
@@ -217,7 +217,7 @@ linearize()
 	else
 		retmerge=0;
 
-		git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
+		git merge-recursive "$(pretty_tree "$_dep" -b)" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
 
 		if test "x$retmerge" != "x0"; then
 			git rerere;