git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephan Beyer <s-beyer@gmx.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Make rebase--interactive use OPTIONS_SPEC
Date: Sat, 12 Jul 2008 19:27:29 +0200	[thread overview]
Message-ID: <20080712172729.GE7572@leksak.fem-net> (raw)
In-Reply-To: <alpine.DEB.1.00.0807121728180.8950@racer> <1215877700-17080-1-git-send-email-s-beyer@gmx.net>

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

  reply	other threads:[~2008-07-12 17:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-12 15:48 [PATCH] Make rebase--interactive use OPTIONS_SPEC Stephan Beyer
2008-07-12 16:28 ` Johannes Schindelin
2008-07-12 17:27   ` Stephan Beyer [this message]
2008-07-12 17:31     ` Johannes Schindelin
2008-07-12 17:34       ` Stephan Beyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080712172729.GE7572@leksak.fem-net \
    --to=s-beyer@gmx.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).