diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-11-15 02:08:01 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-15 02:08:01 +0900 |
commit | c3a10c1c70dcc38a814b74eae3897401f4d0fb19 (patch) | |
tree | 572540c5271f57b3ee8ec321884f4365fc65fc91 | |
parent | 2057d509978fa2caeb15ef14b61c12e7bfe3c1f1 (diff) | |
download | git-c3a10c1c70dcc38a814b74eae3897401f4d0fb19.tar.gz |
What's cooking (2023/11 #06)
-rw-r--r-- | whats-cooking.txt | 145 |
1 files changed, 80 insertions, 65 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index 79d5d7767b..e9ff73557d 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Nov 2023, #05; Mon, 13) -X-master-at: e0939bec273052b1a8d69db4a3f7c87aaf83e220 -X-next-at: 309e3ec6dda82ab1e7b7722ef344e6c5d0c0964b +Subject: What's cooking in git.git (Nov 2023, #06; Tue, 14) +X-master-at: cfb8a6e9a93adbe81efca66e6110c9b4d2e57169 +X-next-at: 8631bc74722bb0614b8db08fb17e94121449d13f Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Nov 2023, #05; Mon, 13) +What's cooking in git.git (Nov 2023, #06; Tue, 14) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,11 +17,7 @@ topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). -The first candidate for the upcoming release, Git 2.43.0-rc0, has -been tagged. As of now, 'next' is "empty" in the sense that its -tree is identical to that of 'master'. There are tons of topic -waiting outside 'next' without sufficient support, which is sad, but -they are of lower priority now for a few weeks X-<. +Git 2.43-rc2 has been tagged. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some @@ -54,6 +50,62 @@ Release tarballs are available at: -------------------------------------------------- [New Topics] +* js/ci-discard-prove-state (2023-11-14) 1 commit + (merged to 'next' on 2023-11-14 at fade3ba143) + + ci: avoid running the test suite _twice_ + (this branch uses ps/ci-gitlab.) + + The way CI testing used "prove" could lead to running the test + suite twice needlessly, which has been corrected. + + Will cook in 'next'. + source: <pull.1613.git.1699894837844.gitgitgadget@gmail.com> + +-------------------------------------------------- +[Stalled] + +* pw/rebase-sigint (2023-09-07) 1 commit + - rebase -i: ignore signals when forking subprocesses + + If the commit log editor or other external programs (spawned via + "exec" insn in the todo list) receive internactive signal during + "git rebase -i", it caused not just the spawned program but the + "Git" process that spawned them, which is often not what the end + user intended. "git" learned to ignore SIGINT and SIGQUIT while + waiting for these subprocesses. + + Expecting a reroll. + cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com> + source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com> + + +* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit + - cherry-pick: refuse cherry-pick sequence if index is dirty + + "git cherry-pick A" that replays a single commit stopped before + clobbering local modification, but "git cherry-pick A..B" did not, + which has been corrected. + + Expecting a reroll. + cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com> + source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com> + + +* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits + - diff-lib: fix check_removed() when fsmonitor is active + - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix + - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix + (this branch uses jc/fake-lstat.) + + The optimization based on fsmonitor in the "diff --cached" + codepath is resurrected with the "fake-lstat" introduced earlier. + + It is unknown if the optimization is worth resurrecting, but in case... + source: <xmqqr0n0h0tw.fsf@gitster.g> + +-------------------------------------------------- +[Cooking] + * jk/chunk-bounds-more (2023-11-09) 9 commits (merged to 'next' on 2023-11-13 at 3df4b18bea) + commit-graph: mark chunk error messages for translation @@ -81,41 +133,42 @@ Release tarballs are available at: Portability tweak. - Will merge to 'master'. + Will cook in 'next'. source: <cover.1699596457.git.ps@pks.im> * ss/format-patch-use-encode-headers-for-cover-letter (2023-11-10) 1 commit - - format-patch: fix ignored encode_email_headers for cover letter + (merged to 'next' on 2023-11-14 at 1a4bd59e15) + + format-patch: fix ignored encode_email_headers for cover letter "git format-patch --encode-email-headers" ignored the option when preparing the cover letter, which has been corrected. - Will merge to 'next'. + Will cook in 'next'. source: <20231109111950.387219-1-contact@emersion.fr> * ps/ban-a-or-o-operator-with-test (2023-11-11) 4 commits - - Makefile: stop using `test -o` when unlinking duplicate executables - - contrib/subtree: convert subtree type check to use case statement - - contrib/subtree: stop using `-o` to test for number of args - - global: convert trivial usages of `test <expr> -a/-o <expr>` + (merged to 'next' on 2023-11-14 at d84471baab) + + Makefile: stop using `test -o` when unlinking duplicate executables + + contrib/subtree: convert subtree type check to use case statement + + contrib/subtree: stop using `-o` to test for number of args + + global: convert trivial usages of `test <expr> -a/-o <expr>` Test and shell scripts clean-up. - Will merge to 'next'. + Will cook in 'next'. source: <cover.1699609940.git.ps@pks.im> -* vd/glossary-dereference-peel (2023-11-10) 1 commit +* vd/glossary-dereference-peel (2023-11-14) 1 commit - glossary: add definitions for dereference & peel "To dereference" and "to peel" were sometimes used in in-code comments and documentation but without description in the glossary. - Expecting an update. - cf. <xmqq1qcyxxri.fsf@gitster.g> - source: <pull.1610.git.1699574277143.gitgitgadget@gmail.com> + Will merge to 'next'. + source: <pull.1610.v2.git.1699917471769.gitgitgadget@gmail.com> * ak/rebase-autosquash (2023-11-13) 4 commits @@ -124,52 +177,13 @@ Release tarballs are available at: - rebase: support --autosquash without -i - rebase: fully ignore rebase.autoSquash without -i - source: <20231111132720.78877-1-andy.koppe@gmail.com> - --------------------------------------------------- -[Stalled] - -* pw/rebase-sigint (2023-09-07) 1 commit - - rebase -i: ignore signals when forking subprocesses - - If the commit log editor or other external programs (spawned via - "exec" insn in the todo list) receive internactive signal during - "git rebase -i", it caused not just the spawned program but the - "Git" process that spawned them, which is often not what the end - user intended. "git" learned to ignore SIGINT and SIGQUIT while - waiting for these subprocesses. - - Expecting a reroll. - cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com> - source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com> - - -* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit - - cherry-pick: refuse cherry-pick sequence if index is dirty + "git rebase --autosquash" is now enabled for non-interactive rebase, + but it is still incompatible with the apply backend. - "git cherry-pick A" that replays a single commit stopped before - clobbering local modification, but "git cherry-pick A..B" did not, - which has been corrected. - - Expecting a reroll. - cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com> - source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com> - - -* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits - - diff-lib: fix check_removed() when fsmonitor is active - - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix - - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix - (this branch uses jc/fake-lstat.) - - The optimization based on fsmonitor in the "diff --cached" - codepath is resurrected with the "fake-lstat" introduced earlier. - - It is unknown if the optimization is worth resurrecting, but in case... - source: <xmqqr0n0h0tw.fsf@gitster.g> + Expecting a (hopefully small and final) reroll. + cf. <058eb5d9-35d9-4452-8d33-d9cfebb94347@gmail.com> + source: <20231111132720.78877-1-andy.koppe@gmail.com> --------------------------------------------------- -[Cooking] * vd/for-each-ref-unsorted-optimization (2023-11-07) 9 commits - t/perf: add perf tests for for-each-ref @@ -213,6 +227,7 @@ Release tarballs are available at: + ci: group installation of Docker dependencies + ci: make grouping setup more generic + ci: reorder definitions for grouping functions + (this branch is used by js/ci-discard-prove-state.) Add support for GitLab CI. |