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>
Junio C Hamano committed
Dec 24, 2006 at 01:59 UTC
80c797764a6b6a373f0f1f47d7f56b0d950418a9
1 file changed
+6
-2
git-parse-remote.sh
+6
-2
@@ -146,8 +146,12 @@ canon_refs_list_for_fetch () {
146
else
147
for merge_branch in $merge_branches
148
do
149
- [ "$remote" = "$merge_branch" ] &&
150
- dot_prefix= && break
149
+ if test "$remote" = "$merge_branch" ||
150
+ test "$local" = "$merge_branch"
151
+ then
152
+ dot_prefix=
153
+ break
154
+ fi
155
done
156
fi
157
case "$remote" in