git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] git-submodule.sh: Handle submodules with merge conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 22, 2011, 21:41 UTC
Message-ID
<7voc52kf3t.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D88F6EF.3020804@web.de>
Jens Lehmann <Jens.Lehmann@web.de> writes:
Show 7 quoted lines
> 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?

Show 6 quoted lines
>> 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).
Previous: Jens LehmannNext: Nicolas Morey-Chaisemartin
Message 3 of 4 in “git-submodule.sh: Handle submodules with merge conflicts”
  1. 1/2 git-submodule.sh: Handle submodules with merge conflictsNicolas Morey-Chaisemartin, Mar 22, 2011
  2. Jens LehmannMar 22, 2011
  3. Junio C HamanoMar 22, 2011
  4. Nicolas Morey-ChaisemartinMar 24, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.