path: root/gettext.c
diff options
authorJunio C Hamano <>2019-07-25 20:59:20 (GMT)
committerJunio C Hamano <>2019-07-25 20:59:20 (GMT)
commit023ff4cdf5793437313f481b4ef5b1ec247f2301 (patch)
treefe222b4b3edeb442b7873d89d03556a1e11c1274 /gettext.c
parent9c9b961d7eb15fb583a2a812088713a68a85f1c0 (diff)
parent08a8ac88d868f3206e8faf0df2502ebc18925c33 (diff)
Merge branch 'ab/test-env'
Many GIT_TEST_* environment variables control various aspects of how our tests are run, but a few followed "non-empty is true, empty or unset is false" while others followed the usual "there are a few ways to spell true, like yes, on, etc., and also ways to spell false, like no, off, etc." convention. * ab/test-env: env--helper: mark a file-local symbol as static tests: make GIT_TEST_FAIL_PREREQS a boolean tests: replace test_tristate with "git env--helper" tests README: re-flow a previously changed paragraph tests: make GIT_TEST_GETTEXT_POISON a boolean t6040 test: stop using global "script" variable config.c: refactor die_bad_number() to not call gettext() early env--helper: new undocumented builtin wrapping git_env_*() config tests: simplify include cycle test
Diffstat (limited to 'gettext.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/gettext.c b/gettext.c
index 3f2aca5..35d2c12 100644
--- a/gettext.c
+++ b/gettext.c
@@ -68,10 +68,8 @@ const char *get_preferred_languages(void)
int use_gettext_poison(void)
static int poison_requested = -1;
- if (poison_requested == -1) {
- const char *v = getenv("GIT_TEST_GETTEXT_POISON");
- poison_requested = v && strlen(v) ? 1 : 0;
- }
+ if (poison_requested == -1)
+ poison_requested = git_env_bool("GIT_TEST_GETTEXT_POISON", 0);
return poison_requested;