git-am: propagate --3way options as well

The reasoning is the same as the previous patch, where we made -C<n>
and -p<n> propagate across a failure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index ed54e716d9a33a2be9525e48f5f7019e13ea0e3a..13c02d6adecdc469aa8e02a758c2c3e7aef0306a 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -247,10 +247,11 @@ else
                exit 1
        }
 
                exit 1
        }
 

-       # -s, -u, -k, --whitespace, -C and -p flags are kept
+       # -s, -u, -k, --whitespace, -3, -C and -p flags are kept

        # for the resuming session after a patch failure.
        # for the resuming session after a patch failure.

-       # -3 and -i can and must be given when resuming.
+       # -i can and must be given when resuming.

        echo " $git_apply_opt" >"$dotest/apply_opt_extra"
        echo " $git_apply_opt" >"$dotest/apply_opt_extra"

+       echo "$threeway" >"$dotest/threeway"

        echo "$sign" >"$dotest/sign"
        echo "$utf8" >"$dotest/utf8"
        echo "$keep" >"$dotest/keep"
        echo "$sign" >"$dotest/sign"
        echo "$utf8" >"$dotest/utf8"
        echo "$keep" >"$dotest/keep"


@@ -283,6 +284,10 @@ if test "$(cat "$dotest/keep")" = t
 then
        keep=-k
 fi
 then
        keep=-k
 fi

+if test "$(cat "$dotest/threeway")" = t
+then
+       threeway=t
+fi

 git_apply_opt=$(cat "$dotest/apply_opt_extra")
 if test "$(cat "$dotest/sign")" = t
 then
 git_apply_opt=$(cat "$dotest/apply_opt_extra")
 if test "$(cat "$dotest/sign")" = t
 then