Browse Source

checkout: ensure full index

Before iterating over all cache entries in the checkout builtin, ensure
that we have a full index to avoid any unexpected behavior.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Derrick Stolee 4 years ago committed by Junio C Hamano
parent
commit
0f6d3ba6bd
  1. 5
      builtin/checkout.c

5
builtin/checkout.c

@ -368,6 +368,9 @@ static int checkout_worktree(const struct checkout_opts *opts, @@ -368,6 +368,9 @@ static int checkout_worktree(const struct checkout_opts *opts,
NULL);

enable_delayed_checkout(&state);

/* TODO: audit for interaction with sparse-index. */
ensure_full_index(&the_index);
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
if (ce->ce_flags & CE_MATCHED) {
@ -512,6 +515,8 @@ static int checkout_paths(const struct checkout_opts *opts, @@ -512,6 +515,8 @@ static int checkout_paths(const struct checkout_opts *opts,
* Make sure all pathspecs participated in locating the paths
* to be checked out.
*/
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(&the_index);
for (pos = 0; pos < active_nr; pos++)
if (opts->overlay_mode)
mark_ce_for_checkout_overlay(active_cache[pos],

Loading…
Cancel
Save