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

Re: Bug with branches/merges in submodules

From
MDMel Dafert <mel@dafert.at>
Date
Jul 14, 2021, 11:07 UTC
Message-ID
<6502FFC0-E19B-41FA-B152-885B339360F0@dafert.at>
In-Reply-To
<b519a79a-5e35-bb40-71d3-0fb3c65320d7@gmail.com>

Hello Philippe, Thank you for your reply, and the points to the mailing list.

Show 16 quoted lines
>Thanks for the reproducer. The behaviour for 'git log/show/diff' is due this line
>and the behaviour for 'git submodule summary' to these lines.
>
>For 'git diff' and friends, it goes back to the addition of the '--submodule=log'
>option in 752c0c2492 (Add the --submodule option to the diff option family, 2009-10-19).
>(authored CC'ed). The use of '--first-parent' was discussed on the list
>when this was implemented. I did not read the whole thing.
>
>For 'git submodule summary', it goes back to the addition of the subcommand
>in 1cb639e6b0 (git-submodule summary: show commit summary, 2008-03-11). (author also CC'ed).
>The justification of the use of '--first-parent' was not really discussed
>as far as I could tell.
>
>
>I personnally think it would be a good addition to be able to choose
>if yes or no '--first-parent' should be used
The discussion you found [1] also suggested that as a future option.

In the original implementation, the first mention is [2], where the length of the message is discussed - I (and later discussions) assume that this just happened to be the preference of the author.

I would thus like to correct myself, and refile this as a feature request - it would be very helpful to me to have this as an option, possibly even with one that can be set in the config, similar to 'diff.submodule=log'.

I would be open to implementing this - I might need some mentoring, however, as this would be my first time contributing (and reading the git codebase).

Regards, Mel

[1] https://lore.kernel.org/git/67a884457aeaead275612be10902a80726b2a7db.1254668669u.git.johannes.schindelin@gmx.de/t/#u [2] https://lore.kernel.org/git/46dff0320803061750x70d059a2yaf1e5751e9c62150@mail.gmail.com/

Previous: Philippe BlainNext: Philippe Blain
Message 3 of 4 in “Bug with branches/merges in submodules”
  1. Mel DafertJul 7, 2021
  2. Philippe BlainJul 9, 2021
  3. Mel DafertJul 14, 2021
  4. Philippe BlainJul 14, 2021

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.