[PATCH v3 2/5] sparse-checkout: correctly set non-cone mode when expected
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Feb 16, 2022, 04:21 UTC
- Message-ID
- <0c2ab523e74be6f39b82c8fc9c73b4ac57f9963e.1644985283.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1118.v3.git.1644985283.gitgitgadget@gmail.com>
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 initialize sparse-checkout mode, but it also had to function when 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 subsequent 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.
Reviewed-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Elijah Newren <newren@gmail.com> --- builtin/sparse-checkout.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index fcd574f5fc1..fb85a1459c3 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -403,6 +403,7 @@ static int update_modes(int *cone_mode, int *sparse_index) core_sparse_checkout_cone = 1; } else { mode = MODE_ALL_PATTERNS; + core_sparse_checkout_cone = 0; } if (record_mode && set_config(mode)) return 1;
-- gitgitgadget