[PATCH 2/8] gettext: don't poison if GIT_GETTEXT_POISON is set but empty
From: SZEDER Gábor <hidden>
Date: 2018-10-22 20:23:33
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
This allows us to run test with non-GETTEXT POISON-ed behavior even in a GETTEXT POISON build by running: GIT_GETTEXT_POISON= ./t1234-foo.sh Signed-off-by: SZEDER Gábor <redacted> --- Makefile | 2 +- gettext.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index ad880d1fc5..7a165445cd 100644
--- a/Makefile
+++ b/Makefile@@ -365,7 +365,7 @@ all:: # Define GETTEXT_POISON if you are debugging the choice of strings marked # for translation. In a GETTEXT_POISON build, you can turn all strings marked # for translation into gibberish by setting the GIT_GETTEXT_POISON variable -# (to any value) in your environment. +# to a non-empty value in your environment. # # Define JSMIN to point to JavaScript minifier that functions as # a filter to have gitweb.js minified.
diff --git a/gettext.c b/gettext.c
index 7272771c8e..a9509a5df3 100644
--- a/gettext.c
+++ b/gettext.c@@ -50,8 +50,13 @@ const char *get_preferred_languages(void) int use_gettext_poison(void) { static int poison_requested = -1; - if (poison_requested == -1) - poison_requested = getenv("GIT_GETTEXT_POISON") ? 1 : 0; + if (poison_requested == -1) { + const char *v = getenv("GIT_GETTEXT_POISON"); + if (v && *v) + poison_requested = 1; + else + poison_requested = 0; + } return poison_requested; } #endif
--
2.19.1.681.g6bd79da3f5