mirror of
https://github.com/git/git.git
synced 2026-03-13 02:13:24 +01:00
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:
@@ -212,6 +212,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:
|
||||
#
|
||||
|
||||
@@ -73,6 +73,10 @@ test_expect_success 'test basic "submodule foreach" usage' '
|
||||
git submodule update --init -- sub1 sub3 &&
|
||||
git submodule foreach "echo \$name-\$path-\$sha1" > ../actual
|
||||
) &&
|
||||
if test_have_prereq MINGW
|
||||
then
|
||||
dos2unix actual
|
||||
fi &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
@@ -154,6 +158,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
|
||||
'
|
||||
|
||||
@@ -172,6 +180,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
|
||||
'
|
||||
|
||||
@@ -219,6 +231,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
|
||||
'
|
||||
|
||||
|
||||
@@ -607,6 +607,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
|
||||
'
|
||||
|
||||
@@ -623,6 +627,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
|
||||
'
|
||||
|
||||
@@ -649,8 +657,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
|
||||
'
|
||||
|
||||
@@ -665,6 +681,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
|
||||
'
|
||||
|
||||
@@ -700,6 +720,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
|
||||
'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user