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

Commit c03375d

Browse files
committed
t7407: simplify funny CR workaround
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
1 parent 5120b9a commit c03375d

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

t/t7407-submodule-foreach.sh

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ test_expect_success 'test basic "submodule foreach" usage' '
7777
git config foo.bar zar &&
7878
git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
7979
) &&
80-
if test_have_prereq MINGW
81-
then
82-
dos2unix actual
83-
fi &&
8480
test_i18ncmp expect actual
8581
'
8682

@@ -178,10 +174,6 @@ test_expect_success 'test messages from "foreach --recursive"' '
178174
cd clone2 &&
179175
git submodule foreach --recursive "true" > ../actual
180176
) &&
181-
if test_have_prereq MINGW
182-
then
183-
dos2unix actual
184-
fi &&
185177
test_i18ncmp expect actual
186178
'
187179

@@ -200,11 +192,7 @@ test_expect_success 'test "foreach --quiet --recursive"' '
200192
cd clone2 &&
201193
git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
202194
) &&
203-
if test_have_prereq MINGW
204-
then
205-
dos2unix actual
206-
fi &&
207-
test_cmp expect actual
195+
test_cmp_text expect actual
208196
'
209197

210198
test_expect_success 'use "update --recursive" to checkout all submodules' '
@@ -251,10 +239,6 @@ test_expect_success 'test "status --recursive"' '
251239
cd clone3 &&
252240
git submodule status --recursive > ../actual
253241
) &&
254-
if test_have_prereq MINGW
255-
then
256-
dos2unix actual
257-
fi &&
258242
test_cmp expect actual
259243
'
260244

0 commit comments

Comments
 (0)