Browse Source

entry: ensure full index

Before iterating over all cache entries, ensure that a sparse index is
expanded to a full index to avoid 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
3450a304aa
  1. 2
      entry.c

2
entry.c

@ -412,6 +412,8 @@ static void mark_colliding_entries(const struct checkout *state, @@ -412,6 +412,8 @@ static void mark_colliding_entries(const struct checkout *state,

ce->ce_flags |= CE_MATCHED;

/* TODO: audit for interaction with sparse-index. */
ensure_full_index(state->istate);
for (i = 0; i < state->istate->cache_nr; i++) {
struct cache_entry *dup = state->istate->cache[i];


Loading…
Cancel
Save