summaryrefslogtreecommitdiff
path: root/prio-queue.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2022-02-19 16:44:42 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-20 00:01:15 -0800
commitd526b4dbe1ab5bb7dfa9502237da81b940be876c (patch)
treea5cce69bc36336404f3571a352ee8cba5c1fc1f0 /prio-queue.h
parentsparse-checkout: correct reapply's handling of options (diff)
downloadtgif-d526b4dbe1ab5bb7dfa9502237da81b940be876c.tar.xz
sparse-checkout: correctly set non-cone mode when expected
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'prio-queue.h')
0 files changed, 0 insertions, 0 deletions