From 8d644d40e7a4ec417c4b43d200f8a6bfe24d5dd4 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 11 Apr 2014 12:39:30 -0500 Subject: [PATCH] fixup! Merge pull request #158 from kasal/test-simplify This reverts commit 56e5a97d116fe75869e78c766363d9e2fe6304c3, reversing changes made to 5769bd5de2128874082df65232d6930132cf423e. We will merge the `win-tests-rebase` branch in a moment which makes this pull request obsolete. Signed-off-by: Johannes Schindelin --- t/t7407-submodule-foreach.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 48bcbad021..e42c70bed0 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -77,6 +77,10 @@ test_expect_success 'test basic "submodule foreach" usage' ' git config foo.bar zar && git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar" ) && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_i18ncmp expect actual ' @@ -174,6 +178,10 @@ test_expect_success 'test messages from "foreach --recursive"' ' cd clone2 && git submodule foreach --recursive "true" > ../actual ) && + if test_have_prereq MINGW + then + dos2unix actual + fi && test_i18ncmp expect actual ' @@ -192,7 +200,11 @@ test_expect_success 'test "foreach --quiet --recursive"' ' cd clone2 && git submodule foreach -q --recursive "echo \$name-\$path" > ../actual ) && - test_cmp_text expect actual + if test_have_prereq MINGW + then + dos2unix actual + fi && + test_cmp expect actual ' test_expect_success 'use "update --recursive" to checkout all submodules' ' @@ -239,6 +251,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 '