Merge branch 'maint'

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 97b7562dbfe510daa86f9888a4a5bc401c789b6c..be745fb23f3f27ed319143d3d3ab3f26d01857bc 100755 (executable)
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -77,7 +77,7 @@ test_expect_success 'test basic "submodule foreach" usage' '
                git config foo.bar zar &&
                git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
        ) &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success 'setup nested submodules' '
@@ -158,7 +158,7 @@ test_expect_success 'test messages from "foreach --recursive"' '
                cd clone2 &&
                git submodule foreach --recursive "true" > ../actual
        ) &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 cat > expect <<EOF
@@ -238,6 +238,10 @@ test_expect_success 'ensure "status --cached --recursive" preserves the --cached
                ) &&
                git submodule status --cached --recursive -- nested1 > ../actual
        ) &&
+       if test_have_prereq MINGW
+       then
+               dos2unix actual
+       fi &&
        test_cmp expect actual
 '
 
@@ -288,7 +292,7 @@ test_expect_success 'use "update --recursive nested1" to checkout all submodules
        )
 '
 
-test_expect_failure 'command passed to foreach retains notion of stdin' '
+test_expect_success 'command passed to foreach retains notion of stdin' '
        (
                cd super &&
                git submodule foreach echo success >../expected &&
@@ -297,7 +301,7 @@ test_expect_failure 'command passed to foreach retains notion of stdin' '
        test_cmp expected actual
 '
 
-test_expect_failure 'command passed to foreach --recursive retains notion of stdin' '
+test_expect_success 'command passed to foreach --recursive retains notion of stdin' '
        (
                cd clone2 &&
                git submodule foreach --recursive echo success >../expected &&