reset: fix validation in sparse index test
Update t1092 test 'reset with pathspecs outside sparse definition' to verify index contents. The use of `rev-parse` verifies the contents of HEAD, not the index, providing no real validation of the reset results. Conversely, `ls-files` reports the contents of the index (OIDs, flags, filenames), which are then compared across checkouts to ensure compatible index states. Fixes 741a2c9ffa (reset: expand test coverage for sparse checkouts, 2021-09-27). Signed-off-by: Victoria Dye <vdye@github.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Victoria Dye committed
Jan 11, 2022 at 18:04 UTC
bb01b26dec69f5f287f0d36cbe4c765fe7f7b053
1 file changed
+2
-4
t/t1092-sparse-checkout-compatibility.sh
+2
-4
@@ -596,13 +596,11 @@ test_expect_success 'reset with pathspecs outside sparse definition' '
596
597
test_sparse_match git reset update-folder1 -- folder1 &&
598
git -C full-checkout reset update-folder1 -- folder1 &&
599
- test_sparse_match git status --porcelain=v2 &&
600
- test_all_match git rev-parse HEAD:folder1 &&
599
+ test_all_match git ls-files -s -- folder1 &&
600
601
test_sparse_match git reset update-folder2 -- folder2/a &&
602
git -C full-checkout reset update-folder2 -- folder2/a &&
604
- test_sparse_match git status --porcelain=v2 &&
605
- test_all_match git rev-parse HEAD:folder2/a
603
+ test_all_match git ls-files -s -- folder2/a
604
'
605
606
test_expect_success 'reset with wildcard pathspec' '