From: Junio C Hamano <gitster@pobox.com>
To: devel-git@morey-chaisemartin.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict
Date: Thu, 17 Mar 2011 11:47:12 -0700 [thread overview]
Message-ID: <7v1v254ma7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4D81C1AA.5010008@morey-chaisemartin.com> (Nicolas Morey-Chaisemartin's message of "Thu, 17 Mar 2011 09:09:14 +0100")
Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> writes:
> During a merge with conflict on a submodule, the submodule appears 3
> times in git ls-files (stage 1,2,3) which causes the submodule to be
> used 3 times in git submodule update or status command. This patch
> filters the results of git ls-files and only shows submodule in stage 0
> or 1 thus removing the duplicates.
That is a wrong thing to do. What if both sides added a submodule at the
same directory after forked from an ancestor that did not have it? You
will have only stage #2 and stage #3, no?
next prev parent reply other threads:[~2011-03-17 18:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 8:09 [PATCH] git-submodule: Remove duplicate entries during merge with conflict Nicolas Morey-Chaisemartin
2011-03-17 18:47 ` Junio C Hamano [this message]
2011-03-17 20:50 ` Junio C Hamano
2011-03-21 8:43 ` Nicolas Morey-Chaisemartin
2011-03-21 20:53 ` Jens Lehmann
2011-03-21 20:29 ` Jens Lehmann
2011-03-21 20:59 ` Junio C Hamano
2011-03-21 21:34 ` Nicolas Morey-Chaisemartin
2011-03-21 22:01 ` Jens Lehmann
2011-03-22 6:28 ` Nicolas Morey-Chaisemartin
2011-07-14 18:33 ` funeeldy
2011-07-15 19:27 ` Jens Lehmann
2011-07-15 20:32 ` Marlene Cote
2011-07-15 21:41 ` Jens Lehmann
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=7v1v254ma7.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=devel-git@morey-chaisemartin.com \
--cc=git@vger.kernel.org \
/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).