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>
Junio C Hamano committed
Dec 6, 2006 at 11:22 UTC
de51faf3888505fa3d661d4c35f32ecaf9fa1087
1 file changed
+3
-2
git-merge.sh
+3
-2
@@ -188,8 +188,9 @@ else
188
# in this loop.
189
merge_name=$(for remote
190
do
191
- rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
192
- bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) &&
191
+ rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
192
+ continue ;# not something we can merge
193
+ bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
194
if test "$rh" = "$bh"
195
then
196
echo "$rh branch '$remote' of ."