diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 22:59:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 22:59:20 +0200 |
| commit | 023ff4cdf5793437313f481b4ef5b1ec247f2301 (patch) | |
| tree | fe222b4b3edeb442b7873d89d03556a1e11c1274 /git-sh-i18n.sh | |
| parent | The sixth batch (diff) | |
| parent | env--helper: mark a file-local symbol as static (diff) | |
| download | git-023ff4cdf5793437313f481b4ef5b1ec247f2301.tar.xz git-023ff4cdf5793437313f481b4ef5b1ec247f2301.zip | |
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 'git-sh-i18n.sh')
| -rw-r--r-- | git-sh-i18n.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh index e1d917fd27..8eef60b43f 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh @@ -17,7 +17,9 @@ export TEXTDOMAINDIR # First decide what scheme to use... GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -if test -n "$GIT_TEST_GETTEXT_POISON" +if test -n "$GIT_TEST_GETTEXT_POISON" && + git env--helper --type=bool --default=0 --exit-code \ + GIT_TEST_GETTEXT_POISON then GIT_INTERNAL_GETTEXT_SH_SCHEME=poison elif test -n "@@USE_GETTEXT_SCHEME@@" |