path: root/
diff options
authorJeff King <>2018-02-06 08:44:56 (GMT)
committerJunio C Hamano <>2018-02-08 18:09:45 (GMT)
commit373803158198310ba6ce68bfa054191038d87352 (patch)
treefd49a71d2f50c80a2d5d7e30bbd5cad9c2321895 /
parent1cdc62f6f16e6dae4343824f08286015c8c4b9c2 (diff)
git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME
Running "make NO_GETTEXT=1 GETTEXT_POISON=1" currently fails t0205. While it might seem nonsensical at first glance to both poison and disable gettext, it's useful to be able to do a poison test-run on a system that doesn't have gettext at all. And it works fine for C programs; the problem is only with the shell code. The issue is that we check the baked-in USE_GETTEXT_SCHEME value before GETTEXT_POISON. And when NO_GETTEXT is set, the Makefile sets USE_GETTEXT_SCHEME to "fallthrough". So one fix would be to have the Makefile just set USE_GETTEXT_SCHEME to "poison" if GETTEXT_POISON is set. But there are two problems with that: 1. USE_GETTEXT_SCHEME is actually a user-facing knob, so conceivably somebody could override it with: make USE_GETTEXT_SCHEME=gnu GETTEXT_POISON=1 which would do the wrong thing (though that's much less likely than them having the variable set in their config.mak and just overriding GETTEXT_POISON on the command-line for a one-off test). 2. We don't actually bake GETTEXT_POISON in to the shell library like we do for the C code. It checks $GIT_GETTEXT_POISON at runtime, which is set up by the test suite. So it makes sense to put the fix in the runtime code, too, which would cover something like: GIT_GETTEXT_POISON=foo git foo It's not likely that people use the poison code outside of running the test suite, but it's easy enough to make this case work. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 4 insertions, 4 deletions
diff --git a/ b/
index 1ef1889..9d065fb 100644
--- a/
+++ b/
@@ -17,15 +17,15 @@ export TEXTDOMAINDIR
# First decide what scheme to use...
-if test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "$GIT_GETTEXT_POISON"
+elif test -n "@@USE_GETTEXT_SCHEME@@"
: no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
elif type >/dev/null 2>&1
# GNU libintl's