From 3ddd170323fcf24af8c4a321ed9c73cda532986e Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Tue, 16 Jun 2009 15:32:58 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 578780be1..e26c54a3e 100755 --- a/git-am.sh +++ b/git-am.sh @@ -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) -- 2.30.2