add: ensure full index

derrickstolee · gitster · commit 54beed24d228 · 2021-04-14T13:46:48.000-07:00
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 &lt;dstolee@microsoft.com&gt;
Reviewed-by: Elijah Newren &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/add.c b/builtin/add.c
@@ -141,6 +141,8 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
 {
 	int i, retval = 0;
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
 

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,8 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)`
`141`	`141`	`{`
`142`	`142`	`int i, retval = 0;`
`143`	`143`
	`144`	`+ /* TODO: audit for interaction with sparse-index. */`
	`145`	`+ ensure_full_index(&the_index);`
`144`	`146`	`for (i = 0; i < active_nr; i++) {`
`145`	`147`	`struct cache_entry *ce = active_cache[i];`
`146`	`148`