Re: [PATCH v3] describe: enable sparse index for describe
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 30, 2023, 14:57 UTC
- Message-ID
- <xmqq1ql64796.fsf@gitster.g>
- In-Reply-To
- <pull.1480.v3.git.git.1680155957146.gitgitgadget@gmail.com>
"Raghul Nanth A via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Raghul Nanth A <nanth.raghul@gmail.com> > > Add usage and performance tests for describe
I think this sentence can easily go.
> Describe uses the index when it is run with --dirty flag, which uses the > run_diff_index commmand. The command is sparse-index aware and hence we > can just set the requires-full-index to false
End the sentence with full-stop. More importantly, it would be nicer to have something to substantiate the "this is sparse aware" claim here, something like "since commit X" or "as shown in the test tXXXX.YY".
Updated tests do look good, and the code change is of course minimal and to the point, which is also good.
Thanks.
Show 51 quoted lines
> diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh > index 3242cfe91a0..db7887470f9 100755 > --- a/t/perf/p2000-sparse-operations.sh > +++ b/t/perf/p2000-sparse-operations.sh > @@ -43,6 +43,7 @@ test_expect_success 'setup repo and indexes' ' > done && > > git sparse-checkout init --cone && > + git tag -a v1.0 -m "Final" && > git sparse-checkout set $SPARSE_CONE && > git checkout -b wide $OLD_COMMIT && > > @@ -125,5 +126,7 @@ test_perf_on_all git checkout-index -f --all > test_perf_on_all git update-index --add --remove $SPARSE_CONE/a > test_perf_on_all "git rm -f $SPARSE_CONE/a && git checkout HEAD -- $SPARSE_CONE/a" > test_perf_on_all git grep --cached --sparse bogus -- "f2/f1/f1/*" > +test_perf_on_all git describe --dirty > +test_perf_on_all 'echo >>new && git describe --dirty' > > test_done > diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh > index 801919009e1..8bc35c51426 100755 > --- a/t/t1092-sparse-checkout-compatibility.sh > +++ b/t/t1092-sparse-checkout-compatibility.sh > @@ -1514,6 +1514,24 @@ test_expect_success 'sparse-index is not expanded: stash' ' > ensure_not_expanded stash pop > ' > > +test_expect_success 'sparse-index is not expanded: describe' ' > + init_repos && > + # Add tag to be read by describe > + git -C sparse-index tag -a v1.0 -m "Version 1" && > + ensure_not_expanded describe --dirty && > + cp sparse-index-out sparse-index-dirty && > + ensure_not_expanded describe && > + cp sparse-index-out sparse-index-normal && > + # Check describe has same output on clean tree > + test_cmp sparse-index-dirty sparse-index-normal && > + echo "test" >>sparse-index/g && > + ensure_not_expanded describe --dirty && > + echo "v1.0-dirty" > actual && > + # Check describe on dirty work tree > + test_cmp sparse-index-out actual && > + ensure_not_expanded describe > +' > + > test_expect_success 'sparse index is not expanded: diff' ' > init_repos && > > > base-commit: 27d43aaaf50ef0ae014b88bba294f93658016a2e