Allow branch.*.merge to talk about remote tracking branches.

People often get confused if the value of branch.*.merge should
be the remote branch name they are fetching from, or the
tracking branch they locally have.  So this allows either.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index aaef861ada3f6bac2a67a7eb0de20ab2ea95b6bf..144f1701553a1e2f4204a2df15e66437e0670123 100755 (executable)
--- 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