Re: [PATCH 2/7] sparse-checkout: correctly set non-cone mode when expected
- From
Derrick Stolee <derrickstolee@github.com>
- Date
- Feb 14, 2022, 15:44 UTC
- Message-ID
- <40a88efa-a07f-417b-a5c5-0a6e651cfa8c@github.com>
- In-Reply-To
- <3bab59604046facb1e31ff1496e5bdb1afc7bf22.1644712798.git.gitgitgadget@gmail.com>
On 2/12/2022 7:39 PM, Elijah Newren via GitGitGadget wrote:
Show 5 quoted lines
> From: Elijah Newren <newren@gmail.com>
>
> commit f2e3a218e8 ("sparse-checkout: enable `set` to initialize
> sparse-checkout mode", 2021-12-14) made the `set` command able to
> intialize sparse-checkout mode, but it also had to function whens/intialize/initialize/
Show 10 quoted lines
> sparse-checkout mode was already setup and the user just wanted to > change the sparsity paths. So, if the user passed --cone or --no-cone, > then we should override the current setting, but if they didn't pass > either, we should use whatever the current cone mode setting is. > > Unfortunately, there was a small error in the logic in that it would not > set the in-memory cone mode value (core_sparse_checkout_one) when > --no-cone was specified, but since it did set the config setting on > disk, any subsequent git invocation would correctly get non-cone mode. > As such, the error did not previously matter. However, a sbusequent
s/sbusequent/subsequent/
Show 19 quoted lines
> commit will add some logic that depends on core_sparse_checkout_cone
> being set to the correct mode, so make sure it is set consistently with
> the config values we will be writing to disk.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> builtin/sparse-checkout.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
> index 510cb89b544..8d595189ea3 100644
> --- a/builtin/sparse-checkout.c
> +++ b/builtin/sparse-checkout.c
> @@ -399,6 +399,8 @@ static int update_modes(int *cone_mode, int *sparse_index)
> core_sparse_checkout_cone = 1;
> } else {
> mode = MODE_ALL_PATTERNS;
> + if (record_mode)
> + core_sparse_checkout_cone = 0;Is there a special reason why this is guarded by "if (record_mode)"?
Thanks, -Stolee