Merge branch 'jk/tag-contains-ab' (early part) into maint

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 97b7562dbfe510daa86f9888a4a5bc401c789b6c..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
 '
 
@@ -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 &&