Merge branch 'mm/maint-log-n-with-diff-filtering'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0fdc541a7cd7d6b694c4f4a3fd06b6cf21dc7380..f4c1e04e4f26ca38b57fc6c47b05cf92111107b6 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1079,6 +1079,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