Re: [PATCH] Make rebase--interactive use OPTIONS_SPEC
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 12, 2008, 17:31 UTC
- Message-ID
- <alpine.DEB.1.00.0807121830270.8950@racer>
- In-Reply-To
- <20080712172729.GE7572@leksak.fem-net>
Hi,
On Sat, 12 Jul 2008, Stephan Beyer wrote:
Show 22 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > + --onto)
> > > + shift
> > > + ONTO=$(git rev-parse --verify "$1") ||
> > > + die "Does not point to a valid commit: $1"
> >
> > Didn't you have some check earlier that "--onto" can only be used when
> > starting a rebase?
>
> Yes, and I still have. is_standalone does that:
>
> # check if no other options are set
> is_standalone () {
> test $# -eq 2 -a "$2" = '--' &&
> test -z "$ONTO" &&
> test -z "$PRESERVE_MERGES" &&
> test -z "$STRATEGY" &&
> test -z "$VERBOSE"
> }
>
> which is called on --continue/--abort/--skip before the saved options
> are loaded again.Ah, sorry. I managed to misunderstand "is_standalone". Again. (I had the same problem during the first round, but forgot to mention that, I guess).
Ciao, Dscho