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 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
