git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jean-Noel Avila <jn.avila@free.fr>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] i18n: simplify numeric error reporting
Date: Wed, 24 Aug 2016 08:48:02 -0700	[thread overview]
Message-ID: <xmqqoa4irwwd.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160821145039.12121-3-jn.avila@free.fr> (Jean-Noel Avila's message of "Sun, 21 Aug 2016 16:50:39 +0200")

I'll squash this in to avoid compilation breakage.  We do not allow
decl-after-stmt.

Thanks.

 config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.c b/config.c
index e33c703..0dfed68 100644
--- a/config.c
+++ b/config.c
@@ -652,10 +652,11 @@ int git_parse_ulong(const char *value, unsigned long *ret)
 NORETURN
 static void die_bad_number(const char *name, const char *value)
 {
+	const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
+
 	if (!value)
 		value = "";
 
-	const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
 	if (!(cf && cf->name))
 		die(_("bad numeric config value '%s' for '%s': %s"),
 		    value, name, error_type);

  reply	other threads:[~2016-08-24 15:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15 15:04 [L10N] Kickoff of translation for Git 2.10.0 round 1 Jiang Xin
2016-08-20 16:01 ` Jean-Noël AVILA
2016-08-20 18:03   ` Junio C Hamano
2016-08-20 18:38     ` Jean-Noël AVILA
2016-08-21 15:45       ` Jiang Xin
2016-08-23 15:58       ` Junio C Hamano
2016-08-23 18:16         ` Jean-Noël AVILA
2016-08-21 14:50     ` [PATCH 1/3] i18n: fix typos for translation Jean-Noel Avila
2016-08-21 14:50       ` [PATCH 2/3] i18n: fix git rebase interactive commit messages Jean-Noel Avila
2016-08-21 14:50       ` [PATCH 3/3] i18n: simplify numeric error reporting Jean-Noel Avila
2016-08-24 15:48         ` Junio C Hamano [this message]
2016-08-23 16:06       ` [PATCH 1/3] i18n: fix typos for translation Junio C Hamano
2016-08-24 15:44         ` Junio C Hamano
2016-08-24 15:45         ` Junio C Hamano
2016-08-25  5:24   ` [L10N] Kickoff of translation for Git 2.10.0 round 1 Alex Henrie

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=xmqqoa4irwwd.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    /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).