From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2021, #03; Tue, 13)
Date: Wed, 14 Jul 2021 09:11:52 -0400 [thread overview]
Message-ID: <2c7f188a-6ebe-b116-8299-86ca3732d79a@gmail.com> (raw)
In-Reply-To: <xmqqmtqpzosf.fsf@gitster.g>
On 7/13/2021 9:07 PM, Junio C Hamano wrote:
...
> * en/ort-perf-batch-14 (2021-07-13) 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?
I saw a v2 re-roll, so I will review that this week.
> * ds/commit-and-checkout-with-sparse-index (2021-07-12) 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.
>
> Ready?
Let's mark this as "expecting a re-roll" because of the
directory/file conflict issue. I'm trying to see if there
is a quick way to resolve the current behavior change that
Elijah pointed out.
> * ds/status-with-sparse-index (2021-07-12) 15 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: 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.
>
> Expecting a final reroll.
> cf. <e7199fc6-bc7b-f556-c10c-12dee04af287@gmail.com>
Final re-roll inbound.
> * ds/gender-neutral-doc-guidelines (2021-06-16) 2 commits
> - SQUASH??? replace neutering tips with that of Æver
> - CodingGuidelines: recommend singular they
> (this branch uses ds/gender-neutral-doc.)
>
> Attempt to give a guideline for gender neutral documentation.
>
> Comments?
I've said before and will repeat here that the draft in your
SQUASH??? commit looks like a good compromise to me. It can
replace the other commit in this branch.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-07-14 13:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 1:07 What's cooking in git.git (Jul 2021, #03; Tue, 13) Junio C Hamano
2021-07-14 2:16 ` Eric Sunshine
2021-07-14 16:30 ` Junio C Hamano
2021-07-14 22:39 ` Eric Sunshine
2021-07-14 22:44 ` Junio C Hamano
2021-07-14 8:42 ` Han-Wen Nienhuys
2021-07-14 11:53 ` Ævar Arnfjörð Bjarmason
2021-07-14 11:54 ` Ævar Arnfjörð Bjarmason
2021-07-14 17:28 ` Junio C Hamano
2021-07-14 13:11 ` Derrick Stolee [this message]
2021-07-14 14:32 ` Ævar Arnfjörð Bjarmason
2021-07-15 16:25 ` [PATCH] CodingGuidelines: recommend gender-neutral description Junio C Hamano
2021-07-15 16:35 ` Eric Sunshine
2021-07-15 16:47 ` Taylor Blau
2021-07-15 18:02 ` Junio C Hamano
2021-07-16 21:25 ` Felipe Contreras
2021-07-15 17:27 ` Derrick Stolee
2021-07-16 15:11 ` Johannes Schindelin
2021-07-16 21:22 ` Felipe Contreras
2021-07-16 18:41 ` [PATCH v2] " Junio C Hamano
2021-07-16 19:05 ` Derrick Stolee
2021-07-16 19:11 ` Ævar Arnfjörð Bjarmason
2021-07-16 19:50 ` Junio C Hamano
2021-07-16 21:14 ` Felipe Contreras
2021-08-12 8:35 ` [PATCH] " Bagas Sanjaya
2021-07-14 20:11 ` What's cooking in git.git (Jul 2021, #03; Tue, 13) Taylor Blau
2021-07-19 7:35 ` Patrick Steinhardt
2021-07-19 7:53 ` Felipe Contreras
2021-07-19 8:35 ` Jeff King
2021-07-19 10:42 ` Felipe Contreras
2021-07-19 10:56 ` Patrick Steinhardt
2021-07-19 11:25 ` Felipe Contreras
2021-07-19 8:33 ` Jeff King
2021-07-19 10:41 ` Patrick Steinhardt
2021-07-19 10:52 ` Jeff King
2021-07-19 18:40 ` Junio C Hamano
2021-07-19 19:57 ` Felipe Contreras
2021-07-20 6:31 ` Patrick Steinhardt
2021-07-20 7:21 ` Felipe Contreras
2021-07-20 6:32 ` [PATCH] t0000: fix test if run with TEST_OUTPUT_DIRECTORY Patrick Steinhardt
2021-07-20 7:11 ` Jeff King
2021-07-20 16:21 ` Junio C Hamano
2021-07-20 7:24 ` Felipe Contreras
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=2c7f188a-6ebe-b116-8299-86ca3732d79a@gmail.com \
--to=stolee@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).