@matheusbsbs / matheus-bagliano / commits / fb8696d9d8
Fork 0

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>

Junio C Hamano committed Dec 22, 2006 at 15:25 UTC fb8696d9d82e78fe829fdd95ff9ff10fdfa52ef9
1 file changed -7
git-parse-remote.sh
-7
@@ -145,13 +145,6 @@ canon_refs_list_for_fetch () {
145 merge_branches=$(git-repo-config \
146 --get-all "branch.${curr_branch}.merge")
147 fi
148 - # If we are fetching only one branch, then first branch
149 - # is the only thing that makes sense to merge anyway,
150 - # so there is no point refusing that traditional rule.
151 - if test $# != 1 && test "z$merge_branches" = z
152 - then
153 - merge_branches=..this..would..never..match..
154 - fi
148 fi
149 for ref
150 do