From: Mark C. Chu-Carroll via B4 Relay Date: Tue, 08 Sep 2026 19:44:55 GMT Subject: [PATCH 3/3] Update t4010 to use modern style. Message-ID: <20260908-modernize-t4001-v1-3-cab3933a173f@fastmail.com> In-Reply-To: <20260908-modernize-t4001-v1-0-cab3933a173f@fastmail.com> From: "Mark C. Chu-Carroll" --- t/t4010-diff-pathspec.sh | 78 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index c84c3fa05b..59e4501203 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -13,67 +13,67 @@ 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' +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' +test_expect_success 'limit to path should show nothing' ' + git diff-index --cached $tree -- path >current && + compare_diff_raw current expected +' cat >expected <current && - compare_diff_raw current expected' +test_expect_success 'limit to path1 should show path1/file1' ' + git diff-index --cached $tree -- path1 >current && + compare_diff_raw current expected +' cat >expected <current && - compare_diff_raw current expected' +test_expect_success 'limit to path1/ should show path1/file1' ' + git diff-index --cached $tree -- path1/ >current && + compare_diff_raw current expected +' cat >expected <current && - compare_diff_raw current expected' +test_expect_success '"*file1" should show path1/file1' ' + git diff-index --cached $tree -- "*file1" >current && + compare_diff_raw current expected +' cat >expected <current && - compare_diff_raw current expected' +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 file0/ should emit nothing.' ' + 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