Merge branch 'po/doc-branch' into maint

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 9d065fb4bf9a308e64fa2d4aa5dff294b116f1a9..e1d917fd2796d1f2d952c509cb79d8cafe0cf89e 100644 (file)
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,7 +17,7 @@ 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"
 then
        GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
 elif test -n "@@USE_GETTEXT_SCHEME@@"