From: Junio C Hamano <junkio@cox.net>
Date: Fri, 22 Dec 2006 06:10:56 +0000 (-0800)
Subject: Revert "git-pull: refuse default merge without branch.*.merge"
X-Git-Tag: v1.5.0-rc0~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e11554917d391c18e043bc0b38ee0377e69568e;p=git.git

Revert "git-pull: refuse default merge without branch.*.merge"

This reverts commit a71fb0a1412c82405f078fb536797d3f5de68d53.

The logic to decide when to refuse to use the default "first set of
refs fetched" for merge was utterly bogus.

In a repository that happily worked correctly without any of the
per-branch configuration crap did not have (and did not have to
have) any branch.<current>.merge.  With that broken commit, pulling
from origin no longer would work.
---

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index ea7511e8a..871c08f09 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -141,8 +141,7 @@ 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") ||
-			merge_branches=.this.would.never.match.any.ref.
+			    --get-all "branch.${curr_branch}.merge")
 		fi
 		set x $(expand_refs_wildcard "$@")
 		shift