summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-04 00:23:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-05 00:58:30 (GMT)
commit756373da254dbe8bd03bd83ec658d3f015fee958 (patch)
tree51c786eaf4853781b5c2dac057d271d34e3294be
parentd1f289c5aa52bb77dc4959fb21cef032d954869f (diff)
downloadgit-756373da254dbe8bd03bd83ec658d3f015fee958.zip
git-756373da254dbe8bd03bd83ec658d3f015fee958.tar.gz
git-756373da254dbe8bd03bd83ec658d3f015fee958.tar.bz2
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>
-rwxr-xr-xgit-parse-remote.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 3e783b7..5208ee6 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