From: Paul Tan <pyokagan@gmail.com>
Date: Tue, 09 Jun 2015 09:18:14 GMT
Subject: Re: [PATCH 5/6] am --abort: support aborting to unborn branch
Message-ID: <CACRoPnQft7p1QrVwYaKcBnyoAkZLm0uOaf84E+jrdDUb8myweg@mail.gmail.com>
In-Reply-To: <xmqq8ubu9d1a.fsf@gitster.dls.corp.google.com>

On Tue, Jun 9, 2015 at 4:10 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Paul Tan <pyokagan@gmail.com> writes:
>
>> When git-am is first run on an unborn branch, no ORIG_HEAD is created.
>> As such, any applied commits will remain even after a git am --abort.
>
> I think this answered my question on 4/6; that may indicate that
> these two are either done in a wrong order or perhaps should be a
> single change.

Ah right, patch 4/6 was too sneaky in that it tried to do the "support
unborn branch" thing as well, which should only be handled in this
patch.

I still think the patches should be separate though since they are
conceptually different. 4/6 modifies the "index clean up" function,
while 5/6 modifies the "reset HEAD" function.

Thanks,
Paul