On 4/1/2021 3:07 AM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > >> Here is the second patch series submission coming out of the sparse-index >> RFC [1]. > > Queued. There were a few conflicts with new codepaths and I've > touched up a few of them (Alban's merge-strategies-in-c moves some > code that needs to dehydrate the sparse index entries from > builtin/merge-index.c to a new file, Elijah's ort has "const" > pointer to the istate that you need to be writable), but there may > be more that I missed. Please check the tip of 'seen' when it gets > pushed out. Thank you for dealing with these complicated merges. I promise that the series after this one are much more focused in their code footprint. Thus, they should be easier to merge with ongoing topics. I validated your merge by rebasing the rest of my current work in this area onto 'seen'. The tests for 'git status' and 'git add' with sparse-indexes adds to the confidence of the merge. I did see a small conflict with mt/add-rm-in-sparse-checkout in one of my future patches because of an adjacent edit. I'll be sure to base my next submission on a merge with that topic. Thanks, -Stolee
