Skip to content

Commit 39e1265

Browse files
avargitster
authored andcommitted
config.c: remove last remnant of GIT_TEST_GETTEXT_POISON
Remove a use of GIT_TEST_GETTEXT_POISON added in f276e2a (config: improve error message for boolean config, 2021-02-11). This was simultaneously in-flight with my d162b25 (tests: remove support for GIT_TEST_GETTEXT_POISON, 2021-01-20) which removed the rest of the GIT_TEST_GETTEXT_POISON code. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0dda60 commit 39e1265

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

config.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,20 +1180,6 @@ static void die_bad_number(const char *name, const char *value)
11801180
}
11811181
}
11821182

1183-
NORETURN
1184-
static void die_bad_bool(const char *name, const char *value)
1185-
{
1186-
if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
1187-
/*
1188-
* We explicitly *don't* use _() here since it would
1189-
* cause an infinite loop with _() needing to call
1190-
* use_gettext_poison().
1191-
*/
1192-
die("bad boolean config value '%s' for '%s'", value, name);
1193-
else
1194-
die(_("bad boolean config value '%s' for '%s'"), value, name);
1195-
}
1196-
11971183
int git_config_int(const char *name, const char *value)
11981184
{
11991185
int ret;
@@ -1268,7 +1254,7 @@ int git_config_bool(const char *name, const char *value)
12681254
{
12691255
int v = git_parse_maybe_bool(value);
12701256
if (v < 0)
1271-
die_bad_bool(name, value);
1257+
die(_("bad boolean config value '%s' for '%s'"), value, name);
12721258
return v;
12731259
}
12741260

0 commit comments

Comments
 (0)