Re: [PATCH v2] rebase -X: do not clobber strategy

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Nov 11, 2010, 01:11 UTC
Message-ID: <AANLkTiks87caBYo78Xh1hwnEfDF9yKwBn5q3wa87hBo3@mail.gmail.com>
In-Reply-To: <AANLkTimEvp2mQu1QWhx-FDEx37NLi8jose_p+A1y1iHK@mail.gmail.com>

On Wed, Nov 10, 2010 at 1:56 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:

Show 8 quoted lines

> On Wed, Nov 10, 2010 at 08:14, Martin von Zweigbergk
> <martin.von.zweigbergk@gmail.com> wrote:
>> If any strategy options are passed to -X, the strategy will always be
>> set to 'recursive'. According to the documentation, it should default to
>> 'recursive' if it is not set, but it should be possible to set it to
>> other values.
>
> Repeat of other threat since this is a new patch: can we have a test for this?

I don't think there are any merge strategies other than recursive that accept options, so what I could add a test case for is that e.g. '-s ours -X foo' uses the 'ours' strategy, even though 'foo' will be ignored. I have very little experience with merge strategies, but I will give it a try. Hopefully there is some existing test case I can copy and modify.

Btw, why is the default (if no strategy is specifed) for 'git rebase' to use 'recursive', while for 'git merge' "a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)"?