From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Mar 2011 18:47:12 GMT
Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict
Message-ID: <7v1v254ma7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D81C1AA.5010008@morey-chaisemartin.com>

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?