From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 05 Jun 2015 15:36:37 GMT
Subject: Re: [RFC] git-am: handling unborn branches
Message-ID: <xmqqfv66tbei.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CACRoPnS9UK0ebD2JdSfun8+F0MXj6Loza4Y07whqbO6tV4_APQ@mail.gmail.com>

Paul Tan <pyokagan@gmail.com> writes:

> Hmm, actually git-am.sh doesn't seem to do that even when we have a
> history to apply patches to. This is okay in the non-3way case, as
> git-apply will check to see if the patch applies before it modifies
> the index, but if we fall back on 3-way merge, any new files the
> failed merge added will not be deleted in the "git read-tree --reset
> -u HEAD HEAD".
>
> Should we do that?

That sounds like the right thing to do; I agree that fixing it may
or may not be outside the scope of the immediate series.