On Thu, Jul 8, 2021 at 3:33 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > * en/ort-perf-batch-14 (2021-07-01) 7 commits > - merge-ort: restart merge with cached renames to reduce process entry cost > - merge-ort: avoid recursing into directories when we don't need to > - merge-ort: defer recursing into directories when merge base is matched > - merge-ort: add a handle_deferred_entries() helper function > - merge-ort: add data structures for allowable trivial directory resolves > - merge-ort: add some more explanations in collect_merge_info_callback() > - merge-ort: resolve paths early when we have sufficient information > > Further optimization on "merge -sort" backend. > > Reviews? Go ahead and mark this as expecting a re-roll. While no reviews have come in yet, I was writing up a blog post about it and discovered one small issue I'd like to correct. > * ds/commit-and-checkout-with-sparse-index (2021-06-28) 5 commits > - checkout: stop expanding sparse indexes > - sparse-index: recompute cache-tree > - commit: integrate with sparse-index > - p2000: compress repo names > - p2000: add 'git checkout -' test and decrease depth > (this branch uses ds/status-with-sparse-index.) > > "git checkout" and "git commit" learn to work without unnecessarily > expanding sparse indexes. > > Comments? Will review soon, now that I've finished reviewing the latest round of the dependent series. > * ds/status-with-sparse-index (2021-06-28) 16 commits > - fsmonitor: integrate with sparse index > - wt-status: expand added sparse directory entries > - status: use sparse-index throughout > - status: skip sparse-checkout percentage with sparse-index > - diff-lib: handle index diffs with sparse dirs > - dir.c: accept a directory as part of cone-mode patterns > - unpack-trees: handle dir/file conflict of sparse entries > - unpack-trees: unpack sparse directory entries > - unpack-trees: rename unpack_nondirectories() > - unpack-trees: compare sparse directories correctly > - unpack-trees: preserve cache_bottom > - t1092: add tests for status/add and sparse files > - t1092: expand repository data shape > - t1092: replace incorrect 'echo' with 'cat' > - sparse-index: include EXTENDED flag when expanding > - sparse-index: skip indexes with unmerged entries > (this branch is used by ds/commit-and-checkout-with-sparse-index.) > > "git status" codepath learned to work with sparsely populated index > without hydrating it fully. > > Will merge to 'next'? Not quite yet. The series is starting to look really good, but I did find some issues in my review here: https://lore.kernel.org/git/CABPp-BF2BLQm6864m+esquJ7og3fWHvTZeX_R-y4pnx9ApZ6XA@xxxxxxxxxxxxxx/
