X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-export.sh;h=a16c2901d0a53b4ca8295e9e2ebc9efd5a82048a;hp=37cd9cdd11f1a230a7d4c2ac08e1bc920afae160;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=6745b3c106485f5607d7e1e6251878d429591186

diff --git a/tg-export.sh b/tg-export.sh
index 37cd9cd..a16c290 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -185,8 +185,8 @@ quilt()
 		echo "Skip empty patch $_dep";
 	else
 		if "$numbered"; then
-			number="$(printf "%04u" $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
-			bn="$number-$bn";
+			number="$(echo $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
+			bn="$(printf "%04u-$bn" $number)";
 			echo "$number" >"$playground/^number";
 		fi;
 
@@ -231,6 +231,7 @@ linearize()
 		git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
 
 		if test "x$retmerge" != "x0"; then
+			git rerere;
 			echo "fix up the merge and update the index.  Don't commit!"
 			#todo error handling
 			sh -i </dev/tty;