{"thread":{"id":"55606","subject":"Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)","startedAt":"2021-05-02T05:49:48Z","lastAt":"2021-05-03T01:13:35Z","messageCount":4,"participants":["Josh Soref","Eric Sunshine","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"423434","messageId":"CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA@mail.gmail.com","threadId":"55606","inReplyTo":"gitgitgadget/git/pull/934/c830744540@github.com","subject":"Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)","fromName":"Josh Soref","fromEmail":"jsoref@gmail.com","sentAt":"2021-05-02T05:49:33Z","receivedAt":"2021-05-02T05:49:48Z","isPatch":false,"sender":{"key":"jsoref@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2119212?v=4"},"body":"Eric Sunshine wrote:\n> diff --git a/notes-merge.c b/notes-merge.c\n> index d2771fa3d4..321155fc87 100644\n> --- a/notes-merge.c\n> +++ b/notes-merge.c\n> @@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,\n>   if (oideq(&remote->object.oid, base_oid)) {\n>   /* Already merged; result == local commit */\n>   if (o->verbosity >= 2)\n> - printf(\"Already up to date!\\n\");\n> + printf_ln(\"Already up to date.\");\n>   oidcpy(result_oid, &local->object.oid);\n>   goto found_result;\n>   }\n\nShould this have `_(...)` decorations?\n"},{"id":"423440","messageId":"CAPig+cS+b-SV6SUkhWMui7_vTEeJYumDDDM10DdrkNqpgm=z_A@mail.gmail.com","threadId":"55606","inReplyTo":"CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA@mail.gmail.com","subject":"Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2021-05-02T06:52:45Z","receivedAt":"2021-05-02T06:52:59Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, May 2, 2021 at 1:49 AM Josh Soref <jsoref@gmail.com> wrote:\n> Eric Sunshine wrote:\n> > diff --git a/notes-merge.c b/notes-merge.c\n> > @@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,\n> >   if (o->verbosity >= 2)\n> > - printf(\"Already up to date!\\n\");\n> > + printf_ln(\"Already up to date.\");\n>\n> Should this have `_(...)` decorations?\n\nYes, indeed. I'll fix it in a re-roll and mention it in the commit message.\n"},{"id":"423451","messageId":"CAPig+cSz6TDs6=URFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ@mail.gmail.com","threadId":"55606","inReplyTo":"CAPig+cS+b-SV6SUkhWMui7_vTEeJYumDDDM10DdrkNqpgm=z_A@mail.gmail.com","subject":"Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2021-05-02T23:19:37Z","receivedAt":"2021-05-02T23:19:50Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, May 2, 2021 at 2:52 AM Eric Sunshine <sunshine@sunshineco.com> wrote:\n> On Sun, May 2, 2021 at 1:49 AM Josh Soref <jsoref@gmail.com> wrote:\n> > Eric Sunshine wrote:\n> > > diff --git a/notes-merge.c b/notes-merge.c\n> > > - printf(\"Already up to date!\\n\");\n> > > + printf_ln(\"Already up to date.\");\n> >\n> > Should this have `_(...)` decorations?\n>\n> Yes, indeed. I'll fix it in a re-roll and mention it in the commit message.\n\nOn second thought, I don't think I will make this change since none of\nthe messages in `notes-merge.c` have been marked for localization yet\n-- and there are a lot of messages in that file -- so wrapping just\nthis one message in `_(...)` would be inconsistent, and marking all\nmessages in `notes-merge.c` as localizable is outside the scope of\nthis series.\n\nSo, at the moment, I don't plan on re-rolling this series, and\nhopefully Junio can pick it up as-is (but, of course, will re-roll if\nsomeone spots something which needs fixing).\n"},{"id":"423452","messageId":"xmqqa6pcbow6.fsf@gitster.g","threadId":"55606","inReplyTo":"CAPig+cSz6TDs6=URFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ@mail.gmail.com","subject":"Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-03T01:13:29Z","receivedAt":"2021-05-03T01:13:35Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> On second thought, I don't think I will make this change since none of\n> the messages in `notes-merge.c` have been marked for localization yet\n> -- and there are a lot of messages in that file -- so wrapping just\n> this one message in `_(...)` would be inconsistent, and marking all\n> messages in `notes-merge.c` as localizable is outside the scope of\n> this series.\n\nI looked at the neighbouring code when I gave the \"grep\" output,\nbecause I wondered exactly about the same thing, and I agree with\nyour conclusion here.\n\n> So, at the moment, I don't plan on re-rolling this series, and\n> hopefully Junio can pick it up as-is (but, of course, will re-roll if\n> someone spots something which needs fixing).\n\nThanks.\n"}]}