From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Josh Soref <jsoref@gmail.com>,
"gitgitgadget/git"
<reply+AAQFMLC42KHLQTLKSC5H3XV6TILQ3EVBNHHDGQXBRY@reply.github.com>,
Git List <git@vger.kernel.org>
Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
Date: Mon, 03 May 2021 10:13:29 +0900 [thread overview]
Message-ID: <xmqqa6pcbow6.fsf@gitster.g> (raw)
In-Reply-To: <CAPig+cSz6TDs6=URFcmi8w0zdvTKV9k2346LHpiWbqKm4tXzRQ@mail.gmail.com> (Eric Sunshine's message of "Sun, 2 May 2021 19:19:37 -0400")
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.
prev parent reply other threads:[~2021-05-03 1:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa6pcbow6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jsoref@gmail.com \
--cc=reply+AAQFMLC42KHLQTLKSC5H3XV6TILQ3EVBNHHDGQXBRY@reply.github.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).