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
Eric Sunshine <sunshine@sunshineco.com>
Date
May 2, 2021, 23:19 UTC
Message-ID
<CAPig+cSz6TDs6=URFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ@mail.gmail.com>
In-Reply-To
<CAPig+cS+b-SV6SUkhWMui7_vTEeJYumDDDM10DdrkNqpgm=z_A@mail.gmail.com>
On Sun, May 2, 2021 at 2:52 AM Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 9 quoted lines
> On Sun, May 2, 2021 at 1:49 AM Josh Soref <jsoref@gmail.com> wrote:
> > Eric Sunshine wrote:
> > > diff --git a/notes-merge.c b/notes-merge.c
> > > - printf("Already up to date!\n");
> > > + printf_ln("Already up to date.");
> >
> > Should this have `_(...)` decorations?
>
> Yes, indeed. I'll fix it in a re-roll and mention it in the commit message.

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.

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).

Previous: Eric SunshineNext: Junio C Hamano
Message 3 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.