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

On Tue, Aug 12, 2014 at 8:31 PM, Junio C Hamano [off-list ref] wrote:

Jaime Soriano Pastor [off-list ref] writes:

quoted

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.