git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
       [not found] ` <gitgitgadget/git/pull/934/c830744540@github.com>
@ 2021-05-02  5:49   ` Josh Soref
  2021-05-02  6:52     ` Eric Sunshine
  0 siblings, 1 reply; 4+ messages in thread
From: Josh Soref @ 2021-05-02  5:49 UTC (permalink / raw)
  To: gitgitgadget/git, git, Eric Sunshine

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?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
  2021-05-02  5:49   ` [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Josh Soref
@ 2021-05-02  6:52     ` Eric Sunshine
  2021-05-02 23:19       ` Eric Sunshine
  0 siblings, 1 reply; 4+ messages in thread
From: Eric Sunshine @ 2021-05-02  6:52 UTC (permalink / raw)
  To: Josh Soref; +Cc: gitgitgadget/git, Git List

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
  2021-05-02  6:52     ` Eric Sunshine
@ 2021-05-02 23:19       ` Eric Sunshine
  2021-05-03  1:13         ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Eric Sunshine @ 2021-05-02 23:19 UTC (permalink / raw)
  To: Josh Soref; +Cc: gitgitgadget/git, Git List, Junio C Hamano

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
  2021-05-02 23:19       ` Eric Sunshine
@ 2021-05-03  1:13         ` Junio C Hamano
  0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2021-05-03  1:13 UTC (permalink / raw)
  To: Eric Sunshine; +Cc: Josh Soref, gitgitgadget/git, Git List

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-03  1:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gitgitgadget/git/pull/934@github.com>
     [not found] ` <gitgitgadget/git/pull/934/c830744540@github.com>
2021-05-02  5:49   ` [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Josh Soref
2021-05-02  6:52     ` Eric Sunshine
2021-05-02 23:19       ` Eric Sunshine
2021-05-03  1:13         ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git