diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 7d7fde057b..adb225dc0e 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -228,6 +228,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 f1dc5c3b6a..93b447bfe9 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -722,6 +722,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 ' @@ -738,6 +742,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 ' @@ -764,8 +772,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 ' @@ -780,6 +796,10 @@ cat >expect <output && + if test_have_prereq MINGW + then + dos2unix output + fi && test_cmp expect output ' @@ -815,6 +835,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 '