Merge branch 'dz/connect-error-report' into maint

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 8a74ccac5f875368d559be876feaed51dfc2af66..835a50624114253b634896e1cceae43578a279bf 100755 (executable)
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -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
 '