diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-25 18:08:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-25 18:08:01 -0800 |
| commit | d2bafe5c320c1204b264dc25392a3fc35ed57153 (patch) | |
| tree | bcb53fc2d263302e05c50b3332adbedca562599e | |
| parent | 6ec45f3bd180ed0404733d0f5c648691245cf571 (diff) | |
| parent | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 (diff) | |
| download | git-d2bafe5c320c1204b264dc25392a3fc35ed57153.tar.gz git-d2bafe5c320c1204b264dc25392a3fc35ed57153.tar.xz | |
Merge branch 'jc/bm'
* jc/bm:
Allow branch.*.merge to talk about remote tracking branches.
| -rwxr-xr-x | git-parse-remote.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index aaef861ad..144f17015 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -146,8 +146,12 @@ canon_refs_list_for_fetch () { 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 |