undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache: ensure full index

Browse Source 
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>
This commit is contained in:
Derrick Stolee 2021-04-01 01:49:58 +00:00 committed by Junio C Hamano
parent 465a04abc6
commit 0c18c059a1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
read-cache.c
View File

@ -1577,6 +1577,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
*/ */
preload_index(istate, pathspec, 0); preload_index(istate, pathspec, 0);
trace2_region_enter("index", "refresh", NULL); trace2_region_enter("index", "refresh", NULL);
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(istate);
for (i = 0; i < istate->cache_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce, *new_entry; struct cache_entry *ce, *new_entry;
int cache_errno = 0; int cache_errno = 0;
@ -2498,6 +2500,8 @@ int repo_index_has_changes(struct repository *repo,
diff_flush(&opt); diff_flush(&opt);
return opt.flags.has_changes != 0; return opt.flags.has_changes != 0;
} else { } else {
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(istate);
for (i = 0; sb && i < istate->cache_nr; i++) { for (i = 0; sb && i < istate->cache_nr; i++) {
if (i) if (i)
strbuf_addch(sb, ' '); strbuf_addch(sb, ' ');