@matheusbsbs / matheus-bagliano / commits / c01b1cbd47

reset: integrate with sparse index

Disable `command_requires_full_index` repo setting and add `ensure_full_index` guards around code paths that cannot yet use sparse directory index entries. `reset --soft` does not modify the index, so no compatibility changes are needed for it to function without expanding the index. For all other reset modes (`--mixed`, `--hard`, `--keep`, `--merge`), the full index is expanded to prevent cache tree corruption and invalid variable accesses. Additionally, the `read_cache()` check verifying an uncorrupted index is moved after argument parsing and preparing the repo settings. The index is not used by the preceding argument handling, but `read_cache()` must be run *after* enabling sparse index for the command (so that the index is not expanded unnecessarily) and *before* using the index for reset (so that it is verified as uncorrupted). Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Victoria Dye committed Nov 29, 2021 at 15:52 UTC c01b1cbd473c05e29fe0c1a31b8f6539e82c4559

2 files changed +8 -3

builtin/reset.c

+7 -3

@@ -180,6 +180,7 @@ static int read_from_tree(const struct pathspec *pathspec,

180 opt.flags.override_submodule_config = 1;

181 opt.repo = the_repository;

182

183 + ensure_full_index(&the_index);

184 if (do_diff_cache(tree_oid, &opt))

185 return 1;

186 diffcore_std(&opt);

@@ -257,9 +258,6 @@ static void parse_args(struct pathspec *pathspec,

258 }

259 *rev_ret = rev;

260

260 - if (read_cache() < 0)

261 - die(_("index file corrupt"));

262 -

261 parse_pathspec(pathspec, 0,

262 PATHSPEC_PREFER_FULL |

263 (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),

@@ -405,6 +403,12 @@ int cmd_reset(int argc, const char **argv, const char *prefix)

403 if (intent_to_add && reset_type != MIXED)

404 die(_("-N can only be used with --mixed"));

405

406 + prepare_repo_settings(the_repository);

407 + the_repository->settings.command_requires_full_index = 0;

408 +

409 + if (read_cache() < 0)

410 + die(_("index file corrupt"));

411 +

412 /* Soft reset does not touch the index file nor the working tree

413 * at all, but requires them in a good order. Other resets reset

414 * the index file to the tree object we are switching to. */

cache-tree.c

@@ -776,6 +776,7 @@ void prime_cache_tree(struct repository *r,

776 cache_tree_free(&istate->cache_tree);

777 istate->cache_tree = cache_tree();

778

779 + ensure_full_index(istate);

780 prime_cache_tree_rec(r, istate->cache_tree, tree);

781 istate->cache_changed |= CACHE_TREE_CHANGED;

782 trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);