Re: [PATCH 6/7] reset: make --mixed sparse-aware
From: Victoria Dye <hidden>
Date: 2021-10-01 15:03:48
Victoria Dye via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 0b6ff0de17d..c9b9ef4992c 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh@@ -801,14 +801,25 @@ test_expect_success 'sparse-index is not expanded' ' for ref in update-deep update-folder1 update-folder2 update-deep do echo >>sparse-index/README.md && + ensure_not_expanded reset --mixed $ref ensure_not_expanded reset --hard $ref || return 1 done &&
This is a bug - it's missing `&&` at the end of the line (and adding it will cause the test to fail). The index is expanded if a mixed reset modifies an entry outside the sparse cone, so I'll update the test in V2 to verify reset between two refs with only in-cone files changed between them.