development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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:
Junio C Hamano 2006-12-22 15:25:21 -08:00
parent 228e2eb67e
commit fb8696d9d8
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
git-parse-remote.sh
View file

@ -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