Merge branch 'ab/pager-exit-log'

[thirdparty/git.git] / git-sh-i18n.sh

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 8eef60b43fd47a4a679c5c77ae2f9c5ab5907951..e3d9f4836db14e5834372a8bb61ee3c27c82f34f 100644 (file)
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,12 +17,7 @@ export TEXTDOMAINDIR
 
 # First decide what scheme to use...
 GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-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@@"
+if test -n "@@USE_GETTEXT_SCHEME@@"
 then
        GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
@@ -63,21 +58,6 @@ gettext_without_eval_gettext)
                )
        }
        ;;
-poison)
-       # Emit garbage so that tests that incorrectly rely on translatable
-       # strings will fail.
-       gettext () {
-               printf "%s" "# GETTEXT POISON #"
-       }
-
-       eval_gettext () {
-               printf "%s" "# GETTEXT POISON #"
-       }
-
-       eval_ngettext () {
-               printf "%s" "# GETTEXT POISON #"
-       }
-       ;;
 *)
        gettext () {
                printf "%s" "$1"