diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-02 07:46:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-02 07:46:25 -0700 |
| commit | 9293a931868f21029baf55935f2f092c3f06415f (patch) | |
| tree | 1b7b2551124cf83a4c52ce01b8f1bbe8d85c4cda /builtin/sparse-checkout.c | |
| parent | another batch after 2.47-rc0 (diff) | |
| parent | sparse-checkout: disable advice in 'disable' (diff) | |
| download | git-9293a931868f21029baf55935f2f092c3f06415f.tar.gz git-9293a931868f21029baf55935f2f092c3f06415f.zip | |
Merge branch 'ds/sparse-checkout-expansion-advice'
When "git sparse-checkout disable" turns a sparse checkout into a
regular checkout, the index is fully expanded. This totally
expected behaviour however had an "oops, we are expanding the
index" advice message, which has been corrected.
* ds/sparse-checkout-expansion-advice:
sparse-checkout: disable advice in 'disable'
Diffstat (limited to 'builtin/sparse-checkout.c')
| -rw-r--r-- | builtin/sparse-checkout.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index e4e791a4c9..49aedc1de8 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -924,6 +924,11 @@ static int sparse_checkout_disable(int argc, const char **argv, builtin_sparse_checkout_disable_options, builtin_sparse_checkout_disable_usage, 0); + /* + * Disable the advice message for expanding a sparse index, as we + * are expecting to do that when disabling sparse-checkout. + */ + give_advice_on_expansion = 0; repo_read_index(the_repository); memset(&pl, 0, sizeof(pl)); |