X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-export.sh;h=1d0533e4dac05993775ad0aa4ef004eb5a01c252;hp=748ca54f6c093480684d53982ba72e82daedb412;hb=52cbcb78ed100ce2d7ac28d98f6694a77a6a1235;hpb=2f7cb405238120a51ab113427d25488ef87ef14b

diff --git a/tg-export.sh b/tg-export.sh
index 748ca54..1d0533e 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -57,22 +57,11 @@ if [ -z "$branches" ]; then
 fi
 
 
-playground="$(mktemp -d -t tg-export.XXXXXX)"
-trap 'rm -rf "$playground"' EXIT
+playground="$(get_temp tg-export -d)"
 
 
 ## Collapse driver
 
-# pretty_tree NAME
-# Output tree ID of a cleaned-up tree without tg's artifacts.
-pretty_tree()
-{
-	(export GIT_INDEX_FILE="$playground/^index"
-	 git read-tree "$1"
-	 git update-index --force-remove ".topmsg" ".topdeps"
-	 git write-tree)
-}
-
 create_tg_commit()
 {
 	name="$1"
@@ -185,8 +174,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;
 
@@ -216,22 +205,25 @@ linearize()
 			# already included, just skip
 			:;
 		else
-			git merge -s recursive "$_dep";
-			retmerge="$?";
+			retmerge=0;
+
+			git merge -s recursive "$_dep" || retmerge="$?";
 			if test "x$retmerge" != "x0"; then
 				echo fix up the merge, commit and then exit;
 				#todo error handling
-				sh -i
+				sh -i </dev/tty;
 			fi;
 		fi;
 	else
-		git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")";
-		retmerge="$?";
+		retmerge=0;
+
+		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
+			sh -i </dev/tty;
 		fi
 
 		result_tree=$(git write-tree)