To: git@vger.kernel.org
-Subject: What's cooking in git.git (May 2025, #01; Fri, 2)
-X-master-at: 6c0bd1fc70efaf053abe4e57c976afdc72d15377
-X-next-at: a8402760328a6f9879ce40263fe306538782a5b0
+Subject: What's cooking in git.git (May 2025, #02; Mon, 5)
+X-master-at: 6f84262c44a89851c3ae5a6e4c1a9d06b2068d75
+X-next-at: 170613ef418a11cdc11d88353825adf513fdfdf5
Bcc: lwn@lwn.net, gitster@pobox.com
-What's cooking in git.git (May 2025, #01; Fri, 2)
+What's cooking in git.git (May 2025, #02; Mon, 5)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
--------------------------------------------------
[Graduated to 'master']
-* as/typofix-in-env-h-header (2025-04-18) 1 commit
- (merged to 'next' on 2025-04-23 at a9954f6cec)
- + environment: fix typo: 'setup_git_directory_gently'
+* cf/wrapper-netbsd-errno-eftype (2025-05-02) 1 commit
+ - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
- Typofix.
- source: <20250418185855.52950-1-abhijeet.nkt@gmaiil.com>
+ source: <20250502233403.289761-1-collin.funk1@gmail.com>
-* az/tighten-string-array-constness (2025-04-21) 1 commit
- (merged to 'next' on 2025-04-23 at 5a2b439731)
- + global: mark usage strings and string tables const
+* es/meson-cleanup (2025-04-25) 6 commits
+ (merged to 'next' on 2025-04-28 at 0cc8ee98dc)
+ + meson: only check for missing networking syms on non-Windows; add compat impls
+ + meson: fix typo in function check that prevented checking for hstrerror
+ + meson: add a couple missing networking dependencies
+ + meson: do a full usage-based compile check for sysinfo
+ + meson: check for getpagesize before using it
+ + meson: simplify and parameterize various standard function checks
- Code clean-up.
- source: <daj53eijkqzsjy5cvuxchea4qm3pbiu673ehetihfffyvwzhgs@tarta.nabijaczleweli.xyz>
+ Code clean-up for meson-based build infrastructure.
+
+ source: <20250425053345.17288-1-eschwartz@gentoo.org>
-* jh/gc-launchctl-schedule-fix (2025-04-23) 1 commit
- (merged to 'next' on 2025-04-23 at ab4f2e0c26)
- + maintenance: fix launchctl calendar intervals
+* js/ci-win-meson-timeout-workaround (2025-04-25) 1 commit
+ - ci(win+Meson): build in Release mode, avoiding t7001-mv hangs
- Fix for scheduled maintenance tasks on platforms using launchctl.
- source: <20250421054633.231069-2-joshiheinrichs@gmail.com>
+ win+Meson CI pipeline, unlike other pipelines for Windows,
+ used to build artifacts in develper mode, which has been changed to
+ build them in release mode for consistency.
+ Expecting a reroll, stating an updated rationale for the change.
+ cf. <xmqqjz6zuf80.fsf@gitster.g>
+ source: <pull.1908.git.1745593515875.gitgitgadget@gmail.com>
-* jk/p5332-testfix (2025-04-22) 1 commit
- (merged to 'next' on 2025-04-24 at eafff4d7b7)
- + p5332: drop "+" from --stdin-packs input
- A test fix.
- source: <20250422111632.GA1855088@coredump.intra.peff.net>
+* js/windows-arm64 (2025-04-23) 6 commits
+ (merged to 'next' on 2025-04-28 at c3d4cea333)
+ + max_tree_depth: lower it for clangarm64 on Windows
+ + mingw(arm64): do move the `/etc/git*` location
+ + msvc: do handle builds on Windows/ARM64
+ + mingw: do not use nedmalloc on Windows/ARM64
+ + config.mak.uname: add support for clangarm64
+ + bswap.h: add support for built-in bswap functions
+ Update to arm64 Windows port.
+
+ source: <pull.1904.v2.git.1745395308.gitgitgadget@gmail.com>
-* js/git-perf-env-override (2025-04-20) 1 commit
- (merged to 'next' on 2025-04-22 at 77ea361791)
- + perf: do allow `GIT_PERF_*` to be overridden again
- Developer support fix..
- source: <pull.1900.git.1743764167548.gitgitgadget@gmail.com>
+* kn/meson-hdr-check (2025-04-23) 7 commits
+ (merged to 'next' on 2025-04-29 at c925448238)
+ + makefile/meson: add 'check-headers' as alias for 'hdr-check'
+ + meson: add support for 'hdr-check'
+ + meson: rename 'third_party_sources' to 'third_party_excludes'
+ + meson: move headers definition from 'contrib/coccinelle'
+ + coccinelle: meson: rename variables to be more specific
+ + ci/github: install git before checking out the repository
+ + Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-check
+ Add an equivalent to "make hdr-check" target to meson based builds.
+
+ source: <20250423-505-wire-up-sparse-via-meson-v5-0-d1e2be4b2078@gmail.com>
-* lo/remove-log-reencode-from-rev-info (2025-04-22) 1 commit
- (merged to 'next' on 2025-04-24 at 1c6c33ab1f)
- + revision: remove log_reencode field from rev_info
- Code clean-up.
- source: <20250422213133.18685-1-lucasseikioshiro@gmail.com>
+* ps/meson-build-perf-bench (2025-04-28) 5 commits
+ (merged to 'next' on 2025-04-28 at f563542bfd)
+ + meson: wire up benchmarking options
+ + meson: wire up benchmarks
+ + t/perf: fix benchmarks with out-of-tree builds
+ + t/perf: use configured PERL_PATH
+ + t/perf: fix benchmarks with alternate repo formats
+
+ The build procedure based on Meson learned to drive the
+ benchmarking tests.
+
+ source: <20250428-pks-meson-benchmarks-v5-0-5010dd014d1d@pks.im>
+
+--------------------------------------------------
+[New Topics]
+* cf/wrapper-bsd-eloop (2025-05-02) 1 commit
+ - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
-* ps/ci-resurrect-p4-on-github (2025-04-22) 1 commit
- (merged to 'next' on 2025-04-24 at 8594d07a3e)
- + ci: fix p4d executable not being found on GitHub Actions
+ The fallback implementation of open_nofollow() depended on
+ open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD
+ derived systems use different errno, which has been worked around.
- CI fix.
- source: <aActb3dB-r3s69h6@pks.im>
+ source: <20250502233403.289761-1-collin.funk1@gmail.com>
-* ps/fewer-perl (2025-04-16) 5 commits
- (merged to 'next' on 2025-04-23 at 275d267126)
- + Documentation: stop depending on Perl to generate command list
- + Documentation: stop depending on Perl to massage user manual
- + request-pull: stop depending on Perl
- + filter-branch: stop depending on Perl
- + Merge branch 'ps/test-wo-perl-prereq' into ps/fewer-perl
+* js/ci-build-win-in-release-mode (2025-05-05) 1 commit
+ - ci(win+Meson): build in Release mode
- Reduce requirement for Perl in our documentation build and a few
- scripts.
- source: <20250416-b4-pks-drop-perl-v2-0-bdd0492e9498@pks.im>
+ win+Meson CI pipeline, unlike other pipelines for Windows,
+ used to build artifacts in develper mode, which has been changed to
+ build them in release mode for consistency.
+ WIll merge to 'next'.
+ source: <pull.1908.v2.git.1746282346370.gitgitgadget@gmail.com>
-* ps/install-bash-completion (2025-04-22) 1 commit
- (merged to 'next' on 2025-04-24 at 1171444ac4)
- + contrib/completion: install Bash completion
- Build update to install bash (but not zsh) completion script.
- source: <20250422-b4-pks-meson-install-completions-v2-1-ab29d399bc6c@pks.im>
+* js/ci-buildsystems-cleanup (2025-05-05) 3 commits
+ - config.mak.uname: drop the `vcxproj` target
+ - contrib/buildsystems: drop support for building . vcproj/.vcxproj files
+ - ci: stop linking the `prove` cache
+ Code clean-up around stale CI elements and building with Visual Studio.
-* ps/reftable-api-revamp (2025-04-07) 17 commits
- (merged to 'next' on 2025-04-23 at 1a5f00290a)
- + reftable/table: move printing logic into test helper
- + reftable/constants: make block types part of the public interface
- + reftable/table: introduce iterator for table blocks
- + reftable/table: add `reftable_table` to the public interface
- + reftable/block: expose a generic iterator over reftable records
- + reftable/block: make block iterators reseekable
- + reftable/block: store block pointer in the block iterator
- + reftable/block: create public interface for reading blocks
- + git-zlib: use `struct z_stream_s` instead of typedef
- + reftable/block: rename `block_reader` to `reftable_block`
- + reftable/block: rename `block` to `block_data`
- + reftable/table: move reading block into block reader
- + reftable/block: simplify how we track restart points
- + reftable/blocksource: consolidate code into a single file
- + reftable/reader: rename data structure to "table"
- + reftable: fix formatting of the license header
- + Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-api-revamp
+ Will merge to 'next'.
+ source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>
+
+
+* kh/docfixes (2025-05-05) 2 commits
+ - doc: branch: fix inline-verbatim
+ - doc: reflog: fix `drop` subheading
- Overhaul of the reftable API.
- cf. <3okrcl7bdpy75hzyzpmrp7fluan4n3zvsroioq64id4a2kt3o4@fc6fetilb6y2>
- source: <20250407-pks-reftable-polishing-v2-0-316c4ff10571@pks.im>
+ Docfixes.
+
+ Will merge to 'next'.
+ source: <cover.1746299135.git.code@khaugsbakk.name>
-* ua/call-repo-config-with-possibly-null-repository (2025-04-20) 2 commits
- (merged to 'next' on 2025-04-22 at 1f30a19c02)
- + builtin/difftool: remove unnecessary if statement
- + builtin/add: remove unnecessary if statement
+* kj/glob-path-with-special-char (2025-05-05) 1 commit
+ - dir.c: literal match with wildcard in pathspec should still glob
- Since a call to repo_config() can be called with repo set to NULL
- these days, a command that is marked as RUN_SETUP in the builtin
- command table does not have to check repo with NULL before making
- the call.
- source: <20250420025501.183290-1-usmanakinyemi202@gmail.com>
+ "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname,
+ also existed on the working tree, which has been corrected.
+
+ Will merge to 'next'.
+ source: <20250503060736.587286-1-jayatheerthkulkarni2005@gmail.com>
+
+
+* ps/ci-test-aggreg-fix-for-meson (2025-05-05) 1 commit
+ - ci: fix aggregation of test results with Meson
+
+ Test result aggregation did not work in Meson based CI jobs.
+
+ Will merge to 'next'.
+ source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>
--------------------------------------------------
-[New Topics]
+[Cooking]
* cc/promisor-remote-capability (2025-04-29) 3 commits
- promisor-remote: allow a client to check fields
* ng/xdiff-truly-minimal (2025-04-29) 1 commit
- - xdiff: disable cleanup_records heuristic with --minimal
+ (merged to 'next' on 2025-05-05 at 62e0c33153)
+ + xdiff: disable cleanup_records heuristic with --minimal
"git diff --minimal" used to give non-minimal output when its
optimization kicked in, which has been disabled.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <20250429140949.2634935-1-n.glodny@campus.lmu.de>
-* ds/scalar-no-maintenance (2025-04-30) 2 commits
+* ds/scalar-no-maintenance (2025-05-05) 4 commits
+ - scalar reconfigure: add --no-maintenance option
- scalar clone: add --no-maintenance option
- scalar register: add --no-maintenance option
+ - scalar: customize register_dir()'s behavior
Two "scalar" subcommands that adds a repository that hasn't been
under "scalar"'s control are taught an option not to enable the
scheduled maintenance on it.
- Expecting a reroll.
- cf. <b9a4dbf2-0064-4933-985f-b34dcb133030@gmail.com>
- source: <pull.1913.git.1746008680.gitgitgadget@gmail.com>
+ Will merge to 'next'?
+ source: <pull.1913.v2.git.1746458844.gitgitgadget@gmail.com>
* ps/mv-contradiction-fix (2025-04-30) 2 commits
source: <20250430-pks-mv-parent-child-conflict-v1-0-11a87c55ffb9@pks.im>
-* cf/wrapper-netbsd-errno-eftype (2025-05-02) 1 commit
- - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
-
- source: <20250502233403.289761-1-collin.funk1@gmail.com>
-
-
* en/get-tree-entry-doc (2025-05-02) 1 commit
- tree-walk.h: fix incorrect API comment
+ Doc update.
+
+ Will merge to 'next'.
source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>
source: <20250503011537.3035416-1-gitster@pobox.com>
-* jc/you-still-use-whatchanged (2025-05-02) 6 commits
+* jc/you-still-use-whatchanged (2025-05-05) 6 commits
- whatschanged: list it in BreakingChanges document
- whatchanged: remove when built with WITH_BREAKING_CHANGES
- whatchanged: require --i-still-use-this
Comments?
source: <20250503005814.3030099-1-gitster@pobox.com>
---------------------------------------------------
-[Cooking]
* jc/ci-skip-unavailable-external-software (2025-04-25) 2 commits
- - ci: download JGit from maven, not eclipse.org
- - ci: update the message for unavailble third-party software
+ (merged to 'next' on 2025-05-05 at a13d958c1b)
+ + ci: download JGit from maven, not eclipse.org
+ + ci: update the message for unavailble third-party software
Further refinement on CI messages when an optional external
software is unavailable (e.g. due to third-party service outage).
- Will merge to 'next'.
+ Will merge to 'master'.
source: <20250425153827.147585-1-gitster@pobox.com>
-* js/ci-win-meson-timeout-workaround (2025-04-25) 1 commit
- - ci(win+Meson): build in Release mode, avoiding t7001-mv hangs
-
- win+Meson CI pipeline, unlike other pipelines for Windows,
- used to build artifacts in develper mode, which has been changed to
- build them in release mode for consistency.
-
- Expecting a reroll, stating an updated rationale for the change.
- cf. <xmqqjz6zuf80.fsf@gitster.g>
- source: <pull.1908.git.1745593515875.gitgitgadget@gmail.com>
-
-
-* ps/maintenance-missing-tasks (2025-05-02) 7 commits
+* ps/maintenance-missing-tasks (2025-05-05) 7 commits
- builtin/maintenance: introduce "rerere-gc" task
- builtin/gc: move rerere garbage collection into separate function
- builtin/maintenance: introduce "worktree-prune" task
Make repository clean-up tasks "gc" can do available to "git
maintenance" front-end.
- Will merge to 'next'?
- source: <20250502-pks-maintenance-missing-tasks-v3-0-13e130d36640@pks.im>
+ Will merge to 'next'.
+ source: <20250505-pks-maintenance-missing-tasks-v4-0-141f4df906a1@pks.im>
* ag/send-email-outlook (2025-04-29) 2 commits
- - send-email: add --[no-]outlook-id-fix option
- - send-email: retrieve Message-ID from outlook SMTP server
+ (merged to 'next' on 2025-05-05 at c85e7a2e65)
+ + send-email: add --[no-]outlook-id-fix option
+ + send-email: retrieve Message-ID from outlook SMTP server
Update send-email to work better with Outlook's smtp server.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <PN3PR01MB95973F4B26A8CE2BF17A3AB1B8842@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
source: <PN3PR01MB9597DA8661D1AFDF4C927A11B8812@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
* ds/fix-thin-fix (2025-04-28) 3 commits
- - index-pack: allow revisiting REF_DELTA chains
- - t5309: create failing test for 'git index-pack'
- - test-tool: add pack-deltas helper
+ (merged to 'next' on 2025-05-05 at 200a988f98)
+ + index-pack: allow revisiting REF_DELTA chains
+ + t5309: create failing test for 'git index-pack'
+ + test-tool: add pack-deltas helper
"git index-pack --fix-thin" used to abort to prevent a cycle in
delta chains from forming in a corner case even when there is no
such cycle.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <pull.1906.v2.git.1745871885.gitgitgadget@gmail.com>
* ps/object-store-cleanup (2025-04-29) 8 commits
- - object-store: drop `repo_has_object_file()`
- - treewide: convert users of `repo_has_object_file()` to `has_object()`
- - object-store: allow fetching objects via `has_object()`
- - object-store: move function declarations to their respective subsystems
- - object-store: move and rename `odb_pack_keep()`
- - object-store: drop `loose_object_path()`
- - object-store: move `struct packed_git` into "packfile.h"
- - Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
+ (merged to 'next' on 2025-05-05 at f91eca32c9)
+ + object-store: drop `repo_has_object_file()`
+ + treewide: convert users of `repo_has_object_file()` to `has_object()`
+ + object-store: allow fetching objects via `has_object()`
+ + object-store: move function declarations to their respective subsystems
+ + object-store: move and rename `odb_pack_keep()`
+ + object-store: drop `loose_object_path()`
+ + object-store: move `struct packed_git` into "packfile.h"
+ + Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
Further code clean-up in the object-store layer.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <20250429-pks-object-store-cleanups-v3-0-42902bad09a1@pks.im>
* ps/meson-bin-sh (2025-04-25) 2 commits
- - meson: prefer shell at "/bin/sh"
- - meson: report detected runtime executable paths
+ (merged to 'next' on 2025-05-05 at 546cdf31bf)
+ + meson: prefer shell at "/bin/sh"
+ + meson: report detected runtime executable paths
Meson-based build framework update.
- Will merge to 'next'?
- source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
-
-
-* es/meson-cleanup (2025-04-25) 6 commits
- (merged to 'next' on 2025-04-28 at 0cc8ee98dc)
- + meson: only check for missing networking syms on non-Windows; add compat impls
- + meson: fix typo in function check that prevented checking for hstrerror
- + meson: add a couple missing networking dependencies
- + meson: do a full usage-based compile check for sysinfo
- + meson: check for getpagesize before using it
- + meson: simplify and parameterize various standard function checks
-
- Code clean-up for meson-based build infrastructure.
-
Will merge to 'master'.
- source: <20250425053345.17288-1-eschwartz@gentoo.org>
-
-
-* js/windows-arm64 (2025-04-23) 6 commits
- (merged to 'next' on 2025-04-28 at c3d4cea333)
- + max_tree_depth: lower it for clangarm64 on Windows
- + mingw(arm64): do move the `/etc/git*` location
- + msvc: do handle builds on Windows/ARM64
- + mingw: do not use nedmalloc on Windows/ARM64
- + config.mak.uname: add support for clangarm64
- + bswap.h: add support for built-in bswap functions
-
- Update to arm64 Windows port.
-
- Will merge to 'master'.
- source: <pull.1904.v2.git.1745395308.gitgitgadget@gmail.com>
+ source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
* sj/string-list-typefix (2025-04-22) 5 commits
source: <cover.1744924321.git.me@ttaylorr.com>
-* ps/meson-build-perf-bench (2025-04-28) 5 commits
- (merged to 'next' on 2025-04-28 at f563542bfd)
- + meson: wire up benchmarking options
- + meson: wire up benchmarks
- + t/perf: fix benchmarks with out-of-tree builds
- + t/perf: use configured PERL_PATH
- + t/perf: fix benchmarks with alternate repo formats
-
- The build procedure based on Meson learned to drive the
- benchmarking tests.
-
- Will merge to 'master'.
- source: <20250428-pks-meson-benchmarks-v5-0-5010dd014d1d@pks.im>
-
-
-* kn/meson-hdr-check (2025-04-23) 7 commits
- (merged to 'next' on 2025-04-29 at c925448238)
- + makefile/meson: add 'check-headers' as alias for 'hdr-check'
- + meson: add support for 'hdr-check'
- + meson: rename 'third_party_sources' to 'third_party_excludes'
- + meson: move headers definition from 'contrib/coccinelle'
- + coccinelle: meson: rename variables to be more specific
- + ci/github: install git before checking out the repository
- + Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-check
-
- Add an equivalent to "make hdr-check" target to meson based builds.
-
- Will merge to 'master'.
- source: <20250423-505-wire-up-sparse-via-meson-v5-0-d1e2be4b2078@gmail.com>
-
-
* pb/status-rebase-fixes (2025-03-28) 4 commits
- wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
- wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase