Merge branch 'ld/git-p4-shelve-update-fix'

diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index 9eb160c997a0f4ccaf277d8c8daa655179d18b34..2139b427ca1ced9ba0342ef33d634c9b054ade5e 100644 (file)
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -17,7 +17,7 @@ else
        . "$GIT_BUILD_DIR"/git-sh-i18n
 fi
 
-if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON
+if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT
 then
        # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
        is_IS_locale=$(locale -a 2>/dev/null |