From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Mar 2012 16:51:22 GMT
Subject: Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed
Message-ID: <7vk42gbkl1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1332106632-31882-1-git-send-email-andrew.kw.w@gmail.com>

Andrew Wong <andrew.kw.w@gmail.com> writes:

> For example, the sequencer current doesn't clean up CHERRY_PICK_HEAD if
> 'commit' failed due to an empty commit. Letting 'rebase -i' deal with
> removing CHERRY_PICK_HEAD keeps the sequencer's logic a bit cleaner.

Hmmm.

Isn't the real solution *not* to create the CHERRY_PICK_HEAD in the
sequencer when it is not know if it is needed, instead of the current code
which seems to create first and then selectively try to unlink() it?