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

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

[Josh Soref]

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?

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

[Eric Sunshine]

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

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

[Eric Sunshine]

On Sun, May 2, 2021 at 2:52 AM Eric Sunshine <sunshine@sunshineco.com> wrote:
> 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).

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

[Junio C Hamano]

Eric Sunshine <sunshine@sunshineco.com> 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.