mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
228e2eb67e
commit
fb8696d9d8
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue