From: Junio C Hamano <gitster@pobox.com>
To: "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Andrew Klotz via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
Andrew Klotz <agc.klotz@gmail.com>
Subject: Re: [PATCH v3] config: improve error message for boolean config
Date: Fri, 12 Feb 2021 11:52:08 -0800 [thread overview]
Message-ID: <xmqqtuqhukrb.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <YCZarBDX2E3U0OXU@coredump.intra.peff.net> (Jeff King's message of "Fri, 12 Feb 2021 05:38:36 -0500")
Jeff King <peff@peff.net> writes:
> Thanks, all the changes here look good to me except for one curiosity:
>
>> diff --git a/config.c b/config.c
>> index b922b4f28572..f90b633dba21 100644
>> --- a/config.c
>> +++ b/config.c
>> @@ -1180,6 +1180,20 @@ static void die_bad_number(const char *name, const char *value)
>> }
>> }
>>
>> +NORETURN
>> +static void die_bad_bool(const char *name, const char *value)
>> +{
>> + if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
>> + /*
>> + * We explicitly *don't* use _() here since it would
>> + * cause an infinite loop with _() needing to call
>> + * use_gettext_poison().
>> + */
>> + die("bad boolean config value '%s' for '%s'", value, name);
>> + else
>> + die(_("bad boolean config value '%s' for '%s'"), value, name);
>> +}
>
> ...if this is rebased on the current master that does not have
> GIT_TEST_GETTEXT_POISON anymore, then I think this whole function can be
> simplified down to the final line.
>
> Since it looks like Junio applied this on top of v2.30.1, which still
> has GETTEXT_POISON, we need it here. But we should remember to remove it
> with the rest of the GETTEXT_POISON once it's all merged together.
Thanks for being extra careful. I sort-of considered that this was
a bugfix and that was why it is made mergeable down to the maint
track, but I do not mind making this one of the "incentives" to
upgrade for our users ;-)
I actually suspect that without any of us worrying about it, Ævar
will take care of the cleaning up when the dust settles.
Thanks.
prev parent reply other threads:[~2021-02-12 19:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 2:17 [PATCH 0/2] config: improve error message for boolean config Andrew Klotz via GitGitGadget
2020-09-18 2:17 ` [PATCH 1/2] " Andrew Klotz via GitGitGadget
2020-09-18 18:10 ` Jeff King
2020-09-18 18:30 ` Phillip Wood
2020-09-18 19:14 ` Junio C Hamano
2020-09-18 2:17 ` [PATCH 2/2] formatting for error messages Andrew Klotz via GitGitGadget
2020-09-18 17:22 ` [PATCH 0/2] config: improve error message for boolean config Junio C Hamano
2021-02-09 1:25 ` [PATCH v2] " Andrew Klotz via GitGitGadget
2021-02-09 16:51 ` Jeff King
2021-02-09 21:02 ` Junio C Hamano
2021-02-11 20:30 ` [PATCH v3] " Andrew Klotz via GitGitGadget
2021-02-12 10:38 ` Jeff King
2021-02-12 19:52 ` 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=xmqqtuqhukrb.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=agc.klotz@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood123@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
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).