summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-06 19:22:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-06 19:22:55 (GMT)
commitde51faf3888505fa3d661d4c35f32ecaf9fa1087 (patch)
treedb4405db0a144e38ced9de7880746f55d6658701 /git-merge.sh
parentebdf7b952215946eff863e4da28f924178acea4f (diff)
downloadgit-de51faf3888505fa3d661d4c35f32ecaf9fa1087.zip
git-de51faf3888505fa3d661d4c35f32ecaf9fa1087.tar.gz
git-de51faf3888505fa3d661d4c35f32ecaf9fa1087.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh
index efdbabf..a948878 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 ."