Merge branch 'ab/detox-config-gettext'

gitster · gitster · commit e6545201ad8b · 2021-04-13T15:28:53.000-07:00
The last remnant of gettext-poison has been removed.

* ab/detox-config-gettext:
  config.c: remove last remnant of GIT_TEST_GETTEXT_POISON
diff --git a/config.c b/config.c
@@ -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 ret;
@@ -1268,7 +1254,7 @@ int git_config_bool(const char *name, const char *value)
 {
 	int v = git_parse_maybe_bool(value);
 	if (v < 0)
-		die_bad_bool(name, value);
+		die(_("bad boolean config value '%s' for '%s'"), value, name);
 	return v;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1180,20 +1180,6 @@ static void die_bad_number(const char name, const char value)`
`1180`	`1180`	`}`
`1181`	`1181`	`}`
`1182`	`1182`
`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`		`-`
`1197`	`1183`	`int git_config_int(const char name, const char value)`
`1198`	`1184`	`{`
`1199`	`1185`	`int ret;`
`@@ -1268,7 +1254,7 @@ int git_config_bool(const char name, const char value)`
`1268`	`1254`	`{`
`1269`	`1255`	`int v = git_parse_maybe_bool(value);`
`1270`	`1256`	`if (v < 0)`
`1271`		`- die_bad_bool(name, value);`
	`1257`	`+ die(_("bad boolean config value '%s' for '%s'"), value, name);`
`1272`	`1258`	`return v;`
`1273`	`1259`	`}`
`1274`	`1260`