Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
t7407: simplify funny CR workaround
Browse files Browse the repository at this point in the history
The dos2unix calls can be removed:
- in two cases, current git-submodule.sh produces CR-free output
- in one case, it is enough to use test_cmp_text instead of test_cmp
- in one case, test_i18ncmp calls test_cmp_text for us
  • Loading branch information
kasal committed Apr 10, 2014
1 parent 5120b9a commit c03375d
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions t/t7407-submodule-foreach.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ 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
'

Expand Down Expand Up @@ -178,10 +174,6 @@ 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
'

Expand All @@ -200,11 +192,7 @@ 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
test_cmp_text expect actual
'

test_expect_success 'use "update --recursive" to checkout all submodules' '
Expand Down Expand Up @@ -251,10 +239,6 @@ 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
'

Expand Down

0 comments on commit c03375d

Please sign in to comment.