Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-merge: fix "fix confusion between tag and branch" for real
author
Junio C Hamano
<junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000
(11:22 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000
(11:22 -0800)
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>
git-merge.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
ebdf7b9
)
diff --git
a/git-merge.sh
b/git-merge.sh
index efdbabf7753ac1ceaf2a39f0cc2a0cb4c41957c5..a948878b911f56a3d6ace784d5a93952ce25c64b 100755
(executable)
--- 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 ."