[PATCH v2 3/3] Update t4010 to use modern style.
From: "Mark C. Chu-Carroll" <markchucarroll@fastmail.com>
---
t/t4010-diff-pathspec.sh | 88 +++++++++++++++++-------------------------------
1 file changed, 31 insertions(+), 57 deletions(-)
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 8d980823b0..76ddd3ff4e 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -13,60 +13,34 @@ Prepare:
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
-test_expect_success \
- setup \
- 'echo frotz >file0 &&
- mkdir path1 &&
- echo rezrov >path1/file1 &&
- before0=$(git hash-object file0) &&
- before1=$(git hash-object path1/file1) &&
- git update-index --add file0 path1/file1 &&
- tree=$(git write-tree) &&
- echo "$tree" &&
- echo nitfol >file0 &&
- echo yomin >path1/file1 &&
- after0=$(git hash-object file0) &&
- after1=$(git hash-object path1/file1) &&
- git update-index file0 path1/file1'
-
-cat >expected <<\EOF
-EOF
-test_expect_success \
- 'limit to path should show nothing' \
- 'git diff-index --cached $tree -- path >current &&
- compare_diff_raw current expected'
-
-cat >expected <<EOF
-:100644 100644 $before1 $after1 M path1/file1
-EOF
-test_expect_success \
- 'limit to path1 should show path1/file1' \
- 'git diff-index --cached $tree -- path1 >current &&
- compare_diff_raw current expected'
-
-cat >expected <<EOF
-:100644 100644 $before1 $after1 M path1/file1
-EOF
-test_expect_success \
- 'limit to path1/ should show path1/file1' \
- 'git diff-index --cached $tree -- path1/ >current &&
- compare_diff_raw current expected'
-
-cat >expected <<EOF
-:100644 100644 $before1 $after1 M path1/file1
-EOF
-test_expect_success \
- '"*file1" should show path1/file1' \
- 'git diff-index --cached $tree -- "*file1" >current &&
- compare_diff_raw current expected'
-
-cat >expected <<EOF
-:100644 100644 $before0 $after0 M file0
-EOF
-test_expect_success \
- 'limit to file0 should show file0' \
- 'git diff-index --cached $tree -- file0 >current &&
- compare_diff_raw current expected'
+
+test_expect_success 'limit to path should show nothing' '
+ echo frotz >file0 &&
+ mkdir path1 &&
+ echo rezrov >path1/file1 &&
+ before0=$(git hash-object file0) &&
+ before1=$(git hash-object path1/file1) &&
+ git update-index --add file0 path1/file1 &&
+ tree=$(git write-tree) &&
+ echo "$tree" &&
+ echo nitfol >file0 &&
+ echo yomin >path1/file1 &&
+ after0=$(git hash-object file0) &&
+ after1=$(git hash-object path1/file1) &&
+ git update-index file0 path1/file1 &&
+ : >expected &&
+ git diff-index --cached $tree -- path >current &&
+ compare_diff_raw current expected
+'
+
+test_expect_success 'limit to path1 should show path1/file1' '
+ cat >expected <<-EOF &&
+ :100644 100644 $before1 $after1 M path1/file1
+ EOF
+
+ git diff-index --cached $tree -- path1 >current &&
+ compare_diff_raw current expected
+'
test_expect_success 'limit to path1/ should show path1/file1' '
cat >expected <<-EOF &&
@@ -80,7 +54,7 @@ test_expect_success '"*file1" should show path1/file1' '
cat >expected <<-EOF &&
:100644 100644 $before1 $after1 M path1/file1
EOF
-
+
git diff-index --cached $tree -- "*file1" >current &&
compare_diff_raw current expected
'
@@ -89,13 +63,13 @@ test_expect_success 'limit to file0 should show file0' '
cat >expected <<-EOF &&
:100644 100644 $before0 $after0 M file0
EOF
-
+
git diff-index --cached $tree -- file0 >current &&
compare_diff_raw current expected
'
test_expect_success 'limit to file0/ should emit nothing.' '
- : >expected &&
+ : >expected &&
git diff-index --cached $tree -- file0/ >current &&
compare_diff_raw current expected
'
--
2.53.0