Skip to content

Commit

Permalink
git-am: propagate --3way options as well
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 5, 2008
1 parent a200337 commit 22db240
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 22db240

Please sign in to comment.