From 608626e5896f71da51467fedb6f461342df3f850 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Mon, 8 Nov 2010 08:25:10 +0100 Subject: [PATCH] tg-export: use pretty_tree -b for base Signed-off-by: Bert Wesarg --- tg-export.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.30.2