[PATCH v2 19/25] merge-recursive: ensure full index

From

Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>

Date

Apr 1, 2021, 01:49 UTC

Message-ID

<1e3f6085a405aa39692f3100790a596cc7b6fbfd.1617241803.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.906.v2.git.1617241802.gitgitgadget@gmail.com>

From: Derrick Stolee <dstolee@microsoft.com>

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 merge-recursive.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/merge-recursive.c b/merge-recursive.c
index b8de7a704eae..91d8597728c1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -522,6 +522,8 @@ static struct string_list *get_unmerged(struct index_state *istate)
 
 	unmerged->strdup_strings = 1;
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(istate);
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct string_list_item *item;
 		struct stage_data *e;

-- 
gitgitgadget