Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull

[Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>]

"W. Trevor King" <wking@tremily.us> writes:

> On Fri, Jun 28, 2013 at 08:34:53AM +0200, Matthieu Moy wrote:
>> "W. Trevor King" <wking@tremily.us> writes:
>>
>> > Or they may not even realize that they've just merged an unrelated
>> > branch at all, dragging in a thousand unrelated commits which they
>> > accidentally push to a central repository without looking,
>> > contaminating future branches based on the central repostitory without
>> > drastic rebase surgery ;).  I just saw one of these earlier this week.
>> 
>> I don't understand how the change would solve this. If "pull" would drag
>> a lot of commits in the current branch, the "rebase" will rebase the
>> current branch on a totally different history, and pushing the result
>> would be equally bad.
>
> I want the warning that they had not made the required config choice
> between rebase/merge needed to handle a non-ff case, not the default
> merge (or rebase) behavior.  The warning gives them a chance to
> realize that this was not an appropriate time for a `svn update`
> analog, and that the project may not to want to have the branches
> joined at all ;).

You're assuming that the config is not made, but this is supposed to
happen once initially. Then, the user will chose either merge or rebase,
and whatever is chosen, the result will be bad.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/