From: Junio C Hamano <junkio@cox.net>
Date: Wed, 6 Dec 2006 19:22:55 +0000 (-0800)
Subject: git-merge: fix "fix confusion between tag and branch" for real
X-Git-Tag: v1.5.0-rc0~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de51faf3888505fa3d661d4c35f32ecaf9fa1087;p=git.git

git-merge: fix "fix confusion between tag and branch" for real

An earlier commit 3683dc5a broke the merge message generation with
a careless use of && where it was not needed, breaking the merge
message for cases where non branches are given.

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

diff --git a/git-merge.sh b/git-merge.sh
index efdbabf77..a948878b9 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -188,8 +188,9 @@ else
 	# in this loop.
 	merge_name=$(for remote
 		do
-			rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
-			bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) &&
+			rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
+			continue ;# not something we can merge
+			bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
 			if test "$rh" = "$bh"
 			then
 				echo "$rh		branch '$remote' of ."