From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Nov 2006 06:16:31 +0000 (-0800)
Subject: git-merge: tighten error checking.
X-Git-Tag: v1.5.0-rc0~214^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51901e96bf592877f7b266d0d9c6cb83b363edce;p=git.git

git-merge: tighten error checking.

If a branch name to be merged is misspelled, the command leaked error
messages from underlying plumbing commands, which were helpful only
to people who know how the command are implemented to diagnose the
breakage, but simply puzzling and unhelpful for the end users.

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

diff --git a/git-merge.sh b/git-merge.sh
index dd4e83ded..5fa8b0d57 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -188,13 +188,13 @@ else
 	# in this loop.
 	merge_name=$(for remote
 		do
-			rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null)
+			rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
 			if git show-ref -q --verify "refs/heads/$remote"
 			then
 				what=branch
 			else
 				what=commit
-			fi
+			fi &&
 			echo "$rh		$what '$remote'"
 		done | git-fmt-merge-msg
 	)
@@ -209,7 +209,7 @@ test "$rloga" = '' && rloga="merge: $@"
 remoteheads=
 for remote
 do
-	remotehead=$(git-rev-parse --verify "$remote"^0) ||
+	remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
 	    die "$remote - not something we can merge"
 	remoteheads="${remoteheads}$remotehead "
 done