mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
a20033796b
commit
22db240dd1
|
@ -247,10 +247,11 @@ else
|
|||
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.
|
||||
# -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 "$threeway" >"$dotest/threeway"
|
||||
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
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue