summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-04-01 01:49:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-14 20:47:35 (GMT)
commit3450a304aaa20707a696176441a8bbfe6d5431a3 (patch)
tree4bb042e653a1f4ce83e7132d96efe865abf35c44
parentd425f65127562e3a7f308b1ccfe385950f96e8ec (diff)
downloadgit-3450a304aaa20707a696176441a8bbfe6d5431a3.zip
git-3450a304aaa20707a696176441a8bbfe6d5431a3.tar.gz
git-3450a304aaa20707a696176441a8bbfe6d5431a3.tar.bz2
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>
-rw-r--r--entry.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/entry.c b/entry.c
index 7b9f437..891e4ba 100644
--- a/entry.c
+++ b/entry.c
@@ -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];