From: Stephan Beyer <s-beyer@gmx.net>
Date: Sat, 12 Jul 2008 17:27:29 GMT
Subject: Re: [PATCH] Make rebase--interactive use OPTIONS_SPEC
Message-ID: <20080712172729.GE7572@leksak.fem-net>
In-Reply-To: <alpine.DEB.1.00.0807121728180.8950@racer>

Hi,

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.

Regards.

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F