From: Stephen Boyd <bebarino@gmail.com>
Date: Tue, 16 Jun 2009 22:32:58 +0000 (-0700)
Subject: am: suppress apply errors when using 3-way
X-Git-Tag: v1.6.4-rc0~27^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ddd170;p=git.git

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>
---

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)