diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 294584452b..3a18a3fd72 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -213,6 +213,10 @@ EOF test_expect_success '--for-status' " git submodule summary --for-status HEAD^ >actual && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_cmp actual - < ../actual ) && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_cmp expect actual ' @@ -176,6 +184,10 @@ test_expect_success 'test "foreach --quiet --recursive"' ' cd clone2 && git submodule foreach -q --recursive "echo \$name-\$path" > ../actual ) && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_cmp expect actual ' @@ -223,6 +235,10 @@ test_expect_success 'test "status --recursive"' ' cd clone3 && git submodule status --recursive > ../actual ) && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_cmp expect actual ' diff --git a/t/t7508-status.sh b/t/t7508-status.sh index c9300f3c8b..5cbde26ba6 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -697,6 +697,10 @@ EOF test_expect_success 'status submodule summary' ' git config status.submodulesummary 10 && git status >output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output ' @@ -713,6 +717,10 @@ A sm EOF test_expect_success 'status -s submodule summary' ' git status -s >output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output ' @@ -739,8 +747,16 @@ test_expect_success 'status submodule summary (clean submodule)' ' git commit -m "commit submodule" && git config status.submodulesummary 10 && test_must_fail git commit --dry-run >output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output && git status >output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output ' @@ -755,6 +771,10 @@ cat >expect <output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output ' @@ -790,6 +810,10 @@ EOF test_expect_success 'commit --dry-run submodule summary (--amend)' ' git config status.submodulesummary 10 && git commit --dry-run --amend >output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output '