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>
Junio C Hamano committed
Dec 4, 2008 at 15:38 UTC
22db240dd1791b32e7f6d25a466c2835bdccb51e
1 file changed
+7
-2
git-am.sh
+7
-2
@@ -247,10 +247,11 @@ else
247
exit 1
248
}
249
250
- # -s, -u, -k, --whitespace, -C and -p flags are kept
250
+ # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
251
# for the resuming session after a patch failure.
252
- # -3 and -i can and must be given when resuming.
252
+ # -i can and must be given when resuming.
253
echo " $git_apply_opt" >"$dotest/apply_opt_extra"
254
+ echo "$threeway" >"$dotest/threeway"
255
echo "$sign" >"$dotest/sign"
256
echo "$utf8" >"$dotest/utf8"
257
echo "$keep" >"$dotest/keep"
@@ -283,6 +284,10 @@ if test "$(cat "$dotest/keep")" = t
284
then
285
keep=-k
286
fi
287
+if test "$(cat "$dotest/threeway")" = t
288
+then
289
+ threeway=t
290
+fi
291
git_apply_opt=$(cat "$dotest/apply_opt_extra")
292
if test "$(cat "$dotest/sign")" = t
293
then