Sync with 1.7.4.2

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8aac727fb22eedc7ae57c0db94f1b3405df0de57..7cc9a52cbf78358e545f27cd5b7f69ac2030ecbf 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1059,6 +1059,15 @@ esac
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
 
+# Can we rely on git's output in the C locale?
+if test -n "$GETTEXT_POISON"
+then
+       GIT_GETTEXT_POISON=YesPlease
+       export GIT_GETTEXT_POISON
+else
+       test_set_prereq C_LOCALE_OUTPUT
+fi
+
 # test whether the filesystem supports symbolic links
 ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
 rm -f y