From 80c797764a6b6a373f0f1f47d7f56b0d950418a9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 24 Dec 2006 01:59:53 -0800 Subject: [PATCH] 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 --- git-parse-remote.sh | 8 ++++++-- 1 file 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 -- 2.30.2