From: Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com>
Date: Thu, 24 Mar 2011 06:58:57 GMT
Subject: Re: [PATCH 1/2] git-submodule.sh: Handle submodules with merge conflicts
Message-ID: <4D8AEBB1.5010501@morey-chaisemartin.com>
In-Reply-To: <7voc52kf3t.fsf@alter.siamese.dyndns.org>

On 03/22/2011 10:41 PM, Junio C Hamano wrote:
> Jens Lehmann <Jens.Lehmann@web.de> writes:
>
>> Thanks, that fixes it nicely!
>>
>> Am 22.03.2011 09:56, schrieb Nicolas Morey-Chaisemartin:
>>> During a merge with conflict on a submodule, the submodule appears 3 times in git ls-files (stage 1,2,3) which caused the submodule to be used 3 times in git submodule init, sync, update and status command.
>>> This patch filters the results of git ls-files to generate a single entry for conflicting submodules with a 0 SHA1 and 'U' as stage.
>> Nit: Usually we wrap commit messages at about 72 characters.
> Also it is very dissapointing to see that none of the careful thinking
> that was needed while deciding what each subcommand should do was copied
> from <7vhbb1320t.fsf@alter.siamese.dyndns.org> -- did I just waste my
> time trying to guide this topic forward?
>
Sorry about that. I wasn't sure how much details you put in commit logs. I guess it wasn't enough.
I'll fix this as soon as I have added a test case for the 'U' status