diff options
| author | Jeff King <peff@peff.net> | 2018-02-06 03:44:56 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-08 10:09:45 -0800 |
| commit | 373803158198310ba6ce68bfa054191038d87352 (patch) | |
| tree | fd49a71d2f50c80a2d5d7e30bbd5cad9c2321895 | |
| parent | 1cdc62f6f16e6dae4343824f08286015c8c4b9c2 (diff) | |
| download | git-373803158198310ba6ce68bfa054191038d87352.tar.gz | |
git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEMEjk/gettext-poison
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-sh-i18n.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh index 1ef1889dbd..9d065fb4bf 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh @@ -17,15 +17,15 @@ export TEXTDOMAINDIR # First decide what scheme to use... GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -if test -n "@@USE_GETTEXT_SCHEME@@" +if test -n "$GIT_GETTEXT_POISON" +then + GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +elif test -n "@@USE_GETTEXT_SCHEME@@" then GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" then : no probing necessary -elif test -n "$GIT_GETTEXT_POISON" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME=poison elif type gettext.sh >/dev/null 2>&1 then # GNU libintl's gettext.sh |