Work around funny CR issue

This is really a problem with shell scripts being called on msysGit,
but there are more important bugs to fix for the moment.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-04-08 00:18:07 +02:00
parent c8b11574c2
commit dbfab0cb58
3 changed files with 44 additions and 0 deletions

View File

@@ -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 - <<EOF
# Submodule changes to be committed:
#

View File

@@ -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_cmp expect actual
'
@@ -158,6 +162,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_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
'

View File

@@ -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 <<EOF
EOF
test_expect_success 'status -s submodule summary (clean submodule)' '
git status -s >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
'