X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-export.sh;h=6d82d55751bd41159f04f20f55b753baaec94c44;hb=7b523289a16c5ae66d36e3d10865594386a59c69;hp=5b7794c2470e0b5badbcbd1af55f5c6eb347ae9f;hpb=d145a7b8809dda570027e3b0371fe8a2a97733af;p=topgit.git

diff --git a/tg-export.sh b/tg-export.sh
index 5b7794c..6d82d55 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -67,10 +67,9 @@ trap 'rm -rf "$playground"' EXIT
 # 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)
+	git ls-tree --full-tree "$1" \
+	| awk -F '	' '$2 !~ /^.top/' \
+	| git mktree
 }
 
 create_tg_commit()
@@ -185,8 +184,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;