# Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934) 4 messages from 2021-05-02 to 2021-05-03. Participants: Josh Soref, Eric Sunshine, Junio C Hamano. Thread: https://gitlist.dev/t/55606 ## Josh Soref, 2021-05-02 05:49 Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Message-ID: URL: https://gitlist.dev/e/CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA%40mail.gmail.com In-Reply-To: ``` Eric Sunshine wrote: > diff --git a/notes-merge.c b/notes-merge.c > index d2771fa3d4..321155fc87 100644 > --- a/notes-merge.c > +++ b/notes-merge.c > @@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o, > if (oideq(&remote->object.oid, base_oid)) { > /* Already merged; result == local commit */ > if (o->verbosity >= 2) > - printf("Already up to date!\n"); > + printf_ln("Already up to date."); > oidcpy(result_oid, &local->object.oid); > goto found_result; > } Should this have `_(...)` decorations? ``` ## Eric Sunshine, 2021-05-02 06:52 Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Message-ID: URL: https://gitlist.dev/e/CAPig%2BcS%2Bb-SV6SUkhWMui7_vTEeJYumDDDM10DdrkNqpgm%3Dz_A%40mail.gmail.com In-Reply-To: ``` On Sun, May 2, 2021 at 1:49 AM Josh Soref wrote: > Eric Sunshine wrote: > > diff --git a/notes-merge.c b/notes-merge.c > > @@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o, > > if (o->verbosity >= 2) > > - 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. ``` ## Eric Sunshine, 2021-05-02 23:19 Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Message-ID: URL: https://gitlist.dev/e/CAPig%2BcSz6TDs6%3DURFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ%40mail.gmail.com In-Reply-To: ``` On Sun, May 2, 2021 at 2:52 AM Eric Sunshine wrote: > On Sun, May 2, 2021 at 1:49 AM Josh Soref 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). ``` ## Junio C Hamano, 2021-05-03 01:13 Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Message-ID: URL: https://gitlist.dev/e/xmqqa6pcbow6.fsf%40gitster.g In-Reply-To: ``` Eric Sunshine writes: > 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. ```