Re: [PATCH 1/2] diff: enable and test the sparse index
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Oct 15, 2021, 16:46 UTC
- Message-ID
- <a8e7c755-6ee0-cec7-9721-0e244e561542@gmail.com>
- In-Reply-To
- <9a597233cf4127e97ac9f680f540c7c9a9304211.1634232353.git.gitgitgadget@gmail.com>
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'.
Show 9 quoted lines
> +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.
Show 10 quoted lines
> + 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