Merge branch 'cb/fetch-set-upstream'

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 9d065fb4bf9a308e64fa2d4aa5dff294b116f1a9..8eef60b43fd47a4a679c5c77ae2f9c5ab5907951 100644 (file)
--- 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_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@@"