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 (Dec 2021, #01; Fri, 3)
Date: Tue, 7 Dec 2021 10:54:16 -0500 [thread overview]
Message-ID: <4ffbfd5f-6cfa-ab71-e663-355b33d513df@gmail.com> (raw)
In-Reply-To: <xmqqh7bpqhf0.fsf@gitster.g>
On 12/3/2021 8:37 PM, Junio C Hamano wrote:
> This is probably the first issue of the "What's cooking" report, in
> which all topics have some sort of description.
>
> That's a small achievement, at least for me.
Thank you for continuing to do this monumental amount of work.
> Even better, each and every topic is annotated with some sort of
> verdict (like "Will discard", "Expecting a reroll", "Will merge to
> 'next'?" etc.). There is no topic in the "Undecided" category when
> this report is fed to "cook -w" script (found in the 'todo' branch).
>
> A handful of topics are added to 'next', and we have about 40 topics
> cooking there. For them, the future is automated---they spend about
> a week in 'next', and if we find issues in them, we incrementally
> improve them, or get merged to 'master'.
>
> Then we have about a dozen topics that are marked for 'next' (please
> raise your hand if you have objection before a real damage is done),
> and 8 more that may be ready for 'next' (please raise your hand if
> you want to nudge them in either direction, for or against).
> * ds/trace2-regions-in-tests (2021-11-29) 2 commits
> - t/t*: remove custom GIT_TRACE2_EVENT_NESTING
> - test-lib.sh: set GIT_TRACE2_EVENT_NESTING
>
> The default setting for trace2 event nesting was too low to cause
> test failures, which is worked around by bumping it up in the test
> framework.
>
> Will merge to 'next'.
> source: <pull.1085.git.1638193666.gitgitgadget@gmail.com>
I agree this is ready. Some additional discussion is in the thread,
but it is all about how to build upon this fix.
> * en/keep-cwd (2021-12-01) 11 commits
> - t2501: simplify the tests since we can now assume desired behavior
> - dir: new flag to remove_dir_recurse() to spare the original_cwd
> - dir: avoid incidentally removing the original_cwd in remove_path()
> - stash: do not attempt to remove startup_info->original_cwd
> - rebase: do not attempt to remove startup_info->original_cwd
> - clean: do not attempt to remove startup_info->original_cwd
> - symlinks: do not include startup_info->original_cwd in dir removal
> - unpack-trees: add special cwd handling
> - unpack-trees: refuse to remove startup_info->original_cwd
> - setup: introduce startup_info->original_cwd
> - t2501: add various tests for removing the current working directory
>
> Many git commands that deal with working tree files try to remove a
> directory that becomes empty (i.e. "git switch" from a branch that
> has the directory to another branch that does not would attempt
> remove all files in the directory and the directory itself). This
> drops users into an unfamiliar situation if the command was run in
> a subdirectory that becomes subject to removal due to the command.
> The commands have been taught to keep an empty directory if it is
> the directory they were started in to avoid surprising users.
>
> Needs review.
> There are some comments on earlier rounds; the latest one needs a
> serious review or at least Acks from past commentors.
> source: <pull.1140.v5.git.git.1638340854.gitgitgadget@gmail.com>
I've been meaning to get back to this one. I'll see what I can do
today.
> * ds/fetch-pull-with-sparse-index (2021-11-29) 3 commits
> - ls-files: add --sparse option
> - fetch/pull: use the sparse index
> - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
> (this branch uses ld/sparse-diff-blame and vd/sparse-reset.)
>
> "git fetch" and "git pull" are now declared sparse-index clean.
> Also "git ls-files" learns the "--sparse" option to help debugging.
>
> Expecting a reroll?
> Discussion seems to have stalled, with a few loose ends questions.
> source: <pull.1080.git.1637077083.gitgitgadget@gmail.com>
I do plan to re-roll, but with all of the movement in vd/sparse-reset
and ld/sparse-diff-blame, I paused work on this. As those topics
become more stable, I will revisit this and the comments that are
still outstanding.
I have another sparse index topic [1] that came out _after_ this
cooking email that is higher priority, since it fixes a bug.
[1] https://lore.kernel.org/git/pull.1092.v2.git.1638799837.gitgitgadget@gmail.com/
> * js/scalar (2021-12-01) 17 commits
> - scalar: implement the `version` command
> - scalar: implement the `delete` command
> - scalar: teach 'reconfigure' to optionally handle all registered enlistments
> - scalar: allow reconfiguring an existing enlistment
> - scalar: implement the `run` command
> - scalar: teach 'clone' to support the --single-branch option
> - scalar: implement the `clone` subcommand
> - scalar: implement 'scalar list'
> - scalar: let 'unregister' handle a deleted enlistment directory gracefully
> - scalar: 'unregister' stops background maintenance
> - scalar: 'register' sets recommended config and starts maintenance
> - ci: also run the `scalar` tests
> - cmake: optionally build `scalar`, too
> - scalar: create test infrastructure
> - scalar: start documenting the command
> - scalar: create a rudimentary executable
> - scalar: add a README with a roadmap
>
> Add pieces from "scalar" to contrib/.
>
> Need to pick up the reroll before merging to 'next'.
> cf. <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
> source: <pull.1005.v9.git.1638273289.gitgitgadget@gmail.com>
I look forward to moving to the next stages of this work.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-12-07 15:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-04 1:37 What's cooking in git.git (Dec 2021, #01; Fri, 3) Junio C Hamano
2021-12-06 19:13 ` Phillip Wood
2021-12-06 19:24 ` Junio C Hamano
2021-12-08 12:42 ` Johannes Schindelin
2021-12-09 1:02 ` Junio C Hamano
2021-12-09 10:39 ` Phillip Wood
2021-12-07 6:00 ` en/keep-cwd (Was: Re: What's cooking in git.git (Dec 2021, #01; Fri, 3)) Elijah Newren
2021-12-07 9:17 ` Ævar Arnfjörð Bjarmason
2021-12-07 20:33 ` Elijah Newren
2021-12-07 18:26 ` en/keep-cwd Junio C Hamano
2021-12-08 12:46 ` en/keep-cwd (Was: Re: What's cooking in git.git (Dec 2021, #01; Fri, 3)) Johannes Schindelin
2021-12-07 15:54 ` Derrick Stolee [this message]
2021-12-07 19:37 ` cf/fetch-set-upstream-while-detached (was: " Ævar Arnfjörð Bjarmason
2021-12-07 20:41 ` cf/fetch-set-upstream-while-detached Junio C Hamano
2021-12-07 22:04 ` [PATCH v5] pull, fetch: fix segfault in --set-upstream option Ævar Arnfjörð Bjarmason
-- strict thread matches above, loose matches on Subject: below --
2021-12-04 1:37 What's cooking in git.git (Dec 2021, #01; Fri, 3) Junio C Hamano
2021-12-07 1:08 ` Junio C Hamano
2021-12-07 16:21 ` Derrick Stolee
2021-12-07 17:25 ` 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=4ffbfd5f-6cfa-ab71-e663-355b33d513df@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).