Re: [PATCH 20/27] merge-ort: ensure full index
- From
Elijah Newren <newren@gmail.com>
- Date
- Mar 18, 2021, 05:31 UTC
- Message-ID
- <CABPp-BF93UaU7JnwxQiEp2wf1jffLfQax+z4_8Q3-6DxXPUgRg@mail.gmail.com>
- In-Reply-To
- <fb4c7038b7468c77c4d3c5181f0cb0de85d1149f.1615929436.git.gitgitgadget@gmail.com>
On Tue, Mar 16, 2021 at 2:17 PM Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 9 quoted lines
> > From: Derrick Stolee <dstolee@microsoft.com> > > 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
s/appears to be/is/ :-)
> 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.
Right, there is one more patch that will touch this function -- patch 7 from the series that marks merge-ort stable over here: https://lore.kernel.org/git/pull.905.v2.git.1616016485.gitgitgadget@gmail.com/
While I have more optimizations for merge-ort, none of them will touch this function.
Show 19 quoted lines
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> > --- > 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