[PATCH] rebase: allow -X for non-recursive strategy

[PATCH] rebase: allow -X for non-recursive strategy

[Martin von Zweigbergk]

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.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
---
Maybe I'm missing something, but it looks very much like that '-n'
should have been a '-z'. But still, 'strategy' is set to 'recursive' at
the start of the script and doesn't seem to be unset anywhere, so the
block shouldn't be necessary at all.

 git-rebase.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 42c0628..ec08f9c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -312,10 +312,6 @@ do
 		esac
 		strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
 		do_merge=t
-		if test -n "$strategy"
-		then
-			strategy=recursive
-		fi
 		;;
 	-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
 		--strateg=*|--strategy=*|\
-- 
1.7.3.2.167.ga361b

Re: [PATCH] rebase: allow -X for non-recursive strategy

[Jonathan Nieder]

Martin von Zweigbergk wrote:

> Subject: [PATCH] rebase: allow -X for non-recursive strategy

I first read this as "allow -X option, which can be used to set a
non-recursive strategy".  Of course that was nonsense, but maybe
it can be made clearer?  e.g.

	rebase -X: do not clobber strategy

This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).

Re: [PATCH] rebase: allow -X for non-recursive strategy

[Sverre Rabbelier]

Heya,

On Wed, Nov 10, 2010 at 09:55, Jonathan Nieder <jrnieder@gmail.com> wrote:
> This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).

Can has test?

-- 
Cheers,

Sverre Rabbelier