kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit: ensure full index 

These two loops iterate over all cache entries, so ensure that a sparse
index is expanded to a full index before we do so.

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 2021-04-01 01:49:45 +00:00 committed by Junio C Hamano
parent 0f6d3ba6bd
commit cb8388df5b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/commit.c
View File

@ -251,6 +251,8 @@ static int list_paths(struct string_list *list, const char *with_tree,
free(max_prefix); free(max_prefix);
} }


/* TODO: audit for interaction with sparse-index. */
ensure_full_index(&the_index);
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
const struct cache_entry *ce = active_cache[i]; const struct cache_entry *ce = active_cache[i];
struct string_list_item *item; struct string_list_item *item;
@ -931,6 +933,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (get_oid(parent, &oid)) { if (get_oid(parent, &oid)) {
int i, ita_nr = 0; int i, ita_nr = 0;


/* TODO: audit for interaction with sparse-index. */
ensure_full_index(&the_index);
for (i = 0; i < active_nr; i++) for (i = 0; i < active_nr; i++)
if (ce_intent_to_add(active_cache[i])) if (ce_intent_to_add(active_cache[i]))
ita_nr++; ita_nr++;