Merge branch 'master' into refs/top-bases/debian/locations

[topgit.git] / tg-export.sh

diff --git a/tg-export.sh b/tg-export.sh
index 37cd9cdd11f1a230a7d4c2ac08e1bc920afae160..a16c2901d0a53b4ca8295e9e2ebc9efd5a82048a 100644 (file)
--- 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;