From: Junio C Hamano <junkio@cox.net>
Date: Fri, 22 Dec 2006 23:25:21 +0000 (-0800)
Subject: default pull: forget about "newbie protection" for now.
X-Git-Tag: v1.5.0-rc0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb8696d9d82e78fe829fdd95ff9ff10fdfa52ef9;p=git.git

default pull: forget about "newbie protection" for now.

This will not be backward compatible no matter how you cut it.
Shelve it for now until somebody comes up with a better way to
determine when we can safely refuse to use the first set of
branchse for merging without upsetting valid workflows.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index f163821d0..b163d22dd 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -145,13 +145,6 @@ canon_refs_list_for_fetch () {
 			merge_branches=$(git-repo-config \
 			    --get-all "branch.${curr_branch}.merge")
 		fi
-		# If we are fetching only one branch, then first branch
-		# is the only thing that makes sense to merge anyway,
-		# so there is no point refusing that traditional rule.
-		if test $# != 1 && test "z$merge_branches" = z
-		then
-			merge_branches=..this..would..never..match..
-		fi
 	fi
 	for ref
 	do