kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ab/detox-config-gettext' 

The last remnant of gettext-poison has been removed.

* ab/detox-config-gettext:
  config.c: remove last remnant of GIT_TEST_GETTEXT_POISON
maint
Junio C Hamano 2021-04-13 15:28:52 -07:00
parent a9414b86ac 39e12650d7
commit e6545201ad
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.c
View File

@ -1180,20 +1180,6 @@ 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 git_config_int(const char *name, const char *value)
{ {
int ret; int ret;
@ -1268,7 +1254,7 @@ int git_config_bool(const char *name, const char *value)
{ {
int v = git_parse_maybe_bool(value); int v = git_parse_maybe_bool(value);
if (v < 0) if (v < 0)
die_bad_bool(name, value); die(_("bad boolean config value '%s' for '%s'"), value, name);
return v; return v;
} }