Jay Soffian <jaysoffian@xxxxxxxxx> writes:
> On Wed, Oct 5, 2011 at 1:40 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> Pinging Jay who may have know a thing or two from the history leading to
>> 37f7a85 (Teach commit about CHERRY_PICK_HEAD, 2011-02-19).
>
> Yep, I replied to Nicolas' other message.
>
> j.
This is probably different fro Nicolas's use case, but you can easily
trigger:
$ edit foo.c
$ EDITOR=: git commit --amend ;# forget to add foo.c
$ git cherry-pick other
error: Your local changes to the following files would be overwritten by
merge:
foo.c
Please, commit your changes or stash them before you can merge.
Aborting
$ EDITOR=: git commit --amend foo.c
fatal: You are in the middle of a cherry-pick -- cannot amend.
I think the sequencer state needs to be removed when the command aborts.
This needs to be fixed before 1.7.7.1.
--
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