mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 22:18:12 +02:00
Code

reset: fix validation in sparse index test

Browse Source 
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>
This commit is contained in:
Victoria Dye 2022-01-11 18:04:58 +00:00 committed by Junio C Hamano
parent dcc0cd074f
commit bb01b26dec
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t1092-sparse-checkout-compatibility.sh
View File

@ -596,13 +596,11 @@ test_expect_success 'reset with pathspecs outside sparse definition' '
test_sparse_match git reset update-folder1 -- folder1 && test_sparse_match git reset update-folder1 -- folder1 &&
git -C full-checkout reset update-folder1 -- folder1 && git -C full-checkout reset update-folder1 -- folder1 &&
test_sparse_match git status --porcelain=v2 && test_all_match git ls-files -s -- folder1 &&
test_all_match git rev-parse HEAD:folder1 &&
test_sparse_match git reset update-folder2 -- folder2/a && test_sparse_match git reset update-folder2 -- folder2/a &&
git -C full-checkout reset update-folder2 -- folder2/a && git -C full-checkout reset update-folder2 -- folder2/a &&
test_sparse_match git status --porcelain=v2 && test_all_match git ls-files -s -- folder2/a
test_all_match git rev-parse HEAD:folder2/a
' '
test_expect_success 'reset with wildcard pathspec' ' test_expect_success 'reset with wildcard pathspec' '