Re: [PATCH v3] config: improve error message for boolean config
- From
Jeff King <peff@peff.net>
- Date
- Feb 12, 2021, 10:38 UTC
- Message-ID
- <YCZarBDX2E3U0OXU@coredump.intra.peff.net>
- In-Reply-To
- <pull.841.v3.git.git.1613075454274.gitgitgadget@gmail.com>
On Thu, Feb 11, 2021 at 08:30:53PM +0000, Andrew Klotz via GitGitGadget wrote:
Show 16 quoted lines
> From: Andrew Klotz <agc.klotz@gmail.com> > > Currently invalid boolean config values return messages about 'bad > numeric', which is slightly misleading when the error was due to a > boolean value. We can improve the developer experience by returning a > boolean error message when we know the value is neither a bool text or > int. > > before with an invalid boolean value of `non-boolean`, its unclear what > numeric is referring to: > fatal: bad numeric config value 'non-boolean' for 'commit.gpgsign': invalid unit > > now the error message mentions `non-boolean` is a bad boolean value: > fatal: bad boolean config value 'non-boolean' for 'commit.gpgsign' > > Signed-off-by: Andrew Klotz <agc.klotz@gmail.com>
Thanks, all the changes here look good to me except for one curiosity:
Show 21 quoted lines
> 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.
-Peff