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

On Wed, Nov 10, 2010 at 1:56 PM, Sverre Rabbelier [off-list ref] wrote:

On Wed, Nov 10, 2010 at 08:14, Martin von Zweigbergk
[off-list ref] wrote:

quoted

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)"?