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 f163821d033cc0dc81dcd7ce0af13a7e75986db1..b163d22ddbd88dc061ac905fc650929eb6f67cc1 100755 (executable)
--- 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