From: Jens Lehmann <jens.lehmann@web.de>
Date: Tue, 22 Mar 2011 19:22:23 GMT
Subject: Re: [PATCH 1/2] git-submodule.sh: Handle submodules with merge conflicts
Message-ID: <4D88F6EF.3020804@web.de>
In-Reply-To: <4D886430.3080300@kalray.eu>

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.

> After this patch:
> - init and sync behave as previously but only once per submodule
> - update skips submodule with merge conflicts
> - status now display a null SHA1 prefixed by 'U' for submodule with merge conflicts

A test case would be nice (t7405 looks like the right spot for one).