From: Jeff King <peff@peff.net> To: Junio C Hamano <gitster@pobox.com> Cc: "Derrick Stolee" <dstolee@microsoft.com>, "Jean-Noël Avila" <jn.avila@free.fr>, git@vger.kernel.org, "Jiang Xin" <worldhello.net@gmail.com> Subject: Re: [PATCH v3] l10n: reformat some localized strings for v2.23.0 Date: Tue, 6 Aug 2019 14:10:44 -0400 Message-ID: <20190806181044.GA7005@sigill.intra.peff.net> (raw) In-Reply-To: <xmqqo912ji1k.fsf@gitster-ct.c.googlers.com> On Tue, Aug 06, 2019 at 10:54:47AM -0700, Junio C Hamano wrote: > Jean-Noël Avila <jn.avila@free.fr> writes: > > > Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> > > --- > > builtin/checkout.c | 2 +- > > builtin/fetch.c | 15 +++++++++++---- > > 2 files changed, 12 insertions(+), 5 deletions(-) > > Thanks. Folks, does this look sensible (it does to me)? Yes, modulo a funny indent in the final hunk (git-am will complain about it). I think we can take this as-is, but I did notice one thing when I actually looked carefully at the surrounding code... > > if (advice_fetch_show_forced_updates) { > > if (!fetch_show_forced_updates) { > > - warning(_("Fetch normally indicates which branches had a forced update, but that check has been disabled.")); > > - warning(_("To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'.")); > > + warning(_(warn_show_forced_updates)); This is controlled by advice.fetchShowForcedUpdates. Should these warning() calls actually be advise()? In which case everything I said about newlines and prefixes would then just work out, because advise() does prefix each line independently. I'm happy to punt on that until post-release, though, in the name of calming things down rather than stirring them up. :) -Peff
next prev parent reply other threads:[~2019-08-06 18:10 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-30 3:35 [L10N] Kickoff for Git 2.23.0 round #1 Jiang Xin 2019-08-03 10:18 ` [RFC] l10n: fix some typos for v2.23.0 Jean-Noël Avila 2019-08-03 13:50 ` Jiang Xin 2019-08-03 19:59 ` [PATCH v2] l10n: reformat some localized strings " Jean-Noël Avila 2019-08-03 23:45 ` Jeff King 2019-08-04 11:01 ` Jean-Noël AVILA 2019-08-05 4:21 ` Jeff King 2019-08-05 18:49 ` Junio C Hamano 2019-08-05 21:15 ` Jeff King 2019-08-06 17:19 ` [PATCH v3] " Jean-Noël Avila 2019-08-06 17:54 ` Junio C Hamano 2019-08-06 18:10 ` Jeff King [this message] 2019-08-06 19:45 ` Junio C Hamano
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=20190806181044.GA7005@sigill.intra.peff.net \ --to=peff@peff.net \ --cc=dstolee@microsoft.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=jn.avila@free.fr \ --cc=worldhello.net@gmail.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
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://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.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 the 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