From: Junio C Hamano <junkio@cox.net>
Date: Wed, 6 Dec 2006 18:52:04 +0000 (-0800)
Subject: git-merge: squelch needless error message.
X-Git-Tag: v1.5.0-rc0~159
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=211e6eb513f372ad79fecc3db19413b3573ae962;p=git.git

git-merge: squelch needless error message.

While deciding if the new style command line argument is a tag
or a branch, we checked it with "git show-ref -s --verify" to
see if results in an error, but when it is not a branch, the
check leaked the error message out, which was not needed to be
shown to the end user.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 272f00462..efdbabf77 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -189,7 +189,7 @@ else
 	merge_name=$(for remote
 		do
 			rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
-			bh=$(git show-ref -s --verify "refs/heads/$remote") &&
+			bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) &&
 			if test "$rh" = "$bh"
 			then
 				echo "$rh		branch '$remote' of ."