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

Re: [PATCH 0/2] Submodule merging: i18n, verbosity

From
Elijah Newren <newren@gmail.com>
Date
May 11, 2018, 00:04 UTC
Message-ID
<CABPp-BFPaOxokRoiVnAB+KRMt6=NihmjRH+exS_NbGMbdj+k4Q@mail.gmail.com>
In-Reply-To
<20180510211917.138518-1-sbeller@google.com>
On Thu, May 10, 2018 at 2:19 PM, Stefan Beller <sbeller@google.com> wrote:
Show 15 quoted lines
> Leif wrote:
>> Sure, let me know what to use instead and I’ll update and resubmit the patch.
>> Sure, but `MERGE_WARNING` prefixes all the messages with "Failed to
>> merge submodule“.
>
> I thought about replying and coming up with good reasons, but I wrote some
> patches instead.
>
> They can also be found at https://github.com/stefanbeller/git/tree/submodule_i18n_verbose
>
> I think these would be a good foundation for your patch as well, as you can use the
> output() function for the desired cases.
>
> Feel free to take these patches as part of your series or adapt
> (or be inspired by) as needed.

This is awesome. In addition to the good reasons you gave, switching merge_submodule() to use output() was one of several things on my todo list since I think it'd be needed for remerge-diffs (https://bugs.chromium.org/p/git/issues/detail?id=12) and might be useful for merges in bare repos; thanks for tackling it.

Patches look good to me. Having Leif's patch on top of these two would be great.

Elijah
Previous: Elijah NewrenNext: Stefan Beller
Message 9 of 15 in “warn about auto fast-forwarded submodules during merges”
  1. 0/1 warn about auto fast-forwarded submodules during mergesLeif Middelschulte, May 10, 2018
  2. 1/1 Warn about fast-forwarding of submodules during mergeLeif Middelschulte, May 10, 2018
  3. Stefan BellerMay 10, 2018
  4. Leif MiddelschulteMay 10, 2018
  5. 0/2 Submodule merging: i18n, verbosityStefan Beller, May 10, 2018
  6. 1/2 submodule.c: move submodule merging to merge-recursive.cStefan Beller, May 10, 2018
  7. 2/2 merge-recursive: i18n submodule merge output and respect verbosityStefan Beller, May 10, 2018
  8. Elijah NewrenMay 15, 2018
  9. Elijah NewrenMay 11, 2018
  10. Stefan BellerMay 11, 2018
  11. 0/1 rebased: inform about auto submodule ff during mergeLeif Middelschulte, May 14, 2018
  12. 1/1 Inform about fast-forwarding of submodules during mergeLeif Middelschulte, May 14, 2018
  13. Stefan BellerMay 15, 2018
  14. Elijah NewrenMay 15, 2018
  15. Junio C HamanoMay 15, 2018

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.