Re: [PATCH] read-cache.c: Ensure unmerged entries are removed

From: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Date: Aug 13, 2014, 22:10 UTC
Message-ID: <CAPuZ2NGB710TUW4VJB5kGWjoXV+eiebv_ZYvooG=E-J-MLXywQ@mail.gmail.com>
In-Reply-To: <xmqqd2c55zl6.fsf@gitster.dls.corp.google.com>

On Tue, Aug 12, 2014 at 8:31 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

>
> Jaime Soriano Pastor <jsorianopastor@gmail.com> writes:
>
> > A file in the index can be left as merged and unmerged at the same time
> > by some tools as libgit2, this causes some undesiderable behaviours in git.
>
> Well, doesn't it mean that libgit2 is broken?  Have you filed a bug
> over there yet?
>

Yes, exactly, I think libgit2 is broken but I wanted to double-check that it was still happening in their master branch, and it is. I have reported the bug after checking it. https://github.com/libgit2/libgit2/issues/2515

>
> Having said that, protecting ourselves from insanity left by other
> people is always a good idea, provided that it can be done without
> bending overly backwards.

Yes, I think the most important thing in this case is to protect git against this kind of inconsistencies.