mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
am: suppress apply errors when using 3-way
git-am with 3-way outputs errors when applying, even though the 3-way will usually be successful. We suppress these errors from git-apply because they are not "true" errors until the 3-way has been attempted. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b3c32ead20
commit
3ddd170323
|
@ -502,7 +502,14 @@ do
|
|||
|
||||
case "$resolved" in
|
||||
'')
|
||||
eval 'git apply '"$git_apply_opt"' --index "$dotest/patch"'
|
||||
# When we are allowed to fall back to 3-way later, don't give
|
||||
# false errors during the initial attempt.
|
||||
squelch=
|
||||
if test "$threeway" = t
|
||||
then
|
||||
squelch='>/dev/null 2>&1 '
|
||||
fi
|
||||
eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
|
||||
apply_status=$?
|
||||
;;
|
||||
t)
|
||||
|
|
Loading…
Reference in a new issue