undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Junio C Hamano 2008-12-04 15:38:27 -08:00
parent a20033796b
commit 22db240dd1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-am.sh
View File

@ -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 "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8" echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep" echo "$keep" >"$dotest/keep"
@ -283,6 +284,10 @@ if test "$(cat "$dotest/keep")" = t
then then
keep=-k keep=-k
fi fi
if test "$(cat "$dotest/threeway")" = t
then
threeway=t
fi
git_apply_opt=$(cat "$dotest/apply_opt_extra") git_apply_opt=$(cat "$dotest/apply_opt_extra")
if test "$(cat "$dotest/sign")" = t if test "$(cat "$dotest/sign")" = t
then then