opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'ak/config-bad-bool-error' 

The error message given when a configuration variable that is
expected to have a boolean value has been improved.

* ak/config-bad-bool-error:
  config: improve error message for boolean config
This commit is contained in:
Junio C Hamano 2021-02-17 17:21:43 -08:00
parent e68f62be8d f276e2a469
commit 483e09e810
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.c
View File

@ -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);
}
int git_config_int(const char *name, const char *value)
{
int ret;
@ -1252,8 +1266,10 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
int git_config_bool(const char *name, const char *value)
{
int discard;
return !!git_config_bool_or_int(name, value, &discard);
int v = git_parse_maybe_bool(value);
if (v < 0)
die_bad_bool(name, value);
return v;
}
int git_config_string(const char **dest, const char *var, const char *value)

7
t/t1300-config.sh
View File

@ -675,6 +675,13 @@ test_expect_success 'invalid unit' '
test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
'
test_expect_success 'invalid unit boolean' '
git config commit.gpgsign "1true" &&
test_cmp_config 1true commit.gpgsign &&
test_must_fail git config --bool --get commit.gpgsign 2>actual &&
test_i18ngrep "bad boolean config value .1true. for .commit.gpgsign." actual
'
test_expect_success 'line number is reported correctly' '
printf "[bool]\n\tvar\n" >invalid &&
test_must_fail git config -f invalid --path bool.var 2>actual &&