From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Jul 2021, #02; Thu, 8)
Date: Thu, 8 Jul 2021 18:25:48 -0700 [thread overview]
Message-ID: <CABPp-BFZmY4jwXLHMgikvgXP7RtPhS=abGyVACsKn+BXWyCybg@mail.gmail.com> (raw)
In-Reply-To: <xmqq8s2ga19f.fsf@gitster.g>
On Thu, Jul 8, 2021 at 3:33 PM Junio C Hamano <gitster@pobox.com> 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@mail.gmail.com/
next prev parent reply other threads:[~2021-07-09 1:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 22:28 What's cooking in git.git (Jul 2021, #02; Thu, 8) Junio C Hamano
2021-07-09 0:48 ` brian m. carlson
2021-07-09 14:54 ` Junio C Hamano
2021-07-09 1:25 ` Elijah Newren [this message]
2021-07-10 8:56 ` Ævar Arnfjörð Bjarmason
2021-07-21 18:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BFZmY4jwXLHMgikvgXP7RtPhS=abGyVACsKn+BXWyCybg@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).