Re: [PATCH v2] Introduce CHERRY_PICK_HEAD

From: Jay Soffian <jaysoffian@gmail.com>
Date: Feb 16, 2011, 22:13 UTC
Message-ID: <AANLkTimBExej1mF=4UuTszcSoKy_xnj7bB3BaT5ze2vH@mail.gmail.com>
In-Reply-To: <20110216214236.GC2615@elie>

On Wed, Feb 16, 2011 at 4:42 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

> Nit: GIT_CHERRY_PICK_HELP is not just for rebase --interactive but
> for arbitrary porcelain that wants to take care of the commit itself
> (see v1.5.4-rc0~106^2~1, revert/cherry-pick: Allow overriding the
> help text by the calling Porcelain, 2007-11-28).

What is the arbitrary porcelain you have in mind? :-)

> The conservative thing to do is indeed to remove CHERRY_PICK_HEAD in
> this case, I suppose.  But I'd like to have the CHERRY_PICK_HEAD to
> get the --amend safety when rebasing.  I can send a separate patch
> for it if you'd like.

Please do, since I'm not really sure what you have in mind. If CHERRY_PICK_HEAD is left-behind, it interferes with the eventually commit done by rebase --continue. I suppose we could give commit.c some additional logic to detect when it's being called by rebase (setting whence = FROM_REBASE?).

In the mean time, I'll re-roll with your additional tests and Junio's prior feedback.

Thanks,

j.