git-am: make it easier after fixing up an unapplicable patch.

diff --git a/git-am.sh b/git-am.sh
index c562159a187c233412d1ce2187d46280df020563..fd0772d900211557200c542b882ead04842f6628 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -35,10 +35,10 @@ fall_back_3way () {
     mkdir "$dotest/patch-merge-tmp-dir"
 
     # First see if the patch records the index info that we can use.
-    if git-apply --show-index-info "$dotest/patch" \
+    if git-apply -z --index-info "$dotest/patch" \
        >"$dotest/patch-merge-index-info" 2>/dev/null &&
        GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
-       git-update-index --index-info <"$dotest/patch-merge-index-info" &&
+       git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
        GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
        git-write-tree >"$dotest/patch-merge-base+" &&
        # index has the base tree now.
@@ -153,6 +153,7 @@ if test -d "$dotest"
 then
        test ",$#," = ",0," ||
        die "previous dotest directory $dotest still exists but mbox given."
+       resume=yes
 else
        # Make sure we are not given --skip
        test ",$skip," = ,, ||
@@ -215,15 +216,21 @@ do
                go_next
                continue
        }
-       git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
-               <"$dotest/$msgnum" >"$dotest/info" ||
-               stop_here $this
-       git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
+       case "$resume" in
+       '')
+               git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
+                       <"$dotest/$msgnum" >"$dotest/info" ||
+                       stop_here $this
+               git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
+               ;;
+       esac
+       resume=
 
        GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
        GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
        GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
        SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
+       export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
 
        case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac
        if test '' != "$SIGNOFF"