From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Feb 2007 00:23:38 +0000 (-0800)
Subject: Revert "Allow branch.*.merge to talk about remote tracking branches."
X-Git-Tag: v1.5.0-rc4~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=756373da254dbe8bd03bd83ec658d3f015fee958;p=git.git

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

This reverts commit 80c797764a6b6a373f0f1f47d7f56b0d950418a9.

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

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 3e783b7b0..5208ee6ce 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -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