Merge branch 'bw/submodule-with-bs-path' into maint

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index fb00e6d9b07f4cc6f478bb532749403017599400..5edcc6edfe651f638921b9148be9579312a47adc 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -360,7 +360,7 @@ EOF
 test_expect_success 'status -s -b' '
 
        git status -s -b >output &&
-       test_cmp expect output
+       test_i18ncmp expect output
 
 '
 
@@ -370,7 +370,7 @@ test_expect_success 'status -s -z -b' '
        git status -s -z -b >output &&
        nul_to_q <output >output.q &&
        mv output.q output &&
-       test_cmp expect output
+       test_i18ncmp expect output
 '
 
 test_expect_success 'setup dir3' '
@@ -687,7 +687,7 @@ EOF
 test_expect_success 'status -s -b with color.status' '
 
        git status -s -b | test_decode_color >output &&
-       test_cmp expect output
+       test_i18ncmp expect output
 
 '