From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 May 2011 17:56:41 GMT
Subject: Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts
Message-ID: <7vfwoh5fom.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTinvkxDYqNs3Pv0CniGtAHm5dJf0wg@mail.gmail.com>

Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:

> On Sat, May 14, 2011 at 11:26 PM, Jens Lehmann <Jens.Lehmann@web.de> wrote:
>> Commands like "git status", "git diff" and "git fetch" would fail when the
>> .gitmodules file contained merge conflicts because ...
>
> Side note. .gitattributes and .gitignore likely suffer the same.
> Perhaps the unmerged check in this patch can be generalized for reuse.

I am somewhat skeptical about that statement.  These files are designed to
be one-entry-per-line so that useful information in the non-conflicted
parts in a conflicted file (which should be majority) can still be used.
Only the .gitmodules is an oddball.