Skip to content

Commit

Permalink
default pull: forget about "newbie protection" for now.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 22, 2006
1 parent 228e2eb commit fb8696d
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions git-parse-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fb8696d

Please sign in to comment.