undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t1700: change here document style

Browse Source 
This improves test indentation by getting rid of the outdated
here document style.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2017-02-27 18:59:59 +01:00 committed by Junio C Hamano
parent f60ef2d65f
commit 5662176313
1 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
t/t1700-split-index.sh
View File

@ -19,12 +19,12 @@ test_expect_success 'enable split index' '
own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339 own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
base=39d890139ee5356c7ef572216cebcd27aa41f9df base=39d890139ee5356c7ef572216cebcd27aa41f9df
fi && fi &&
cat >expect <<EOF && cat >expect <<-EOF &&
own $own own $own
base $base base $base
replacements: replacements:
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -32,51 +32,51 @@ test_expect_success 'add one file' '
: >one && : >one &&
git update-index --add one && git update-index --add one &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
base $base base $base
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
replacements: replacements:
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'disable split index' ' test_expect_success 'disable split index' '
git update-index --no-split-index && git update-index --no-split-index &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
BASE=$(test-dump-split-index .git/index | grep "^own" | sed "s/own/base/") && BASE=$(test-dump-split-index .git/index | grep "^own" | sed "s/own/base/") &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
not a split index not a split index
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'enable split index again, "one" now belongs to base index"' ' test_expect_success 'enable split index again, "one" now belongs to base index"' '
git update-index --split-index && git update-index --split-index &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
$BASE $BASE
replacements: replacements:
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -84,18 +84,18 @@ test_expect_success 'modify original file, base index untouched' '
echo modified >one && echo modified >one &&
git update-index one && git update-index one &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<EOF && q_to_tab >expect <<-EOF &&
$BASE $BASE
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
replacements: 0 replacements: 0
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -103,54 +103,54 @@ test_expect_success 'add another file, which stays index' '
: >two && : >two &&
git update-index --add two && git update-index --add two &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
100644 $EMPTY_BLOB 0 two 100644 $EMPTY_BLOB 0 two
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<EOF && q_to_tab >expect <<-EOF &&
$BASE $BASE
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
100644 $EMPTY_BLOB 0 two 100644 $EMPTY_BLOB 0 two
replacements: 0 replacements: 0
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'remove file not in base index' ' test_expect_success 'remove file not in base index' '
git update-index --force-remove two && git update-index --force-remove two &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<EOF && q_to_tab >expect <<-EOF &&
$BASE $BASE
100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
replacements: 0 replacements: 0
deletions: deletions:
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'remove file in base index' ' test_expect_success 'remove file in base index' '
git update-index --force-remove one && git update-index --force-remove one &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
$BASE $BASE
replacements: replacements:
deletions: 0 deletions: 0
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -158,18 +158,18 @@ test_expect_success 'add original file back' '
: >one && : >one &&
git update-index --add one && git update-index --add one &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
$BASE $BASE
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
replacements: replacements:
deletions: 0 deletions: 0
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -177,26 +177,26 @@ test_expect_success 'add new file' '
: >two && : >two &&
git update-index --add two && git update-index --add two &&
git ls-files --stage >actual && git ls-files --stage >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
100644 $EMPTY_BLOB 0 two 100644 $EMPTY_BLOB 0 two
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'unify index, two files remain' ' test_expect_success 'unify index, two files remain' '
git update-index --no-split-index && git update-index --no-split-index &&
git ls-files --stage >ls-files.actual && git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<EOF && cat >ls-files.expect <<-EOF &&
100644 $EMPTY_BLOB 0 one 100644 $EMPTY_BLOB 0 one
100644 $EMPTY_BLOB 0 two 100644 $EMPTY_BLOB 0 two
EOF EOF
test_cmp ls-files.expect ls-files.actual && test_cmp ls-files.expect ls-files.actual &&
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<-EOF &&
not a split index not a split index
EOF EOF
test_cmp expect actual test_cmp expect actual
' '