From: Junio C Hamano Date: Sat, 16 Dec 2006 09:36:32 +0000 (-0800) Subject: git-pull: refuse default merge without branch.*.merge X-Git-Tag: v1.5.0-rc0~56^2~6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a71fb0a1412c82405f078fb536797d3f5de68d53;p=git.git git-pull: refuse default merge without branch.*.merge Everybody hated the pull behaviour of merging the first branch listed on remotes/* file (or remote.*.fetch config) into the current branch. This finally corrects that UI wart by forbidding "git pull" without an explicit branch name on the command line or branch.$current.merge for the current branch. The matching change to git-clone was made to prepare the default branch.*.merge entry for the primary branch some time ago. Signed-off-by: Junio C Hamano --- diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 6ae534bf8..f27c3c231 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -144,7 +144,8 @@ canon_refs_list_for_fetch () { curr_branch=$(git-symbolic-ref HEAD | \ sed -e 's|^refs/heads/||') merge_branches=$(git-repo-config \ - --get-all "branch.${curr_branch}.merge") + --get-all "branch.${curr_branch}.merge") || + merge_branches=.this.would.never.match.any.ref. fi set x $(expand_refs_wildcard "$@") shift