Re: [PATCH 1/2] diff: enable and test the sparse index
From: Derrick Stolee <hidden>
Date: 2021-10-15 16:46:08
On 10/14/2021 1:25 PM, Lessley Dennington via GitGitGadget wrote: There is a failure in 'seen', and it's due to a subtle reason that we didn't catch in gitgitgadget PR builds. It's because ds/add-rm-with-sparse-index wasn't in your history until it was merged into 'seen'.
+test_expect_success 'diff partially-staged' ' + init_repos && + + write_script edit-contents <<-\EOF && + echo text >>$1 + EOF + + # Add file within cone + test_all_match git sparse-checkout set deep &&
The root cause is that you should use "test_sparse_match" when adjusting the sparse-checkout definition. The full-checkout repo is getting the sparse-checkout set to a single pattern "deep", but without cone mode.
+ run_on_all ../edit-contents deep/testfile && + test_all_match git add deep/testfile &&
But the test fails here because "deep/testfile" doesn't match the sparse-checkout definition in the full-checkout repo.
+ run_on_all ../edit-contents deep/testfile && + + test_all_match git diff && + test_all_match git diff --staged && + + # Add file outside cone + test_all_match git reset --hard && + run_on_all mkdir newdirectory && + run_on_all ../edit-contents newdirectory/testfile && + test_all_match git sparse-checkout set newdirectory &&
You'll want to change this line, too. Thanks, -Stolee