From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> Before iterating over all cache entries, ensure that a sparse index is expanded to a full one to avoid unexpected behavior. This is a top candidate for updating later with a proper integration with the sparse index, since we will likely enable the ORT strategy by default when the sparse index is enabled. This appears to be the only place where the ORT strategy interacts with the index in such a global way, so that integration should be clear once the ORT strategy and the sparse index topics stabilize. Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> --- merge-ort.c | 1 + 1 file changed, 1 insertion(+) diff --git a/merge-ort.c b/merge-ort.c index 603d30c52170..9f737212555d 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3112,6 +3112,7 @@ static int record_conflicted_index_entries(struct merge_options *opt, if (strmap_empty(conflicted)) return 0; + ensure_full_index(index); original_cache_nr = index->cache_nr; /* Put every entry from paths into plist, then sort */ -- gitgitgadget
