What's cooking in git.git (May 2025, #05; Fri, 16)

Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise).

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 repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-scm/git/

With all the integration branches and topics broken out:

	https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

	https://www.kernel.org/pub/software/scm/git/

-------------------------------------------------- [Graduated to 'master']

* cf/wrapper-bsd-eloop (2025-05-06) 1 commit
  (merged to 'next' on 2025-05-08 at 7b1e21b252)
 + wrapper: NetBSD gives EFTYPE and FreeBSD gives EMFILE where POSIX uses ELOOP

 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.
 
 source: <20250506010946.212068-1-collin.funk1@gmail.com>

* dd/meson-perl-custom-path (2025-05-08) 1 commit
  (merged to 'next' on 2025-05-09 at 3e4d3f1d59)
 + meson: allow customize perl installation path

 Meson-based build framework update.
 
 source: <a9d431944b6d94e0eb25535c061fc226a7fefa9e.1746692662.git.congdanhqx@gmail.com>

* en/get-tree-entry-doc (2025-05-02) 1 commit
  (merged to 'next' on 2025-05-06 at cddf407919)
 + tree-walk.h: fix incorrect API comment

 Doc update.
 source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>

* jc/t6011-mv-ro-fix (2025-05-07) 1 commit
  (merged to 'next' on 2025-05-09 at 6168793ae5)
 + t6011: fix misconversion from perl to sed

 Test fix.
 
 source: <xmqq8qn9fj8o.fsf@gitster.g>

* js/ci-buildsystems-cleanup (2025-05-05) 3 commits
  (merged to 'next' on 2025-05-06 at b2038f9a91)
 + 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.
 source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>

* kh/docfixes (2025-05-05) 2 commits
  (merged to 'next' on 2025-05-06 at 6cd8af0fa1)
 + doc: branch: fix inline-verbatim
 + doc: reflog: fix `drop` subheading

 Docfixes.
 source: <cover.1746299135.git.code@khaugsbakk.name>

* kj/glob-path-with-special-char (2025-05-05) 1 commit
  (merged to 'next' on 2025-05-06 at 629a3ecd64)
 + dir.c: literal match with wildcard in pathspec should still glob

 "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname,
 also existed on the working tree, which has been corrected.
 source: <20250503060736.587286-1-jayatheerthkulkarni2005@gmail.com>

* ps/ci-test-aggreg-fix-for-meson (2025-05-05) 1 commit
  (merged to 'next' on 2025-05-06 at 40306a837b)
 + ci: fix aggregation of test results with Meson

 Test result aggregation did not work in Meson based CI jobs.
 source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>

* ps/maintenance-missing-tasks (2025-05-07) 6 commits
  (merged to 'next' on 2025-05-08 at 2da78b0ef1)
 + builtin/maintenance: introduce "rerere-gc" task
 + builtin/gc: move rerere garbage collection into separate function
 + builtin/maintenance: introduce "worktree-prune" task
 + builtin/gc: move pruning of worktrees into a separate function
 + builtin/gc: remove global variables where it is trivial to do
 + builtin/gc: fix indentation of `cmd_gc()` parameters

 Make repository clean-up tasks "gc" can do available to "git
 maintenance" front-end.
 
 source: <20250507-pks-maintenance-missing-tasks-v5-0-aa5fdfb82891@pks.im>

* tb/macos-false-but-the-compiler-does-not-know-it-fix (2025-05-07) 1 commit
  (merged to 'next' on 2025-05-09 at d8fb9874ef)
 + intialize false_but_the_compiler_does_not_know_it_

 Workaround for older macOS ld.
 
 source: <20250506120644.186968-1-tboegi@web.de>

-------------------------------------------------- [New Topics]

* ps/ci-gitlab-enable-msvc-meson-job (2025-05-13) 1 commit
 - gitlab-ci: always run MSVC-based Meson job

 CI settings at GitLab has been updated to run MSVC based Meson job
 automatically (as opposed to be done only upon manual request).

 Will merge to 'next'.
 source: <20250428-pks-gitlab-ci-execute-win-meson-v1-1-f68683552b9e@pks.im>

* ag/send-email-hostname-f (2025-05-13) 1 commit
 - send-email: try to get fqdn by running hostname -f on Linux and macOS

 Teach "git send-email" to also consult `hostname -f` for mail
 domain to compute the identity given to SMTP servers.

 Will merge to 'next'.
 source: <PN3PR01MB959701F40F805351472EA4CCB897A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>

* kn/fetch-push-bulk-ref-update (2025-05-15) 4 commits
 - receive-pack: use batched reference updates
 - send-pack: fix memory leak around duplicate refs
 - fetch: use batched reference updates
 - refs: add function to translate errors to strings

 "git push" and "git fetch" are taught to update refs in batches to
 gain performance.

 Expecting a reroll.
 cf. <CAOLa=ZQHR5Xt3yP4FM4gAbFVRM-dXVPpQHS0tObeoz45T89X7w@mail.gmail.com>
 source: <20250515-501-update-git-fetch-1-to-use-partial-transactions-v2-0-80cbaaa55d2e@gmail.com>

* en/replay-wo-the-repository (2025-05-14) 1 commit
 - replay: replace the_repository with repo parameter passed to cmd_replay ()

 The dependency on the_repository variable has been reduced from the
 code paths in "git replay".

 Will merge to 'next'.
 source: <pull.1921.git.1747254806067.gitgitgadget@gmail.com>

* js/misc-defensive (2025-05-15) 14 commits
 - shallow: handle missing shallow commits gracefully
 - test-tool repository: check return value of `lookup_commit()`
 - submodule: check return value of `submodule_from_path()`
 - inherit_tracking(): defensive programming
 - describe: defensive programming
 - fetch: defensive programming
 - push: defensive programming
 - stash: defensive programming
 - stash: defensive programming
 - verify_commit_graph(): defensive programming
 - unparse_commit(): defensive programming
 - fetch-pack: defensive programming
 - get_parent(): defensive programming
 - revision: defensive programming

 Assorted changes that please CodeQL.

 Comments?
 source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>

* js/misc-fixes (2025-05-15) 11 commits
 - sequencer: stop pretending that an assignment is a condition
 - bundle-uri: avoid using undefined output of `sscanf()`
 - commit-graph: avoid using stale stack addresses
 - trace2: avoid "futile conditional"
 - Avoid redundant conditions
 - fetch: avoid unnecessary work when there is no current branch
 - has_dir_name(): make code more obvious
 - upload-pack: rename `enum` to reflect the operation
 - commit-graph: avoid malloc'ing a local variable
 - fetch: carefully clear local variable's address after use
 - commit: simplify code

 Assorted fixes for issues found with CodeQL.

 Will merge to 'next'?
 source: <pull.1891.git.1747314709.gitgitgadget@gmail.com>

* ly/commit-graph-fill-oids-leakfix (2025-05-15) 1 commit
 - commit-graph: fix memory leak when `fill_oids_from_packs()` fails

 Leakfix.

 Will merge to 'next'.
 source: <pull.1957.v3.git.git.1746779435536.gitgitgadget@gmail.com>

* ly/mailinfo-decode-header-leakfix (2025-05-15) 1 commit
 - mailinfo: fix pointential memory leak if `decode_header` failed

 Leakfix.

 Will merge to 'next'.
 source: <pull.1956.v4.git.git.1747104551204.gitgitgadget@gmail.com>

* ly/sequencer-rearrange-leakfix (2025-05-15) 1 commit
 - sequencer: fix memory leak if `todo_list_rearrange_squash()` failed

 Leakfix.

 Will merge to 'next'.
 source: <pull.1965.git.git.1747230808770.gitgitgadget@gmail.com>

* en/sequencer-comment-messages (2025-05-16) 1 commit
 - sequencer: make it clearer that commit descriptions are just comments

 Prefix '#' to the commit title in the "rebase -i" todo file, just
 like a merge commit being replayed.

 Will merge to 'next'?
 source: <pull.1923.v2.git.1747412786573.gitgitgadget@gmail.com>

* jk/no-funny-object-types (2025-05-16) 13 commits
 - object-file: drop support for writing objects with unknown types
 - hash-object: handle --literally with OPT_NEGBIT
 - hash-object: merge HASH_* and INDEX_* flags
 - hash-object: stop allowing unknown types
 - t: add lib-loose.sh
 - t/helper: add zlib test-tool
 - oid_object_info(): drop type_name strbuf
 - fsck: stop using object_info->type_name strbuf
 - oid_object_info_convert(): stop using string for object type
 - cat-file: use type enum instead of buffer for -t option
 - object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag
 - cat-file: make --allow-unknown-type a noop
 - object-file.h: fix typo in variable declaration

 Support to create a loose object file with unknown object type has
 been dropped.

 Will merge to 'next'.
 source: <20250516044916.GA21985@coredump.intra.peff.net>

* kj/my-first-contribution-updates (2025-05-16) 4 commits
 - cmd_psuh: Prefer repo_config for config lookup
 - Docs: Add cmd_psuh with repo and UNUSED removal
 - Docs: Correct cmd_psuh and Explain UNUSED macro
 - Remove unused git-mentoring mailing list

 Doc updates.

 source: <20250416061450.25695-1-jayatheerthkulkarni2005@gmail.com>

* kj/renamed-submodule (2025-05-16) 1 commit
 - submodule: prevent overwriting .gitmodules entry on path reuse

 The case where a new submodule takes a path where used to be a
 completely different subproject is now dealt a bit better than
 before.

 Comments?
 source: <20250516174934.45008-1-jayatheerthkulkarni2005@gmail.com>

* lo/json-writer-docs (2025-05-16) 2 commits
 - json-writer: describe the usage of jw_* functions
 - json-writer: add docstrings to jw_* functions

 In-code docstring updates.

 Will merge to 'next'.
 source: <20250516010159.27042-1-lucasseikioshiro@gmail.com>

* ps/pack-check-pack-first (2025-05-16) 1 commit
 - packfile: avoid access(3p) calls for missing packs

 The packfile registration code used to check ".pack" file the last
 after checking ".keep" and other files; the ordering is reversed.

 source: <20250516-pks-pack-avoid-stats-on-missing-v1-1-e2ef4d8798a3@pks.im>

* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
 - contrib: update thunderbird-patch-inline

 Update bitrotten instruction for sending patches via Thunderbird
 (in contrib/).

 Comments?
 source: <20250516135540.218937-1-phillip.wood123@gmail.com>

-------------------------------------------------- [Cooking]

* bc/make-avoid-unneeded-rebuild-with-compdb-dir (2025-05-09) 1 commit
  (merged to 'next' on 2025-05-13 at c36a91ba22)
 + Makefile: avoid constant rebuilds with compilation database

 Build performance fix.

 Will merge to 'master'.
 source: <20250509211202.3910761-1-sandals@crustytoothpaste.net>

* bc/stash-export-import (2025-05-08) 4 commits
 - builtin/stash: provide a way to import stashes from a ref
 - builtin/stash: provide a way to export stashes to a ref
 - builtin/stash: factor out revision parsing into a function
 - object-name: make get_oid quietly return an error

 An interchange format for stash entries is defined, and subcommand
 of "git stash" to import/export has been added.

 Comments?
 source: <20250508234458.3665894-1-sandals@crustytoothpaste.net>

* ds/sparse-apply-add-p (2025-05-16) 4 commits
 - p2000: add performance test for patch-mode commands
 - reset: integrate sparse index with --patch
 - git add: make -p/-i aware of sparse index
 - apply: integrate with the sparse index

 "git apply" and "git add -i/-p" code paths no longer unnecessarily
 expand sparse-index while working.

 Will merge to 'next'?
 Kicked out of next and then is about to come back.
 source: <pull.1914.v2.git.1747407330.gitgitgadget@gmail.com>

* en/merge-tree-check (2025-05-14) 2 commits
 - merge-tree: add a new --dry-run flag
 - merge-ort: add a new mergeability_only option

 "git merge-tree" learned an option to see if it resolves cleanly
 without actually creating a result.

 Will merge to 'next'.
 source: <pull.1920.v3.git.1747182287.gitgitgadget@gmail.com>

* jk/oidmap-cleanup (2025-05-12) 3 commits
  (merged to 'next' on 2025-05-13 at 93bc7b6ab1)
 + raw_object_store: drop extra pointer to replace_map
 + oidmap: add size function
 + oidmap: rename oidmap_free() to oidmap_clear()

 Code cleanup.

 Will merge to 'master'.
 source: <20250512185006.GA1275914@coredump.intra.peff.net>

* lm/add-p-context (2025-05-12) 4 commits
 - add-patch: add diff.context command line overrides
 - add-patch: respect diff.context configuration
 - test: refactor to use "test_config"
 - test: refactor to use "test_grep"

 "git add/etc -p" now honors diff.context configuration variable,
 and learns to honor -U<n> option.

 Comments?
 source: <pull.1915.v2.git.1746884789.gitgitgadget@gmail.com>

* ly/am-split-stgit-leakfix (2025-05-12) 1 commit
  (merged to 'next' on 2025-05-13 at 6966c2adc1)
 + builtin/am: fix memory leak in `split_mail_stgit_series`

 Leakfix.

 Will merge to 'master'.
 source: <pull.1961.git.git.1747015647505.gitgitgadget@gmail.com>

* ly/pack-bitmap-load-leakfix (2025-05-12) 1 commit
  (merged to 'next' on 2025-05-14 at 0be31eac6b)
 + pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed

 Leakfix.

 Will merge to 'master'.
 source: <pull.1962.git.git.1747052530271.gitgitgadget@gmail.com>

* ly/reftable-writer-leakfix (2025-05-12) 2 commits
  (merged to 'next' on 2025-05-13 at 57c58b60e8)
 + reftable/writer: fix memory leak when `writer_index_hash()` fails
 + reftable/writer: fix memory leak when `padded_write()` fails

 Leakfix.

 Will merge to 'master'.
 source: <pull.1958.v3.git.git.1747054145.gitgitgadget@gmail.com>

* ps/contrib-sweep (2025-05-16) 12 commits
 - Revert "contrib: remove "thunderbird-patch-inline""
 - contrib: remove some scripts in "stats" directory
 - contrib: remove "git-new-workdir"
 - contrib: remove "emacs" directory
 - contrib: remove "git-resurrect.sh"
 - contrib: remove "persistent-https" remote helper
 - contrib: remove "mw-to-git"
 - contrib: remove "hooks" directory
 - contrib: remove "thunderbird-patch-inline"
 - contrib: remove remote-helper stubs
 - contrib: remove "examples" directory
 - contrib: remove "remotes2config.sh"

 Remove bunch of stuff from contrib/ hierarchy.

 I've reverted the thunderbird thing for now.
 source: <20250512-pks-contrib-spring-cleanup-v3-0-32e151b0bfb0@pks.im>

* ps/reftable-read-block-perffix (2025-05-12) 1 commit
  (merged to 'next' on 2025-05-13 at 3c150c7422)
 + reftable: fix perf regression when reading blocks of unwanted type

 Performance regression in not-yet-released code has been corrected.

 Will merge to 'master'.
 source: <20250512-pks-reftable-perf-fix-v1-1-002cab9fdb08@pks.im>

* pw/sequencer-reflog-use-after-free (2025-05-09) 2 commits
  (merged to 'next' on 2025-05-12 at e7b8721456)
 + sequencer: rework reflog message handling
 + sequencer: move reflog message functions

 Use-after-free fix in the sequencer.

 Will merge to 'master'.
 source: <pull.1919.git.1746807747.gitgitgadget@gmail.com>

* rc/t1001-test-path-is-file (2025-05-12) 1 commit
  (merged to 'next' on 2025-05-13 at bc67be09c3)
 + t1001: replace 'test -f' with 'test_path_is_file'

 Test update.

 Will merge to 'master'.
 source: <20250510230909.65519-1-rodrigorsdc@gmail.com>

* rj/build-tweaks-part2 (2025-05-13) 5 commits
 - configure.ac: upgrade to a compilation check for sysinfo
 - meson.build: correct setting of GIT_EXEC_PATH
 - meson: correct path to system config/attribute files
 - meson: correct install location of YAML.pm
 - meson.build: quote the GITWEBDIR build configuration

 Updates to meson-based build procedure.

 Expecting a reroll?
 cf. <a163d515-2e71-4a42-b843-26d5d2ccdc59@ramsayjones.plus.com>
 source: <20250513191739.1513460-1-ramsay@ramsayjones.plus.com>

* ag/doc-send-email (2025-05-08) 3 commits
  (merged to 'next' on 2025-05-13 at 6eb746c6c2)
 + docs: add credential helper for outlook and gmail in OAuth list of helpers
 + docs: improve send-email documentation
 + send-mail: improve checks for valid_fqdn

 The `send-email` documentation has been updated with OAuth2.0
 related examples.

 Will merge to 'master'.
 source: <PN0PR01MB95882173451A6A7C28AD7BE7B88BA@PN0PR01MB9588.INDPRD01.PROD.OUTLOOK.COM>

* ps/object-store (2025-05-14) 18 commits
 - odb: rename `read_object_with_reference()`
 - odb: rename `pretend_object_file()`
 - odb: rename `has_object()`
 - odb: rename `repo_read_object_file()`
 - odb: rename `oid_object_info()`
 - odb: trivial refactorings to get rid of `the_repository`
 - odb: get rid of `the_repository` when handling submodule alternates
 - odb: get rid of `the_repository` when handling the primary alternate
 - odb: get rid of `the_repository` in `for_each()` functions
 - odb: get rid of `the_repository` when handling alternates
 - odb: get rid of `the_repository` in `odb_mkstemp()`
 - odb: get rid of `the_repository` in `assert_oid_type()`
 - odb: get rid of `the_repository` in `find_odb()`
 - odb: introduce parent pointers
 - object-store: rename files to "odb.{c,h}"
 - object-store: rename `object_directory` to `odb_alternate`
 - object-store: rename `raw_object_store` to `object_database`
 - Merge branch 'ps/object-store-cleanup' into ps/object-store

 Code clean-up around object access API.

 Comments?
 source: <20250514-pks-object-store-wo-the-repository-v3-0-47df1d4ead22@pks.im>

* sj/use-mmap-to-check-packed-refs (2025-05-14) 3 commits
 - packed-backend: mmap large "packed-refs" file during fsck
 - packed-backend: extract snapshot allocation in `load_contents`
 - packed-backend: fsck should warn when "packed-refs" file is empty

 The code path to access the "packed-refs" file while "fsck" is
 taught to mmap the file, instead of reading the whole file in the
 memory.

 Will merge to 'next'?
 source: <aCS7O8tNekg_u9Wp@ArchLinux>

* js/ci-build-win-in-release-mode (2025-05-05) 1 commit
 - ci(win+Meson): build in Release mode

 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>

* cc/promisor-remote-capability (2025-04-29) 3 commits
 - promisor-remote: allow a client to check fields
 - promisor-remote: allow a server to advertise more fields
 - promisor-remote: refactor to get rid of 'struct strvec'

 Expecting a reroll.
 cf. <CAP8UFD2LzijGsU3-aO-JBPtEfT+UtR_X_mqcdVigoOfdVAg1uA@mail.gmail.com>
 source: <20250429145243.992252-1-christian.couder@gmail.com>

* ds/scalar-no-maintenance (2025-05-14) 5 commits
 - scalar reconfigure: improve --maintenance docs
  (merged to 'next' on 2025-05-08 at 1006cdd399)
 + scalar reconfigure: add --maintenance=<mode> 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.

 Will merge to 'next' and then to 'master'.
 source: <pull.1913.v3.git.1746582637.gitgitgadget@gmail.com>

* jc/doc-synopsis-option-markup (2025-05-12) 4 commits
 - git-var doc: fix usage of $ENV_VAR vs ENV_VAR
 - git-verify-* doc: update mark-up of synopsis option descriptions
 - git-{var,write-tree} docs: update mark-up of synopsis option descriptions
 - git-daemon doc: update mark-up of synopsis option descriptions

 Doc mark-up fixes.

 Will merge to 'next'?
 source: <20250510123346.20927-1-jn.avila@free.fr>

* jc/you-still-use-whatchanged (2025-05-12) 6 commits
 - whatschanged: list it in BreakingChanges document
 - whatchanged: remove when built with WITH_BREAKING_CHANGES
 - whatchanged: require --i-still-use-this
 - tests: prepare for a world without whatchanged
 - doc: prepare for a world without whatchanged
 - you-still-use-that??: help deprecating commands for removal

 "git whatchanged" that is longer to type than "git log --raw"
 which is its modern rough equivalent has outlived its usefulness
 more than 10 years ago.  Plan to deprecate and remove it.

 Will merge to 'next'?
 source: <20250512190311.1451556-1-gitster@pobox.com>

* cc/fast-import-export-signature-names (2025-04-24) 1 commit
 . fast-(import|export): improve on the signature algorithm name

 Clean up the way how signature on commit objects are exported to
 and imported from fast-import stream.

 Expecting a reroll.
 cf. <aAq1nvcPRlIPal5l@tapette.crustytoothpaste.net>
 cf. https://github.com/git/git/actions/runs/14671270673/job/41178138711
 source: <20250424203904.909777-1-christian.couder@gmail.com>

* sj/string-list-typefix (2025-04-22) 5 commits
 - u-string-list: move "remove duplicates" test to "u-string-list.c"
 - u-string-list: move "filter string" test to "u-string-list.c"
 - u-string-list: move "test_split_in_place" to "u-string-list.c"
 - u-string-list: move "test_split" into "u-string-list.c"
 - string-list: fix sign compare warnings

 Code and test clean-up around string-list API.

 Expecting a reroll.
 cf. <aA8vSPKdznjzBf6W@pks.im>
 source: <aAetW0dan8S3Fljq@ArchLinux>

* tb/midx-avoid-cruft-packs (2025-04-15) 9 commits
 - repack: exclude cruft pack(s) from the MIDX where possible
 - pack-objects: introduce '--stdin-packs=follow'
 - pack-objects: swap 'show_{object,commit}_pack_hint'
 - pack-objects: fix typo in 'show_object_pack_hint()'
 - pack-objects: perform name-hash traversal for unpacked objects
 - pack-objects: declare 'rev_info' for '--stdin-packs' earlier
 - pack-objects: factor out handling '--stdin-packs'
 - pack-objects: limit scope in 'add_object_entry_from_pack()'
 - pack-objects: use standard option incompatibility functions

 "pack-objects" has been taught to avoid pointing into objects in
 cruft packs from midx.

 Expecting a (hopefully small and final) reroll?
 cf.<CABPp-BEukTWwsuC7MMR8D5_UAhyw-LgT=DsPKAWeR_ZmVVhjzQ@mail.gmail.com>
 source: <cover.1744757204.git.me@ttaylorr.com>

* tb/pack-bitmap-lookup-tables (2025-04-17) 4 commits
 - t/perf/lib-bitmap.sh: avoid test_perf during setup
 - t/perf: avoid testing bitmaps without lookup table
 - p5312: removed duplicate performance test script
 - pack-bitmap: write lookup table extension by default

 Enable lookup tables extension in pack bitmap (and midx bitmap) by
 default.

 Comments?
 source: <cover.1744924321.git.me@ttaylorr.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
 - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
 - rebase -r: do create merge commit after empty resolution

 A few fixes around "git status" while "git rebase" is running,
 plus a corner case bug fix for "git rebase -r".

 Expecting a (small and hopefully final) clarifying reroll.
 cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>
 cf. <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>
 source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>

* md/userdiff-bash-shell-function (2025-05-16) 1 commit
 - userdiff: extend Bash pattern to cover more shell function forms

 The userdiff pattern for shell scripts has been updated to cope
 with more bash-isms.

 Will merge to 'next'.
 cf. <a72235c1-625a-4b90-8111-629b5a6ee7c2@kdbg.org>
 source: <20250516144515.49514-2-dhar61595@gmail.com>

* sc/bundle-uri-use-all-refs-in-bundle (2025-04-25) 2 commits
  (merged to 'next' on 2025-05-13 at df93f99c2b)
 + bundle-uri: add test for bundle-uri clones with tags
 + bundle-uri: copy all bundle references ino the refs/bundle space

 Bundle-URI feature did not use refs recorded in the bundle other
 than normal branches as anchoring points to optimize the follow-up
 fetch during "git clone"; now it is told to utilize all.

 Will merge to 'master'.
 source: <pull.1897.v7.git.git.1745609589.gitgitgadget@gmail.com>

* ds/path-walk-2 (2025-05-16) 13 commits
 - pack-objects: allow --shallow and --path-walk
 - path-walk: add new 'edge_aggressive' option
 - pack-objects: thread the path-based compression
 - pack-objects: refactor path-walk delta phase
 - scalar: enable path-walk during push via config
 - pack-objects: enable --path-walk via config
 - repack: add --path-walk option
 - t5538: add tests to confirm deltas in shallow pushes
 - pack-objects: introduce GIT_TEST_PACK_PATH_WALK
 - p5313: add performance tests for --path-walk
 - pack-objects: update usage to match docs
 - pack-objects: add --path-walk option
 - pack-objects: extract should_attempt_deltas()

 "git pack-objects" learns to find delta bases from blobs at the
 same path, using the --path-walk API.

 Comments?
 source: <pull.1819.v3.git.1747419124.gitgitgadget@gmail.com>

* ib/diff-S-G-with-longhand (2025-02-12) 10 commits
 - diff: docs: Use --patch-{grep,modifies} over -G/-S
 - diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}
 - diff: test: Use --patch-{grep,modifies} over -G/-S
 - completion: Support --patch-{grep,modifies}
 - diff: --patch-{grep,modifies} arg names for -G and -S
 - docs: gitdiffcore: -G and -S: Use regex/string placeholders
 - diff: short help: Add -G and --pickaxe-grep
 - diff: short help: Correct -S description
 - diff: -G description: Correct copy/paste error
 - t/t4209-log-pickaxe: Naming typo: -G takes a regex

 The commands in the "diff" family learned longhands for "-S" and
 "-G" options.

 Expecting a reroll.
 source: <20250212032657.1807939-1-illia.bobyr@gmail.com>

-------------------------------------------------- [Discarded]

* ej/cat-file-remote-object-info (2025-02-24) 8 commits
 . cat-file: add remote-object-info to batch-command
 . transport: add client support for object-info
 . serve: advertise object-info feature
 . fetch-pack: move fetch initialization
 . fetch-pack: refactor packet writing
 . t1006: split test utility functions into new "lib-cat-file.sh"
 . cat-file: add declaration of variable i inside its for loop
 . git-compat-util: add strtoul_ul() with error handling

 "git cat-file --batch" and friends can optionally ask a remote
 server about objects it does not have.

 Has been in "Expecting a reroll" state for too long,
 and causes conflicts with the ps/object-store topic.
 cf. <CAN2LT1Cc-UaUpabqcGascicR3nk6ZdFythamKje33Orhy5WoNA@mail.gmail.com>
 source: <20250221190451.12536-1-eric.peijian@gmail.com>