diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-06 11:22:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 11:22:55 -0800 |
| commit | de51faf3888505fa3d661d4c35f32ecaf9fa1087 (patch) | |
| tree | db4405db0a144e38ced9de7880746f55d6658701 /git-merge.sh | |
| parent | ebdf7b952215946eff863e4da28f924178acea4f (diff) | |
| download | git-de51faf3888505fa3d661d4c35f32ecaf9fa1087.tar.gz | |
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-x | git-merge.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index efdbabf775..a948878b91 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 ." |