Re: [PATCH v2 07/31] rebase: stricter check of standalone sub command

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Jul 6, 2011, 01:48 UTC
Message-ID: <alpine.DEB.2.00.1107052131410.7799@debian>
In-Reply-To: <20110701222919.GA11258@elie>

On Fri, 1 Jul 2011, Jonathan Nieder wrote:

Show 17 quoted lines

> Martin von Zweigbergk wrote:
> 
> > Is the below patch what you had in mind?
> 
> No, but it looks good to me ("rebase usage: subcommands can not be
> combined with -i").
> 
> >> Ah, it seems you already wrote a patch at [1].  The commit message
> >> says it fails for "-i --continue" but I don't any code doing that;
> >> what am I missing?
> >
> > That patch was never accepted, but 95135b0 (rebase: stricter check of
> > standalone sub command, 2011-02-06) was.
> >
> >> [1] http://thread.gmane.org/gmane.comp.version-control.git/164241/focus=166684
> 
> I'll play around with [1] and try to revive it.  Thanks.

I'm not sure I understand what you want to achieve. Do you want to revive [1] but also make it allow "-i --continue"? If so, is one of the following your goal when used with "--continue"?

 1. Always accept "-i", but ignore it (the behavior before 1.7.6)

 2. Only accept "-i" if the rebase was already interactive

 3. Always accept "-i" and transform a non-interactive rebase to an
 interative one

Just curious. Thanks for working on it.

Martin