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

Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)

From
Junio C Hamano <gitster@pobox.com>
Date
May 3, 2021, 01:13 UTC
Message-ID
<xmqqa6pcbow6.fsf@gitster.g>
In-Reply-To
<CAPig+cSz6TDs6=URFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 6 quoted lines
> On second thought, I don't think I will make this change since none of
> the messages in `notes-merge.c` have been marked for localization yet
> -- and there are a lot of messages in that file -- so wrapping just
> this one message in `_(...)` would be inconsistent, and marking all
> messages in `notes-merge.c` as localizable is outside the scope of
> this series.

I looked at the neighbouring code when I gave the "grep" output, because I wondered exactly about the same thing, and I agree with your conclusion here.

> So, at the moment, I don't plan on re-rolling this series, and
> hopefully Junio can pick it up as-is (but, of course, will re-roll if
> someone spots something which needs fixing).
Thanks.
Previous: Eric Sunshine
Message 4 of 4 in “Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)”
  1. Josh SorefMay 2, 2021
  2. Eric SunshineMay 2, 2021
  3. Eric SunshineMay 2, 2021
  4. Junio C HamanoMay 3, 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.