From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 06 Oct 2011 00:08:38 GMT
Subject: Re: git-cherry-pick and git-commit --amend in version 1.7.6.4
Message-ID: <CAG+J_DxJ25bBo0=30+9r3+kwy+u4M9ZdihnctsMYis+zgbduEg@mail.gmail.com>
In-Reply-To: <7vhb3n5asv.fsf@alter.siamese.dyndns.org>

On Wed, Oct 5, 2011 at 6:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Does it also refrain from creating sequencer state directory?

I'm not familiar with the sequencer code. It's not in master is it?

What's happening here is that do_pick_commit() was creating
CHERRY_PICK_HEAD, but then git aborts several call sites away
(do_recursive_merge -> merge_trees -> git_merge_trees -> unpack_trees
-> display_error_msgs).

So I think do_pick_commit() needs to defer creating CHERRY_PICK_HEAD
till after the possible abort.

I don't know if that's the right fix for next or not, but it seems
correct for master.

j.