Re: [PATCH 3/6] apply: fix adding new files on i-t-a entries

From: Duy Nguyen <pclouds@gmail.com>
Date: Dec 29, 2015, 14:02 UTC
Message-ID: <CACsJy8Ad5uihFqVBR4rLA4at_fBDx-yRx1VP1d-uR+4Uug6M9g@mail.gmail.com>
In-Reply-To: <xmqqpoxr9szy.fsf@gitster.mtv.corp.google.com>

On Mon, Dec 28, 2015 at 10:01 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 20 quoted lines

> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
>
>> Suppose that you came up with some contents to register at path F in
>> your working tree, told Git about your intention with "add -N F", and
>> then tried to apply a patch that wants to _create_ F:
>>
>> Without this patch, we would say "F already exists so a patch to
>> create is incompatible with our current state".
>>
>> With this patch, i-t-a entries are ignored and we do not say that, but
>> instead we'll hopefully trigger "does it exist in the working tree"
>> check, unless you are running under "--cached".
>>
>> Which means that this change will not lead to data loss in the
>> "untracked" file F in the working tree that was merely added to the
>> index with i-t-a bit.
>>
>> (commit message mostly from Junio)
>
> Hmm, I do not quite recall.

For reference ;)

https://www.mail-archive.com/git@vger.kernel.org/msg76461.html

> The above looks under-explained anyway;
> ...

Not enough energy to go through this. Will do later and post new proposed commit message.

-- 
Duy