From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 06 Oct 2011 17:21:40 GMT
Subject: Re: [PATCH] revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Message-ID: <CAG+J_Dzh2Njjwykt-f4w_YqpftrJEpQfUW2OvSRs_MSPcNFQnw@mail.gmail.com>
In-Reply-To: <7vty7m12b2.fsf@alter.siamese.dyndns.org>

On Thu, Oct 6, 2011 at 1:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
> I think do_recursive_merge() would die() when the merge cannot even start
> (i.e. the local changes after the cherry-pick exits are the ones from the
> time before such a failed cherry-pick started), but I suspect that the
> other codepath uses try_merge_command() to drive strategies other than
> recursive and it does not die() there in such a case. Can you make sure
> this patch is sufficient in such a case as well?

Why does recursive die with a dirty tree but not other strategies?

For that matter, why does revert.c have it's own implementation of
recursive instead of just calling try_merge_command("recursive", ...)?

j.