Revert "Allow branch.*.merge to talk about remote tracking branches."
This reverts commit 80c797764a
.
Back when I committed this, it seemed to be a good idea. People
who always use remote tracking branches can optionally use the
local name they happen to use to specify what to merge, which meant
that I did not have to teach them why we use the name at the remote
side every time they are confused.
But allowing it seems to break other people's scripts. The real
solution is not to allow more ways to express the same thing, but
to educate people to use the right syntax.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
d1f289c5aa
commit
756373da25
@ -174,12 +174,8 @@ canon_refs_list_for_fetch () {
|
||||
else
|
||||
for merge_branch in $merge_branches
|
||||
do
|
||||
if test "$remote" = "$merge_branch" ||
|
||||
test "$local" = "$merge_branch"
|
||||
then
|
||||
dot_prefix=
|
||||
break
|
||||
fi
|
||||
[ "$remote" = "$merge_branch" ] &&
|
||||
dot_prefix= && break
|
||||
done
|
||||
fi
|
||||
case "$remote" in
|
||||
|
Loading…
Reference in New Issue
Block a user