From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Git Mailing List <git@vger.kernel.org>,
Heiko Voigt <hvoigt@hvoigt.net>
Subject: Re: [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts
Date: Sun, 15 May 2011 12:00:45 +0700 [thread overview]
Message-ID: <BANLkTim_J7gW1rW+yO74ETEjFcHhyArBRg@mail.gmail.com> (raw)
In-Reply-To: <7vfwoh5fom.fsf@alter.siamese.dyndns.org>
On Sun, May 15, 2011 at 12:56 AM, Junio C Hamano <gitster@pobox.com> wrote:
> 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.
True for .gitignore. A line in .gitattributes is more complex, it's
easier to break the parser with conflict markers. Anyway unmerged
entries should not be used until they're cleaned up, or can be used
with a big fat warning.
--
Duy
prev parent reply other threads:[~2011-05-15 5:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-14 16:25 [PATCH v2 0/2] better handle .gitmodules merge conflicts Jens Lehmann
2011-05-14 16:26 ` [PATCH v2 1/2] test that git status works with merge conflict in, .gitmodules Jens Lehmann
2011-05-14 16:26 ` [PATCH v2 2/2] Submodules: Don't parse .gitmodules when it contains, merge conflicts Jens Lehmann
2011-05-14 16:59 ` Nguyen Thai Ngoc Duy
2011-05-14 17:46 ` Jens Lehmann
2011-05-14 17:56 ` Junio C Hamano
2011-05-15 5:00 ` Nguyen Thai Ngoc Duy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTim_J7gW1rW+yO74ETEjFcHhyArBRg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).