diff options
| -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 aaef861ada..144f170155 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 |