| commit | d2bafe5c320c1204b264dc25392a3fc35ed57153 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Mon Dec 25 18:08:01 2006 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Mon Dec 25 18:08:01 2006 -0800 |
| tree | bcb53fc2d263302e05c50b3332adbedca562599e | |
| parent | 6ec45f3bd180ed0404733d0f5c648691245cf571 [diff] | |
| parent | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 [diff] |
Merge branch 'jc/bm' * jc/bm: Allow branch.*.merge to talk about remote tracking branches.
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index aaef861..144f170 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh
@@ -146,8 +146,12 @@ else for merge_branch in $merge_branches do - [ "$remote" = "$merge_branch" ] && - dot_prefix= && break + if test "$remote" = "$merge_branch" || + test "$local" = "$merge_branch" + then + dot_prefix= + break + fi done fi case "$remote" in