What's cooking (2024/04 #10)

This commit is contained in:
Junio C Hamano
2024-04-29 09:31:23 -07:00
parent 029b806168
commit 4eac2bdcb6

View File

@@ -1,10 +1,10 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Apr 2024, #09; Tue, 23)
X-master-at: bf995e7a4f94a9388aa8042dc9e338f3fcb75496
X-next-at: d95f3e8691c1cba156beb6189d8229bc2ee0caab
Subject: What's cooking in git.git (Apr 2024, #10; Mon, 29)
X-master-at: 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8
X-next-at: b9fe23f5ca751025eab840f4e693bd4f1ac413cb
Bcc: lwn@lwn.net, gitster@pobox.com
What's cooking in git.git (Apr 2024, #09; Tue, 23)
What's cooking in git.git (Apr 2024, #10; Mon, 29)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +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).
A release candidate Git 2.45-rc1 has been tagged.
Git 2.45 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
@@ -50,161 +50,65 @@ Release tarballs are available at:
--------------------------------------------------
[Graduated to 'master']
* dd/t9604-use-posix-timezones (2024-04-10) 1 commit
(merged to 'next' on 2024-04-16 at 46ab81737f)
+ t9604: Fix test for musl libc and new Debian
* rj/add-i-leak-fix (2024-04-22) 4 commits
(merged to 'next' on 2024-04-23 at b10e350a54)
+ add: plug a leak on interactive_add
+ add-patch: plug a leak handling the '/' command
+ add-interactive: plug a leak in get_untracked_files
+ apply: plug a leak in apply_data
The cvsimport tests required that the platform understands
traditional timezone notations like CST6CDT, which has been
updated to work on those systems as long as they understand
POSIX notation with explicit tz transition dates.
source: <20240410032812.30476-1-congdanhqx@gmail.com>
Leakfix.
source: <69f86760-96ff-4c62-9649-4627652b7c19@gmail.com>
* la/format-trailer-info (2024-03-15) 5 commits
(merged to 'next' on 2024-04-16 at dca4784407)
+ trailer: finish formatting unification
+ trailer: begin formatting unification
+ format_trailer_info(): append newline for non-trailer lines
+ format_trailer_info(): drop redundant unfold_value()
+ format_trailer_info(): use trailer_item objects
(this branch is used by la/hide-trailer-info.)
* rs/vsnprintf-failure-is-not-a-bug (2024-04-21) 1 commit
(merged to 'next' on 2024-04-23 at bf66ab6ea7)
+ don't report vsnprintf(3) error as bug
The code to format trailers have been cleaned up.
source: <pull.1694.git.1710485706.gitgitgadget@gmail.com>
* mr/rerere-crash-fix (2024-04-16) 1 commit
(merged to 'next' on 2024-04-17 at 60be8e2d74)
+ rerere: fix crashes due to unmatched opening conflict markers
When .git/rr-cache/ rerere database gets corrupted or rerere is fed to
work on a file with conflicted hunks resolved incompletely, the rerere
machinery got confused and segfaulted, which has been corrected.
source: <20240416105320.1113401-1-marcel@roethke.info>
* pk/bisect-use-show (2024-04-15) 1 commit
(merged to 'next' on 2024-04-22 at 4dd13c288f)
+ bisect: report the found commit with "show"
When "git bisect" reports the commit it determined to be the
culprit, we used to show it in a format that does not honor common
UI tweaks, like log.date and log.decorate. The code has been
taught to use "git show" to follow more customizations.
source: <965ae345-fd58-c46c-5a7a-de181e901f21@softwolves.pp.se>
* ps/missing-btmp-fix (2024-04-15) 1 commit
(merged to 'next' on 2024-04-16 at c70779ba4b)
+ pack-bitmap: gracefully handle missing BTMP chunks
GIt 2.44 introduced a regression that makes the updated code to
barf in repositories with multi-pack index written by older
versions of Git, which has been corrected.
source: <a8251f8278ba9a3b41a8e299cb4918a62df6d1c7.1713163238.git.ps@pks.im>
* ps/reftable-block-iteration-optim (2024-04-15) 10 commits
(merged to 'next' on 2024-04-15 at 3a2353c7f2)
+ reftable/block: avoid copying block iterators on seek
+ reftable/block: reuse `zstream` state on inflation
+ reftable/block: open-code call to `uncompress2()`
+ reftable/block: reuse uncompressed blocks
+ reftable/reader: iterate to next block in place
+ reftable/block: move ownership of block reader into `struct table_iter`
+ reftable/block: introduce `block_reader_release()`
+ reftable/block: better grouping of functions
+ reftable/block: merge `block_iter_seek()` and `block_reader_seek()`
+ reftable/block: rename `block_reader_start()`
The code to iterate over reftable blocks has seen some optimization
to reduce memory allocation and deallocation.
source: <cover.1712578376.git.ps@pks.im>
* ps/run-auto-maintenance-in-receive-pack (2024-04-17) 2 commits
(merged to 'next' on 2024-04-22 at cacdcac452)
+ builtin/receive-pack: convert to use git-maintenance(1)
+ run-command: introduce function to prepare auto-maintenance process
The "receive-pack" program (which responds to "git push") was not
converted to run "git maintenance --auto" when other codepaths that
used to run "git gc --auto" were updated, which has been corrected.
source: <cover.1713334241.git.ps@pks.im>
* rj/launch-editor-error-message (2024-04-15) 1 commit
(merged to 'next' on 2024-04-16 at 3d0dd46fc2)
+ launch_editor: waiting message on error
Git writes a "waiting for your editor" message on an incomplete
line after launching an editor, and then append another error
message on the same line if the editor errors out. It now clears
the "waiting for..." line before giving the error message.
source: <e208da74-8f16-44ae-912e-ae968da82057@gmail.com>
* rs/apply-reject-long-name (2024-04-16) 1 commit
(merged to 'next' on 2024-04-17 at 701ccded8b)
+ apply: avoid using fixed-size buffer in write_out_one_reject()
The filename used for rejected hunks "git apply --reject" creates
was limited to PATH_MAX, which has been lifted.
source: <a93cd243-cb17-4ad5-8d23-30768dc5213b@web.de>
* rs/imap-send-simplify-cmd-issuing-codepath (2024-04-15) 1 commit
(merged to 'next' on 2024-04-17 at 0255e49f8b)
+ imap-send: increase command size limit
Code simplification.
source: <7026075c-db4e-4d43-bbd1-d2edb52da9b7@web.de>
* rs/no-openssl-compilation-fix-on-macos (2024-04-15) 1 commit
(merged to 'next' on 2024-04-15 at 48cab93d0a)
+ git-compat-util: fix NO_OPENSSL on current macOS
Build fix.
source: <3188f4e2-9744-40b1-8f05-0896b8679d25@web.de>
* ta/fast-import-parse-path-fix (2024-04-15) 8 commits
(merged to 'next' on 2024-04-15 at 00cc71a679)
+ fast-import: make comments more precise
+ fast-import: forbid escaped NUL in paths
+ fast-import: document C-style escapes for paths
+ fast-import: improve documentation for path quoting
+ fast-import: remove dead strbuf
+ fast-import: allow unquoted empty path for root
+ fast-import: directly use strbufs for paths
+ fast-import: tighten path unquoting
The way "git fast-import" handles paths described in its input has
been tightened up and more clearly documented.
source: <cover.1713056559.git.thalia@archibald.dev>
* xx/rfc2822-date-format-in-doc (2024-04-12) 1 commit
(merged to 'next' on 2024-04-17 at f2186bd6e8)
+ Documentation: fix typos describing date format
Docfix.
source: <pull.1716.git.1712911876943.gitgitgadget@gmail.com>
* yb/replay-doc-linkfix (2024-04-15) 1 commit
(merged to 'next' on 2024-04-15 at e8cf9cd9a8)
+ Documentation: fix linkgit reference
Docfix.
source: <pull.1706.git.git.1713132482976.gitgitgadget@gmail.com>
Demote a BUG() to an die() when the failure from vsnprintf() may
not be due to a programmer error.
source: <ea752a2b-9b74-4a59-a037-4782abf7161e@web.de>
--------------------------------------------------
[New Topics]
* ps/undecided-is-not-necessarily-sha1 (2024-04-23) 12 commits
* rh/complete-symbolic-ref (2024-04-25) 3 commits
- completion: add docs on how to add subcommand completions
- completion: improve docs for using __git_complete
- completion: add 'symbolic-ref'
Command line completion script (in contrib/) learned to complete
"git symbolic-ref" a bit better (you need to enable plumbing
commands to be completed with GIT_COMPLETION_SHOW_ALL_COMMANDS).
Will merge to 'next'.
source: <20240425101845.708554-3-rhi@pengutronix.de>
* jt/doc-submitting-rerolled-series (2024-04-25) 1 commit
- doc: clarify practices for submitting updated patch versions
Developer doc update.
Will merge to 'next'.
source: <20240425213404.133660-1-jltobler@gmail.com>
* bc/zsh-compatibility (2024-04-26) 2 commits
- vimdiff: make script and tests work with zsh
- t4046: avoid continue in &&-chain for zsh
source: <20240426221154.2194139-1-sandals@crustytoothpaste.net>
* jc/rev-parse-fatal-doc (2024-04-28) 1 commit
- rev-parse: document that most of the time you need to be in a repository
--------------------------------------------------
[Cooking]
* ps/undecided-is-not-necessarily-sha1 (2024-04-29) 13 commits
- SQUASH???
- repository: stop setting SHA1 as the default object hash
- builtin/shortlog: don't set up revisions without repo
- builtin/diff: explicitly set hash algo when there is no repo
@@ -223,11 +127,10 @@ Release tarballs are available at:
this will smoke out codepaths that rely on such an unwarranted
assumptions.
Will merge to 'next'?
fuzz-smoke-test job at GitHub Actions CI breaks with this in 'seen'
cf. <xmqqwmoi31aw.fsf@gitster.g>
source: <cover.1713848619.git.ps@pks.im>
--------------------------------------------------
[Cooking]
* aj/stash-staged-fix (2024-04-22) 1 commit
(merged to 'next' on 2024-04-23 at d49e9dade0)
@@ -240,43 +143,19 @@ Release tarballs are available at:
source: <pull.1722.git.1713781694490.gitgitgadget@gmail.com>
* rj/add-i-leak-fix (2024-04-22) 4 commits
(merged to 'next' on 2024-04-23 at b10e350a54)
+ add: plug a leak on interactive_add
+ add-patch: plug a leak handling the '/' command
+ add-interactive: plug a leak in get_untracked_files
+ apply: plug a leak in apply_data
Leakfix.
Will merge to 'master'.
source: <69f86760-96ff-4c62-9649-4627652b7c19@gmail.com>
* rj/add-p-typo-reaction (2024-04-21) 1 commit
(merged to 'next' on 2024-04-23 at 8ac0509b47)
+ add-patch: response to unknown command
* rj/add-p-typo-reaction (2024-04-26) 1 commit
- add-patch: response to unknown command
When the user responds to a prompt given by "git add -p" with an
unsupported command, list of available commands were given, which
was too much if the user knew what they wanted to type but merely
made a typo. Now the user gets a much shorter error message.
Will cook in 'next'.
Expecting a reroll.
cf. <305296f1-975b-41b9-968c-3984d8056196@gmail.com>
source: <b209a2b8-f98f-4f14-a687-9022d30968dd@gmail.com>
* rs/vsnprintf-failure-is-not-a-bug (2024-04-21) 1 commit
(merged to 'next' on 2024-04-23 at bf66ab6ea7)
+ don't report vsnprintf(3) error as bug
Demote a BUG() to an die() when the failure from vsnprintf() may
not be due to a programmer error.
Will merge to 'master'.
source: <ea752a2b-9b74-4a59-a037-4782abf7161e@web.de>
* ds/format-patch-rfc-and-k (2024-04-19) 1 commit
(merged to 'next' on 2024-04-23 at b3b0c5507a)
+ format-patch: ensure that --rfc and -k are mutually exclusive
@@ -315,7 +194,7 @@ Release tarballs are available at:
by always instantiating "the_repository" and replacing references
to "the_index" with references to its .index member.
Comments?
Will merge to 'next'?
source: <cover.1713442061.git.ps@pks.im>
@@ -336,18 +215,17 @@ Release tarballs are available at:
source: <cover.1713445918.git.phillip.wood@dunelm.org.uk>
* js/for-each-repo-keep-going (2024-04-18) 2 commits
- maintenance: running maintenance should not stop on errors
- for-each-repo: optionally keep going on an error
* js/for-each-repo-keep-going (2024-04-24) 2 commits
(merged to 'next' on 2024-04-25 at d33253d919)
+ maintenance: running maintenance should not stop on errors
+ for-each-repo: optionally keep going on an error
A scheduled "git maintenance" job is expected to work on all
repositories it knows about, but it stopped at the first one that
errored out. Now it keeps going.
Expecting a hopefully small and final reroll.
Can change exit condition, which needs fixing.
cf. <20240419175621.GB14309@coredump.intra.peff.net>
source: <pull.1719.v2.git.1713444783.gitgitgadget@gmail.com>
Will cook in 'next'.
source: <pull.1719.v3.git.1713975299.gitgitgadget@gmail.com>
* xx/disable-replace-when-building-midx (2024-04-17) 1 commit
@@ -362,34 +240,38 @@ Release tarballs are available at:
source: <pull.1711.v2.git.1712554017808.gitgitgadget@gmail.com>
* kn/update-ref-symrefs (2024-04-12) 8 commits
- SQUASH???
- refs: support symrefs in 'reference-transaction' hook
- update-ref: add support for symref-update
- update-ref: add support for symref-create
* kn/update-ref-symrefs (2024-04-26) 7 commits
- ref: support symrefs in 'reference-transaction' hook
- update-ref: add support for 'symref-update' command
- update-ref: add support for 'symref-create' command
- update-ref: add support for 'symref-delete' command
- update-ref: add support for 'symref-verify' command
- files-backend: extract out `create_symref_lock`
- update-ref: add support for symref-delete
- update-ref: add support for symref-verify
- refs: accept symref values in `ref_transaction[_add]_update`
source: <20240412095908.1134387-1-knayak@gitlab.com>
"update-ref" learns to also handle symbolic refs.
Expecting a reroll.
cf. <CAOLa=ZT4yVEuZXmiTVB2tf0qaTPCPn=0TcJRc89knZQWZBbFTg@mail.gmail.com>
source: <20240426152449.228860-1-knayak@gitlab.com>
* la/doc-use-of-contacts-when-contributing (2024-04-18) 8 commits
- SubmittingPatches: demonstrate using git-contacts with git-send-email
- SubmittingPatches: add heading for format-patch and send-email
- SubmittingPatches: dedupe discussion of security patches
- SubmittingPatches: discuss reviewers first
- SubmittingPatches: quote commands
- SubmittingPatches: mention GitGitGadget
- SubmittingPatches: clarify 'git-contacts' location
- MyFirstContribution: mention contrib/contacts/git-contacts
(merged to 'next' on 2024-04-25 at 5102a45f63)
+ SubmittingPatches: demonstrate using git-contacts with git-send-email
+ SubmittingPatches: add heading for format-patch and send-email
+ SubmittingPatches: dedupe discussion of security patches
+ SubmittingPatches: discuss reviewers first
+ SubmittingPatches: quote commands
+ SubmittingPatches: mention GitGitGadget
+ SubmittingPatches: clarify 'git-contacts' location
+ MyFirstContribution: mention contrib/contacts/git-contacts
Advertise "git contacts", a tool for newcomers to find people to
ask review for their patches, a bit more in our developer
documentation.
Will merge to 'next'.
Will cook in 'next'.
source: <pull.1704.v6.git.1713477125.gitgitgadget@gmail.com>
@@ -410,6 +292,8 @@ Release tarballs are available at:
Tests to ensure interoperability between reftable written by jgit
and our code have been added and enabled in CI.
Will merge to 'next'.
source: <cover.1712896868.git.ps@pks.im>
@@ -441,6 +325,8 @@ Release tarballs are available at:
Code to write out reftable has seen some optimization and
simplification.
Will merge to 'next'?
source: <cover.1712578837.git.ps@pks.im>
@@ -451,7 +337,7 @@ Release tarballs are available at:
"git send-email" learned to separate its reports on each message it
sends out with an extra blank line in between.
Comments?
Will merge to 'next'?
source: <cover.1712732383.git.dsimic@manjaro.org>
@@ -489,6 +375,8 @@ Release tarballs are available at:
The credential helper protocol, together with the HTTP layer, have
been enhanced to support authentication schemes different from
username & password pair, like Bearer and NTLM.
Comments?
source: <20240417000240.3611948-1-sandals@crustytoothpaste.net>
@@ -528,7 +416,9 @@ Release tarballs are available at:
source: <cover.1710972293.git.me@ttaylorr.com>
* la/hide-trailer-info (2024-04-19) 9 commits
* la/hide-trailer-info (2024-04-26) 11 commits
- trailer unit tests: inspect iterator contents
- trailer: document parse_trailers() usage
- trailer: retire trailer_info_get() from API
- trailer: make trailer_info struct private
- trailer: make parse_trailers() return trailer_info pointer
@@ -537,12 +427,13 @@ Release tarballs are available at:
- trailer: teach iterator about non-trailer lines
- trailer: add unit tests for trailer iterator
- Makefile: sort UNIT_TEST_PROGRAMS
- Merge branch 'la/format-trailer-info' into la/hide-trailer-info
+ Merge branch 'la/format-trailer-info' into la/hide-trailer-info
The trailer API has been reshuffled a bit.
Will merge to 'next'.
source: <pull.1696.v2.git.1713504153.gitgitgadget@gmail.com>
Will merge to 'next'?
cf. <CAP8UFD0ZHpo7US6dx_WK6F_1JYsBdHunBaW86qM1CzOKaPC-aA@mail.gmail.com>
source: <pull.1696.v3.git.1714091170.gitgitgadget@gmail.com>
* ds/doc-config-reflow (2024-03-14) 1 commit
@@ -568,17 +459,16 @@ Release tarballs are available at:
source: <20240319183722.211300-1-ignacio@iencinas.com>
* js/build-fuzz-more-often (2024-04-11) 2 commits
- fuzz: link fuzz programs with `make all` on Linux
- ci: also define CXX environment variable
* js/build-fuzz-more-often (2024-04-24) 1 commit
(merged to 'next' on 2024-04-25 at 28f65d1be2)
+ fuzz: link fuzz programs with `make all` on Linux
In addition to building the objects needed, try to link the objects
that are used in fuzzer tests, to make sure at least they build
without bitrot, in Linux CI runs.
Expecting a hopefully small and final reroll.
cf. <20240412042247.GA1077925@coredump.intra.peff.net>
source: <cover.1712858920.git.steadmon@google.com>
Will cook in 'next'.
source: <ba9d24c6445de309226bf7c165499f1969807fef.1713982389.git.steadmon@google.com>
* cw/git-std-lib (2024-02-28) 4 commits
@@ -593,7 +483,7 @@ Release tarballs are available at:
source: <cover.1696021277.git.jonathantanmy@google.com>
* js/cmake-with-test-tool (2024-02-23) 2 commits
* js/cmake-with-test-tool (2024-04-24) 2 commits
- cmake: let `test-tool` run the unit tests, too
- Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool
(this branch uses js/unit-test-suite-runner.)
@@ -601,10 +491,11 @@ Release tarballs are available at:
"test-tool" is now built in CMake build to also run the unit tests.
May want to roll it into the base topic.
Will merge to 'next' together with the base topic.
source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
* js/unit-test-suite-runner (2024-02-23) 8 commits
* js/unit-test-suite-runner (2024-04-24) 8 commits
- ci: use test-tool as unit test runner on Windows
- t/Makefile: run unit tests alongside shell tests
- unit tests: add rule for running with test-tool
@@ -619,7 +510,7 @@ Release tarballs are available at:
bypassing the need to use the "prove" tool.
Needs review.
source: <cover.1708728717.git.steadmon@google.com>
source: <cover.1713985716.git.steadmon@google.com>
* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit