read-cache: 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>
Derrick Stolee committed
Apr 1, 2021 at 01:49 UTC
0c18c059a152058e30e23c4edcd24b3992599503
1 file changed
+4
read-cache.c
+4
@@ -1577,6 +1577,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
1577
*/
1578
preload_index(istate, pathspec, 0);
1579
trace2_region_enter("index", "refresh", NULL);
1580
+ /* TODO: audit for interaction with sparse-index. */
1581
+ ensure_full_index(istate);
1582
for (i = 0; i < istate->cache_nr; i++) {
1583
struct cache_entry *ce, *new_entry;
1584
int cache_errno = 0;
@@ -2498,6 +2500,8 @@ int repo_index_has_changes(struct repository *repo,
2500
diff_flush(&opt);
2501
return opt.flags.has_changes != 0;
2502
} else {
2503
+ /* TODO: audit for interaction with sparse-index. */
2504
+ ensure_full_index(istate);
2505
for (i = 0; sb && i < istate->cache_nr; i++) {
2506
if (i)
2507
strbuf_addch(sb, ' ');