[PATCH v3 3/3] Update t/t4010-diff-pathspec.sh to modern style.
flat view
COLD28d
From: Mark C. Chu-Carroll <hidden>
Date: 2026-09-17 19:54:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v3 of 3 in this series.
Revisions (3)
- v1 [diff vs current]
- v2 [diff vs current]
- v3 current
Old tests were written in a different style than modern ones; for better readability and test error messages, update t4010 to the modern style. Signed-off-by: Mark C. Chu-Carroll <redacted> --- t/t4010-diff-pathspec.sh | 121 +++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 61 deletions(-)
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index c84c3fa05b..76ddd3ff4e 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh@@ -13,67 +13,66 @@ 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' - -cat >expected <<\EOF -EOF -test_expect_success \ - 'limit to file0/ should emit nothing.' \ - '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 && + :100644 100644 $before1 $after1 M path1/file1 + EOF + + git diff-index --cached $tree -- path1/ >current && + compare_diff_raw current expected +' +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 +' + +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 && + git diff-index --cached $tree -- file0/ >current && + compare_diff_raw current expected +' test_expect_success 'diff-tree pathspec' ' tree2=$(git write-tree) &&
--
2.53.0