To: git@vger.kernel.org
-Subject: What's cooking in git.git (May 2025, #04; Mon, 12)
-X-master-at: 38af977b81bbf8ce8c0004d3f4046a823ecb30a1
-X-next-at: 889b7c5bd859a31843b9239d3c69e5b8f543ef47
+Subject: What's cooking in git.git (May 2025, #05; Fri, 16)
+X-master-at: cb96e1697ad6e54d11fc920c95f82977f8e438f8
+X-next-at: a128411c76f198ba255c81c140d7ab23f1cc5b8d
Bcc: lwn@lwn.net, gitster@pobox.com
-What's cooking in git.git (May 2025, #04; Mon, 12)
+What's cooking in git.git (May 2025, #05; Fri, 16)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
--------------------------------------------------
[Graduated to 'master']
-* ag/send-email-outlook (2025-04-29) 2 commits
- (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
+* 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
- Update send-email to work better with Outlook's smtp server.
+ 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: <PN3PR01MB95973F4B26A8CE2BF17A3AB1B8842@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
- source: <PN3PR01MB9597DA8661D1AFDF4C927A11B8812@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
+ source: <20250506010946.212068-1-collin.funk1@gmail.com>
-* ds/fix-thin-fix (2025-04-28) 3 commits
- (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
+* 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
- "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.
+ Meson-based build framework update.
- source: <pull.1906.v2.git.1745871885.gitgitgadget@gmail.com>
+ source: <a9d431944b6d94e0eb25535c061fc226a7fefa9e.1746692662.git.congdanhqx@gmail.com>
-* en/hashmap-clear-fix (2025-04-29) 1 commit
- (merged to 'next' on 2025-04-30 at b0cdbeb28e)
- + hashmap: ensure hashmaps are reusable after hashmap_clear()
+* 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
- hashmap API clean-up to ensure hashmap_clear() leaves a cleared map
- in a reusable state.
-
- source: <pull.1911.git.1745941663160.gitgitgadget@gmail.com>
+ Doc update.
+ source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>
-* jc/ci-skip-unavailable-external-software (2025-04-25) 2 commits
- (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
+* 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
- Further refinement on CI messages when an optional external
- software is unavailable (e.g. due to third-party service outage).
+ Test fix.
- source: <20250425153827.147585-1-gitster@pobox.com>
+ source: <xmqq8qn9fj8o.fsf@gitster.g>
-* js/diff-codeql-false-positive-workaround (2025-04-29) 1 commit
- (merged to 'next' on 2025-05-01 at a840276032)
- + diff: check range before dereferencing an array element
+* 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
- Work around false positive given by CodeQL.
-
- source: <pull.1887.v3.git.1745926679028.gitgitgadget@gmail.com>
+ Code clean-up around stale CI elements and building with Visual Studio.
+ source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>
-* ng/xdiff-truly-minimal (2025-04-29) 1 commit
- (merged to 'next' on 2025-05-05 at 62e0c33153)
- + xdiff: disable cleanup_records heuristic with --minimal
+* 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
- "git diff --minimal" used to give non-minimal output when its
- optimization kicked in, which has been disabled.
-
- source: <20250429140949.2634935-1-n.glodny@campus.lmu.de>
+ Docfixes.
+ source: <cover.1746299135.git.code@khaugsbakk.name>
-* ps/meson-bin-sh (2025-04-25) 2 commits
- (merged to 'next' on 2025-05-05 at 546cdf31bf)
- + meson: prefer shell at "/bin/sh"
- + meson: report detected runtime executable paths
+* 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
- Meson-based build framework update.
-
- source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
+ "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/mv-contradiction-fix (2025-04-30) 2 commits
- (merged to 'next' on 2025-05-01 at 5c27b05f45)
- + builtin/mv: convert assert(3p) into `BUG()`
- + builtin/mv: bail out when trying to move child and its parent
+* 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
- "git mv a a/b dst" would ask to move the directory 'a' itself, as
- well as its contents, in a single destination directory, which is
- a contradicting request that is impossible to satisfy. This case is
- now detected and the command errors out.
+ Make repository clean-up tasks "gc" can do available to "git
+ maintenance" front-end.
- source: <20250430-pks-mv-parent-child-conflict-v1-0-11a87c55ffb9@pks.im>
-
-
-* ps/object-store-cleanup (2025-04-29) 8 commits
- (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
- (this branch is used by ps/object-store.)
-
- Further code clean-up in the object-store layer.
+ 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: <20250429-pks-object-store-cleanups-v3-0-42902bad09a1@pks.im>
+ 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
- - Makefile: avoid constant rebuilds with compilation database
+ (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>
- 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-08) 3 commits
- (merged to 'next' on 2025-05-09 at 11ce4306b9)
- + p2000: add performance test for 'git add -p'
- + git add: make -p/-i aware of sparse index
- + apply: integrate with the sparse index
+* 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
- source: <pull.1914.git.1746579320.gitgitgadget@gmail.com>
+ "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-12) 2 commits
- - merge-tree: add a new --mergeability-only flag
+* 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
- source: <pull.1920.git.1746914561.gitgitgadget@gmail.com>
+ "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
- - raw_object_store: drop extra pointer to replace_map
- - oidmap: add size function
- - oidmap: rename oidmap_free() to oidmap_clear()
+ (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>
- 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
- - builtin/am: fix memory leak in `split_mail_stgit_series`
+ (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
- - pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed
+ (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
- - reftable/writer: fix memory leak when `writer_index_hash()` fails
- - reftable/writer: fix memory leak when `padded_write()` fails
+ (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-12) 11 commits
+* 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 "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
- - reftable: fix perf regression when reading blocks of unwanted type
+ (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>
+ 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
- - t1001: replace 'test -f' with 'test_path_is_file'
+ (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-08) 5 commits
+* 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
- source: <20250508164443.1506440-1-ramsay@ramsayjones.plus.com>
+ 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>
---------------------------------------------------
-[Cooking]
* ag/doc-send-email (2025-05-08) 3 commits
- - 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
+ (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 'next'.
- source: <PN0PR01MB95882173451A6A7C28AD7BE7B88BA@PN0PR01MB9588.INDPRD01.PROD.OUTLOOK.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.
-
Will merge to 'master'.
- source: <xmqq8qn9fj8o.fsf@gitster.g>
+ source: <PN0PR01MB95882173451A6A7C28AD7BE7B88BA@PN0PR01MB9588.INDPRD01.PROD.OUTLOOK.COM>
-* ps/object-store (2025-05-09) 18 commits
+* ps/object-store (2025-05-14) 18 commits
- odb: rename `read_object_with_reference()`
- odb: rename `pretend_object_file()`
- odb: rename `has_object()`
- Merge branch 'ps/object-store-cleanup' into ps/object-store
Code clean-up around object access API.
- source: <20250509-pks-object-store-wo-the-repository-v2-0-103f59bf8e28@pks.im>
+
+ Comments?
+ source: <20250514-pks-object-store-wo-the-repository-v3-0-47df1d4ead22@pks.im>
-* sj/use-mmap-to-check-packed-refs (2025-05-07) 4 commits
+* sj/use-mmap-to-check-packed-refs (2025-05-14) 3 commits
- packed-backend: mmap large "packed-refs" file during fsck
- - packed-backend: extract munmap operation for `MMAP_TEMPORARY`
- packed-backend: extract snapshot allocation in `load_contents`
- - packed-backend: fsck should allow an empty "packed-refs" file
+ - 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.
- Expecting a reroll.
- cf. <20250508200802.GC18229@coredump.intra.peff.net>
- source: <aBtzn4nwLsI9p5Cp@ArchLinux>
-
-
-* 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.
-
- Will merge to 'master'.
- source: <20250506120644.186968-1-tboegi@web.de>
-
-
-* 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.
-
- Will merge to 'master'.
- source: <20250506010946.212068-1-collin.funk1@gmail.com>
+ Will merge to 'next'?
+ source: <aCS7O8tNekg_u9Wp@ArchLinux>
* js/ci-build-win-in-release-mode (2025-05-05) 1 commit
source: <pull.1908.v2.git.1746282346370.gitgitgadget@gmail.com>
-* 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.
-
- Will merge to 'master'.
- 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.
-
- Will merge to 'master'.
- 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.
-
- Will merge to 'master'.
- 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.
-
- Will merge to 'master'.
- source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>
-
-
* 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
source: <20250429145243.992252-1-christian.couder@gmail.com>
-* ds/scalar-no-maintenance (2025-05-07) 4 commits
+* 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
under "scalar"'s control are taught an option not to enable the
scheduled maintenance on it.
- Will merge to 'master'.
+ Will merge to 'next' and then to 'master'.
source: <pull.1913.v3.git.1746582637.gitgitgadget@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.
-
- Will merge to 'master'.
- source: <pull.1912.v2.git.1746213551473.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
source: <20250512190311.1451556-1-gitster@pobox.com>
-* 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.
-
- Will merge to 'master'.
- source: <20250507-pks-maintenance-missing-tasks-v5-0-aa5fdfb82891@pks.im>
-
-
* cc/fast-import-export-signature-names (2025-04-24) 1 commit
. fast-(import|export): improve on the signature algorithm name
source: <20250424203904.909777-1-christian.couder@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.
-
- Will merge to 'master'.
- source: <a9d431944b6d94e0eb25535c061fc226a7fefa9e.1746692662.git.congdanhqx@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"
"pack-objects" has been taught to avoid pointing into objects in
cruft packs from midx.
- Comments?
+ Expecting a (hopefully small and final) reroll?
+ cf.<CABPp-BEukTWwsuC7MMR8D5_UAhyw-LgT=DsPKAWeR_ZmVVhjzQ@mail.gmail.com>
source: <cover.1744757204.git.me@ttaylorr.com>
source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
-* md/userdiff-bash-shell-function (2025-04-01) 1 commit
+* 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.
- Comments?
- source: <20250330134018.9662-2-dhar61595@gmail.com>
+ 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
- - bundle-uri: add test for bundle-uri clones with tags
- - bundle-uri: copy all bundle references ino the refs/bundle space
+ (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 'next'.
- source: <pull.1897.v4.git.git.1745587067.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <pull.1897.v7.git.git.1745609589.gitgitgadget@gmail.com>
-* ds/path-walk-2 (2025-03-25) 13 commits
+* 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
"git pack-objects" learns to find delta bases from blobs at the
same path, using the --path-walk API.
- Waiting for review responses.
- cf. <aBVLC57bMJKjygyi@nand.local>
- cf. <aBq48Dog53bn5bJb@nand.local>
- source: <pull.1819.v2.git.1742829769.gitgitgadget@gmail.com>
+ Comments?
+ source: <pull.1819.v3.git.1747419124.gitgitgadget@gmail.com>
* ib/diff-S-G-with-longhand (2025-02-12) 10 commits
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
+ . 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.
- Expecting a reroll.
+ 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>
projects / thirdparty / git.git / commitdiff
