Merge branch 'js/gettext-poison-fixes'

The `maint-2.30` branch accumulated quite a few fixes over the past two
years. Most of those fixes were originally based on newer versions, and
while the patches cherry-picked cleanly, we weren't diligent enough to
pay attention to the CI builds and the GETTEXT_POISON job regressed.
This topic branch fixes that.

* js/gettext-poison-fixes
  t0033: GETTEXT_POISON fix
  t0003: GETTEXT_POISON fix, part 1
  t0003: GETTEXT_POISON fix, conclusion
  t5619: GETTEXT_POISON fix
  t5604: GETTEXT_POISON fix, part 1
  t5604: GETTEXT_POISON fix, conclusion

5 files changed, 9 insertions, 9 deletions

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 9d9aa2855d..57ba303de8 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -344,7 +344,7 @@ test_expect_success 'large attributes line ignored in tree' '
 	printf "path %02043d" 1 >.gitattributes &&
 	git check-attr --all path >actual 2>err &&
 	echo "warning: ignoring overly long attributes line 1" >expect &&
-	test_cmp expect err &&
+	test_i18ncmp expect err &&
 	test_must_be_empty actual
 '
 
@@ -357,7 +357,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
 	printf "a %02045dtrailing attribute\n" 1 >.gitattributes &&
 	git check-attr --all trailing >actual 2>err &&
 	echo "warning: ignoring overly long attributes line 1" >expect &&
-	test_cmp expect err &&
+	test_i18ncmp expect err &&
 	test_must_be_empty actual
 '
 
@@ -366,7 +366,7 @@ test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
 	dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
 	git check-attr --all path >/dev/null 2>err &&
 	echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
-	test_cmp expect err
+	test_i18ncmp expect err
 '
 
 test_expect_success 'large attributes line ignored in index' '
@@ -375,7 +375,7 @@ test_expect_success 'large attributes line ignored in index' '
 	git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
 	git check-attr --cached --all path >actual 2>err &&
 	echo "warning: ignoring overly long attributes line 1" >expect &&
-	test_cmp expect err &&
+	test_i18ncmp expect err &&
 	test_must_be_empty actual
 '
 
@@ -385,7 +385,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
 	git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
 	git check-attr --cached --all trailing >actual 2>err &&
 	echo "warning: ignoring overly long attributes line 1" >expect &&
-	test_cmp expect err &&
+	test_i18ncmp expect err &&
 	test_must_be_empty actual
 '
 
diff --git a/t/t0033-safe-directory.sh b/t/t0033-safe-directory.sh
index 239d93f4d2..00c6c51100 100755
--- a/t/t0033-safe-directory.sh
+++ b/t/t0033-safe-directory.sh
@@ -9,7 +9,7 @@ export GIT_TEST_ASSUME_DIFFERENT_OWNER
 
 expect_rejected_dir () {
 	test_must_fail git status 2>err &&
-	grep "safe.directory" err
+	test_i18ngrep "safe.directory" err
 }
 
 test_expect_success 'safe.directory is not set' '
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 1acb7b2582..14e0f4d705 100755
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -72,7 +72,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' '
 	cat >expected_stderr <<-EOF &&
 	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
 	EOF
-	test_cmp expected_stderr stderr &&
+	test_i18ncmp expected_stderr stderr &&
 	! test_path_exists .git/create-me
 '
 
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 4ff21d7ccf..9ba2af0ff7 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -354,7 +354,7 @@ test_expect_success SYMLINKS 'clone repo with symlinked objects directory' '
 	test_must_fail git clone --local malicious clone 2>err &&
 
 	test_path_is_missing clone &&
-	grep "failed to start iterator over" err
+	test_i18ngrep "failed to start iterator over" err
 '
 
 test_done
diff --git a/t/t5619-clone-local-ambiguous-transport.sh b/t/t5619-clone-local-ambiguous-transport.sh
index cce62bf78d..7eab09d02a 100755
--- a/t/t5619-clone-local-ambiguous-transport.sh
+++ b/t/t5619-clone-local-ambiguous-transport.sh
@@ -64,7 +64,7 @@ test_expect_success 'ambiguous transport does not lead to arbitrary file-inclusi
 	#
 	# This works for now, and if we ever fix the URL detection, it
 	# is OK to change this to detect the transport error.
-	grep "protocol .* is not supported" err
+	test_i18ngrep "protocol .* is not supported" err
 '
 
 test_done