Hi,
On Sat, 12 Jul 2008, Stephan Beyer wrote:
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
