Re: What's cooking in git.git (Jul 2021, #03; Tue, 13)

From: Derrick Stolee <stolee@gmail.com>
Date: Jul 14, 2021, 13:11 UTC
Message-ID: <2c7f188a-6ebe-b116-8299-86ca3732d79a@gmail.com>
In-Reply-To: <xmqqmtqpzosf.fsf@gitster.g>

On 7/13/2021 9:07 PM, Junio C Hamano wrote: ...

Show 12 quoted lines

> * 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.

Show 12 quoted lines

> * 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.

Show 23 quoted lines

> * 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.

Show 8 quoted lines

> * 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