What's cooking in git.git (Oct 2025, #12; Thu, 30)
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']
* ey/commit-graph-changed-paths-config (2025-10-17) 1 commit (merged to 'next' on 2025-10-23 at 48fd936ff1)
+ commit-graph: add new config for changed-paths & recommend it in scalar
A new configuration variable commitGraph.changedPaths allows to turn "--changed-paths" on by default for "git commit-graph".
source: <[email protected]>
* kf/log-shortlog-completion-fix (2025-10-20) 1 commit (merged to 'next' on 2025-10-24 at 2300659a0a)
+ completion: complete some 'git log' options
"git shortlog" knows "--committer" and "--author" options, which the command line completion (in contrib/) did not handle well, which has been corrected.
source: <[email protected]>
* ly/diff-name-only-with-diff-from-content (2025-10-19) 3 commits
(merged to 'next' on 2025-10-24 at 237c19e4e6)
+ diff: stop output garbled message in dry run mode
+ Merge branch 'jc/diff-from-contents-fix' into ly/diff-name-only-with-diff-from-content
+ Merge branch 'jk/diff-from-contents-fix' into ly/diff-name-only-with-diff-from-content (this branch is used by jk/diff-patch-dry-run-cleanup.)
Regression fixes for a topic that has already been merged.
source: <[email protected]>
* ob/gpg-interface-cleanup (2025-10-23) 2 commits (merged to 'next' on 2025-10-24 at ce6d041635)
+ gpg-interface: do not use misdesigned strbuf_split*()
+ gpg-interface: do not use misdesigned strbuf_split*()
strbuf_split*() to split a string into multiple strbufs is often a wrong API to use. A few uses of it have been removed by simplifying the code.
cf. <CAP8UFD1fousSKKduFAaZrsV9REnOaRDOQYcqB+rTQ0Ys60OWGA@mail.gmail.com>
source: <[email protected]>
* ps/remove-packfile-store-get-packs (2025-10-09) 7 commits
(merged to 'next' on 2025-10-24 at e2f6fba6fe)
+ packfile: rename packfile_store_get_all_packs()
+ packfile: introduce macro to iterate through packs
+ packfile: drop packfile_store_get_packs()
+ builtin/grep: simplify how we preload packs
+ builtin/gc: convert to use packfile_store_get_all_packs()
+ object-name: convert to use packfile_store_get_all_packs()
+ Merge branch 'tb/incremental-midx-part-3.1' into ps/remove-packfile-store-get-packs (this branch is used by ps/packed-git-in-object-store.)
Two slightly different ways to get at "all the packfiles" in API has been cleaned up.
source: <[email protected]>
* ps/symlink-symref-deprecation (2025-10-14) 1 commit (merged to 'next' on 2025-10-24 at b37ca35280)
+ refs/files: deprecate writing symrefs as symbolic links
"Symlink symref" has been added to the list of things that will disappear at Git 3.0 boundary.
source: <20251015-pks-ref-files-deprecate-symbolic-links-v2-1-0529ba48db41@pks.im>
* rz/bisect-help-unknown (2025-10-22) 1 commit (merged to 'next' on 2025-10-24 at d0633ab14d)
+ bisect: fix handling of help and invalid subcommands
"git bisect" command did not react correctly to "git bisect help" and "git bisect unknown", which has been corrected.
source: <[email protected]>
* tb/incremental-midx-part-3.1 (2025-10-15) 50 commits
(merged to 'next' on 2025-10-22 at e78054f5a0)
+ builtin/repack.c: clean up unused #includes
+ repack: move write_cruft_pack() out of the builtin
+ repack: move write_filtered_pack() out of the builtin
+ repack: move pack_kept_objects to struct pack_objects_args
+ repack: move finish_pack_objects_cmd() out of the builtin
+ builtin/repack.c: pass write_pack_opts to finish_pack_objects_cmd()
+ repack: extract write_pack_opts_is_local()
+ repack: move find_pack_prefix() out of the builtin
+ builtin/repack.c: use write_pack_opts within write_cruft_pack()
+ builtin/repack.c: introduce struct write_pack_opts
+ repack: 'write_midx_included_packs' API from the builtin
+ builtin/repack.c: inline packs within write_midx_included_packs()
+ builtin/repack.c: pass repack_write_midx_opts to midx_included_packs
+ builtin/repack.c: inline remove_redundant_bitmaps()
+ builtin/repack.c: reorder remove_redundant_bitmaps()
+ repack: keep track of MIDX pack names using existing_packs
+ builtin/repack.c: use a string_list for 'midx_pack_names'
+ builtin/repack.c: extract opts struct for 'write_midx_included_packs()'
+ builtin/repack.c: remove ref snapshotting from builtin
+ repack: remove pack_geometry API from the builtin
+ builtin/repack.c: pass 'packdir' to pack_geometry_remove_redundant()
+ builtin/repack.c: pass 'pack_kept_objects' to pack_geometry_init()
+ builtin/repack.c: rename various pack_geometry functions
+ builtin/repack.c: remove "repack_promisor_objects()" from the builtin
+ builtin/repack.c: pass "packtmp" to repack_promisor_objects()
+ repack: remove 'generated_pack' API from the builtin
+ builtin/repack.c: provide pack locations to generated_pack_install()
+ builtin/repack.c: pass "packtmp" to generated_pack_populate()
+ builtin/repack.c: factor out "generated_pack_install"
+ builtin/repack.c: rename "struct generated_pack_data"
+ repack: remove 'existing_packs' API from the builtin
+ builtin/repack.c: avoid unnecessary numeric casts in existing_packs
+ builtin/repack.c: pass "packdir" when removing packs
+ repack: remove 'remove_redundant_pack' from the builtin
+ builtin/repack.c: rename many 'struct existing_packs' functions
+ repack: remove 'prepare_pack_objects' from the builtin
+ repack: move 'delta_base_offset' to 'struct pack_objects_args'
+ builtin/repack.c: pass both pack_objects args to repack_config
+ repack: introduce new compilation unit
+ builtin/repack.c: avoid using hash_to_hex() in pack geometry
+ builtin/repack.c: avoid "the_hash_algo" in finish_pack_objects_cmd()
+ builtin/repack: avoid "the_hash_algo" in repack_promisor_objects()
+ builtin/repack.c: avoid "the_hash_algo" in write_oid()
+ builtin/repack.c: avoid "the_hash_algo" when deleting packs
+ builtin/repack.c: avoid "the_repository" when repacking promisor objects
+ builtin/repack.c: avoid "the_repository" when removing packs
+ builtin/repack.c: avoid "the_repository" when taking a ref snapshot
+ builtin/repack.c: avoid "the_repository" in existing packs API
+ builtin/repack.c: avoid "the_repository" in cmd_repack()
+ Merge branch 'ps/packfile-store' into tb/incremental-midx-part-3.1
(this branch is used by kn/refs-optim-cleanup, ps/maintenance-geometric, ps/packed-git-in-object-store, ps/ref-peeled-tags and ps/remove-packfile-store-get-packs.)
Clean-up "git repack" machinery to prepare for incremental update of midx files.
source: <[email protected]>
--------------------------------------------------
[New Topics]
* kh/doc-checkout-markup-fix (2025-10-28) 1 commit (merged to 'next' on 2025-10-29 at f106c77f74)
+ doc: git-checkout: fix placeholder markup
Doc mark-up fix.
Will merge to 'master'.
source: <[email protected]>
* rz/t0450-bisect-doc-update (2025-10-28) 1 commit
- bisect: update usage and docs to match each other
The help text and manual page of "git bisect" command have been made consistent with each other.
Will merge to 'next'.
source: <[email protected]>
* bc/sha1-256-interop-02 (2025-10-29) 15 commits
- SQUASH??? downgrade build.rs syntax
- object-file-convert: always make sure object ID algo is valid
- rust: add a small wrapper around the hashfile code
- rust: add a new binary loose object map format
- rust: add functionality to hash an object
- rust: add a build.rs script for tests
- hash: expose hash context functions to Rust
- write-or-die: add an fsync component for the loose object map
- csum-file: define hashwrite's count as a uint32_t
- hash: add a function to look up hash algo structs
- rust: add a hash algorithm abstraction
- rust: add a ObjectID struct
- hash: use uint32_t for object_id algorithm
- conversion: don't crash when no destination algo
- repository: require Rust support for interoperability
The code to maintain mapping between object names in multiple hash functions is being added, written in Rust.
Expecting a reroll.
source: <[email protected]>
* jk/doc-backslash-in-exclude (2025-10-29) 1 commit (merged to 'next' on 2025-10-30 at 29790121d5)
+ doc: document backslash in gitignore patterns
The patterns used in the .gitignore files use backslash in the way documented for fnmatch(3); document as such to reduce confusion.
Will merge to 'master'.
source: <[email protected]>
* jk/test-delete-gpgsig-leakfix (2025-10-29) 1 commit (merged to 'next' on 2025-10-30 at 097810cb65)
+ test-tool: fix leak in delete-gpgsig command
Leakfix.
Will merge to 'master'.
source: <[email protected]>
--------------------------------------------------
[Cooking]
* qj/doc-my1stcontrib-email-verify (2025-10-27) 1 commit (merged to 'next' on 2025-10-29 at 33f961f37a)
+ MyFirstContribution: add note on confirming patches
The "MyFirstContribution" tutorial tells the reader how to send out their patches; the section gained a hint to verify the message reached the mailing list.
Will merge to 'master'.
source: <[email protected]>
* xr/ref-debug-remove-on-disk (2025-10-24) 1 commit (merged to 'next' on 2025-10-29 at 316e4afdbf)
+ refs: add missing remove_on_disk implementation for debug backend
The "debug" ref-backend was missing a method implementation, which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* ad/blame-diff-algorithm (2025-10-28) 1 commit
- blame: make diff algorithm configurable
"git blame" learns "--diff-algorithm=<algo>" option.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* cc/fast-import-export-i18n-cleanup (2025-10-30) 5 commits
- gpg-interface: mark a string for translation
- fast-import: mark strings for translation
- fast-export: mark strings for translation
- gpg-interface: use left shift to define GPG_VERIFY_*
- gpg-interface: simplify ssh fingerprint parsing
Messages from fast-import/export are now marked for i18n.
Will merge to 'next'?
source: <[email protected]>
* eb/t1016-hash-transition-fix (2025-10-28) 1 commit (merged to 'next' on 2025-10-30 at b743410ab6)
+ t1016-compatObjectFormat: really freeze time for reproduciblity
Test fix.
Will merge to 'master'.
source: <[email protected]>
* ps/packed-git-in-object-store (2025-10-30) 9 commits
- packfile: track packs via the MRU list exclusively
- packfile: always add packfiles to MRU when adding a pack
- packfile: move list of packs into the packfile store
- builtin/pack-objects: simplify logic to find kept or nonlocal objects
- packfile: fix approximation of object counts
- http: refactor subsystem to use packfile_lists
- packfile: move the MRU list into the packfile store
- packfile: use a strmap to store packs by name
- Merge branch 'ps/remove-packfile-store-get-packs' into ps/packed-git-in-object-store
The list of packfiles used in a running Git process is moved from the object-database layer down to object-store layer.
Will merge to 'next'?
source: <[email protected]>
* tu/credential-install (2025-10-25) 1 commit
(merged to 'next' on 2025-10-28 at 43589c4832)
+ contrib/credential: add install target
Contributed credential helpers (obviously in contrib/) now have "cd $there && make install" target.
Will merge to 'master'.
source: <[email protected]>
* jk/diff-patch-dry-run-cleanup (2025-10-24) 6 commits
(merged to 'next' on 2025-10-26 at 28426e9102)
+ diff: simplify run_external_diff() quiet logic
+ diff: drop dry-run redirection to /dev/null
+ diff: replace diff_options.dry_run flag with NULL file
+ diff: drop save/restore of color_moved in dry-run mode
+ diff: send external diff output to diff_options.file
+ Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-patch-dry-run-cleanup
Finishing touches to fixes to the recent regression in "git diff -w --quiet" and anything that needs to internally generate patch to see if it turns empty.
Will merge to 'master'.
source: <[email protected]>
* qj/doc-first-contrib-check-lore (2025-10-24) 1 commit
- MyFirstContribution: add tip to confirm patches reached the mailing list (this branch uses ps/rust-cbindgen.)
Doc update.
Will merge to 'next'?
source: <[email protected]>
* rs/merge-base-optim (2025-10-24) 1 commit (merged to 'next' on 2025-10-26 at 45f9bd4b81)
+ commit-reach: avoid commit_list_insert_by_date()
The code to walk revision graph to compute merge base has been optimized.
Will merge to 'master'.
source: <[email protected]>
* rs/add-patch-quit (2025-10-24) 2 commits (merged to 'next' on 2025-10-26 at 859e2555b2)
+ add-patch: quit on EOF
+ add-patch: quit without skipping undecided hunks
The 'q'(uit) command in "git add -p" has been improved to quit without doing any meaningless work before leaving, and giving EOF (typically control-D) to the prompt is made to behave the same way.
Will merge to 'master'.
source: <[email protected]>
* ps/rust-cbindgen (2025-10-24) 6 commits
- rust: generate bindings via cbindgen
- meson: rename Rust library target
- ci: use Debian instead of deprecated i386/ubuntu
- gitlab-ci: backfill missing Linux jobs
- gitlab-ci: reorder Linux job matrix to match GitHub's order
- Merge branch 'ps/ci-rust' into ps/rust-cbindgen (this branch is used by qj/doc-first-contrib-check-lore.)
Introduce cbindgen in the build framework to help interfacing with Rust.
More discussion?
cf. <[email protected]>
source: <[email protected]>
* jk/match-pathname-fix (2025-10-26) 2 commits (merged to 'next' on 2025-10-26 at f18b45f0df)
+ match_pathname(): give fnmatch one char of prefix context
+ match_pathname(): reorder prefix-match check
The wildmatch code had a corner case bug that mistakenly makes "foo**/bar" match with "foobar", which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* kn/refs-optim-cleanup (2025-10-20) 4 commits
- t/pack-refs-tests: move the 'test_done' to callees
- refs: rename 'pack_refs_opts' to 'refs_optimize_opts'
- refs: move to using the '.optimize' functions
- Merge branch 'ps/ref-peeled-tags' into kn/refs-optim-cleanup (this branch uses jt/repo-structure and ps/ref-peeled-tags.)
Code clean-up.
Will merge to 'next' after base topics are merged.
source: <[email protected]>
* lo/repo-info-all (2025-10-26) 2 commits
- repo: add --all to git-repo-info
- repo: factor out field printing to dedicated function
"git repo info" learned "--all" option.
Will merge to 'next'?
source: <[email protected]>
* jt/repo-structure (2025-10-21) 7 commits
(merged to 'next' on 2025-10-28 at c4d81a2da9)
+ builtin/repo: add progress meter for structure stats
+ builtin/repo: add keyvalue and nul format for structure stats
+ builtin/repo: add object counts in structure output
+ builtin/repo: introduce structure subcommand
+ ref-filter: export ref_kind_from_refname()
+ ref-filter: allow NULL filter pattern
+ builtin/repo: rename repo_info() to cmd_repo_info()
(this branch is used by kn/refs-optim-cleanup and ps/ref-peeled-tags.)
"git repo structure", a new command.
Will merge to 'master'.
cf. <eesy5qhqzi56qrzv7wlpenxag23l2zykakvpmr6p5rnak6cril@ap3rugp44bcz> cf. <[email protected]>
source: <[email protected]>
* ps/maintenance-geometric (2025-10-27) 12 commits
(merged to 'next' on 2025-10-27 at 839fc31de9)
+ t7900: fix a flaky test due to git-repack always regenerating MIDX (merged to 'next' on 2025-10-26 at 505f26dcf7)
+ builtin/maintenance: introduce "geometric" strategy
+ builtin/maintenance: make "gc" strategy accessible
+ builtin/maintenance: extend "maintenance.strategy" to manual maintenance
+ builtin/maintenance: run maintenance tasks depending on type
+ builtin/maintenance: improve readability of strategies
+ builtin/maintenance: don't silently ignore invalid strategy
+ builtin/maintenance: make the geometric factor configurable
+ builtin/maintenance: introduce "geometric-repack" task
+ builtin/gc: make too_many_loose_objects() reusable without GC config
+ builtin/gc: remove global repack variable
+ Merge branch 'tb/incremental-midx-part-3.1' into ps/maintenance-geometric
"git maintenance" command learns the "geometric" strategy where it avoids doing maintenance tasks that rebuilds everything from scratch.
Will merge to 'master'.
source: <20251024-pks-maintenance-geometric-strategy-v3-0-9b5b3bdb4387@pks.im>
source: <20251027-pks-maintenance-geometric-strategy-v4-0-18049e4a0adf@pks.im>
* en/xdiff-cleanup-2 (2025-10-29) 10 commits
- xdiff: rename rindex -> reference_index
- xdiff: change rindex from long to size_t in xdfile_t
- xdiff: make xdfile_t.nreff a size_t instead of long
- xdiff: make xdfile_t.nrec a size_t instead of long
- xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hash
- xdiff: use unambiguous types in xdl_hash_record()
- xdiff: use size_t for xrecord_t.size
- xdiff: make xrecord_t.ptr a uint8_t instead of char
- xdiff: use ssize_t for dstart/dend, make them last in xdfile_t
- doc: define unambiguous type mappings across C and Rust
Code clean-up.
Comments?
source: <[email protected]>
* ar/run-command-hook (2025-10-17) 10 commits
- receive-pack: convert receive hooks to hook API
- receive-pack: convert update hooks to new API
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- reference-transaction: use hook API instead of run-command
- hook: allow overriding the ungroup option
- transport: convert pre-push to hook API
- hook: convert 'post-rewrite' hook in sequencer.c to hook API
- hook: provide stdin via callback
- run-command: add stdin callback for parallelization
Use hook API to replace ad-hoc invocation of hook scripts with the run_command() API.
Comments?
source: <[email protected]>
* je/doc-reset (2025-10-17) 4 commits
- doc: git-reset: clarify git reset <pathspec>
- doc: git-reset: clarify git reset [mode]
- doc: git-reset: clarify intro
- doc: git-reset: reorder the forms
Documentation updates.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* kh/doc-patch-id-1 (2025-10-13) 2 commits
(merged to 'next' on 2025-10-26 at e284077116)
+ doc: patch-id: convert to the modern synopsis style
+ Merge branch 'kh/doc-patch-id-markup-fix' into kh/doc-patch-id-1
Will merge to 'master'.
source: <[email protected]>
* tz/test-prepare-gnupghome (2024-07-03) 2 commits (merged to 'next' on 2025-10-28 at f612107bf9)
+ t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
+ t/lib-gpg: add prepare_gnupghome() to create GNUPGHOME dir
Tests did not set up GNUPGHOME correctly, which is fixed but some flaky tests are exposed in t1016, which needs to be addressed before this topic can move forward.
Will merge to 'master'.
cf. <[email protected]>
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>
* ps/ref-peeled-tags (2025-10-23) 16 commits
- ref-filter: parse objects on demand
- ref-filter: detect broken tags when dereferencing them
- refs: don't store peeled object IDs for invalid tags
- object: add flag to peel_object() to verify object type
- refs: drop infrastructure to peel via iterators
- refs: drop current_ref_iter hack
- builtin/show-ref: convert to use reference_get_peeled_oid()
- ref-filter: propagate peeled object ID
- upload-pack: convert to use reference_get_peeled_oid()
- refs: expose peeled object ID via the iterator
- refs: refactor reference status flags
- refs: fully reset struct ref_iterator::ref on iteration
- refs: introduce .ref field for the base iterator
- refs: introduce wrapper struct for each_ref_fn
- Merge branch 'jt/repo-structure' into ps/ref-peeled-tags
- Merge branch 'tb/incremental-midx-part-3.1' into ps/ref-peeled-tags (this branch is used by kn/refs-optim-cleanup; uses jt/repo-structure.)
Some ref backend storage can hold not just the object name of an annotated tag, but the object name of the object the tag points at. The code to handle this information has been streamlined.
Will merge to 'next' after base topics are merged.
source: <20251023-b4-pks-ref-filter-skip-parsing-objects-v4-0-2be68ce82c9a@pks.im>
* je/doc-data-model (2025-10-27) 1 commit
- doc: add an explanation of Git's data model
Add a new manual that describes the data model.
Comments?
source: <[email protected]>
* cc/doc-submitting-patches-with-ai (2025-10-01) 1 commit (merged to 'next' on 2025-10-28 at 9b5e0701fa)
+ SubmittingPatches: add section about AI
AI guidelines.
Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>
* ps/history (2025-10-27) 12 commits
- builtin/history: implement "split" subcommand
- cache-tree: allow writing in-memory index as tree
- add-patch: add support for in-memory index patching
- add-patch: remove dependency on "add-interactive" subsystem
- add-patch: split out struct interactive_options
- add-patch: split out header from "add-interactive.h"
- builtin/history: implement "reword" subcommand
- builtin: add new "history" command
- replay: stop using the_repository
- replay: extract logic to pick commits
- wt-status: provide function to expose status for trees
- Merge branch 'sa/replay-atomic-ref-updates' into ps/history (this branch uses sa/replay-atomic-ref-updates.)
"git history" history rewriting UI.
Comments?
source: <[email protected]>
* ms/doc-worktree-side-by-side (2025-10-10) 2 commits
- doc: git-worktree: Add side by side branch checkout example
- doc: git-worktree: Link to examples
Document "git worktree add" and use of out-of-tree worktrees with examples.
Expecting a reroll.
cf. <CAPig+cSNesf0UwS4=Bxe-Qn+G9y3YYPyOK+7y3q8QJk+o7jaVg@mail.gmail.com>
source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>
* sa/replay-atomic-ref-updates (2025-10-28) 3 commits
- replay: add replay.refAction config option
- replay: make atomic ref updates the default behavior
- replay: use die_for_incompatible_opt2() for option validation (this branch is used by ps/history.)
"git replay" (experimental) learned to perform ref updates itself in a transaction by default, instead of emitting where each refs should point at and leaving the actual update to another command.
Reroll exists.
source: <[email protected]>
* ar/submodule-gitdir-tweak (2025-10-06) 5 commits
- submodule: error out if gitdir name is too long
- submodule: encode gitdir paths to avoid conflicts
- strbuf: bring back is_rfc3986_unreserved
- submodule: add gitdir path config override
- submodule--helper: use submodule_name_to_gitdir in add_submodule
Avoid local submodule repository directory paths overlapping with each other by encoding submodule names before using them as path components.
Expecting v4.
cf. <[email protected]>
source: <[email protected]>
Quoted 11 lines · Junio C Hamano
* cc/fast-import-export-i18n-cleanup (2025-10-30) 5 commits
- gpg-interface: mark a string for translation
- fast-import: mark strings for translation
- fast-export: mark strings for translation
- gpg-interface: use left shift to define GPG_VERIFY_*
- gpg-interface: simplify ssh fingerprint parsingMessages from fast-import/export are now marked for i18n.
Will merge to 'next'?
source: <[email protected]>
I just read through that series. All of the changes look like obvious improvements to me.
Quoted 11 lines
* ps/packed-git-in-object-store (2025-10-30) 9 commits
- packfile: track packs via the MRU list exclusively
- packfile: always add packfiles to MRU when adding a pack
- packfile: move list of packs into the packfile store
- builtin/pack-objects: simplify logic to find kept or nonlocal objects
- packfile: fix approximation of object counts
- http: refactor subsystem to usepackfile_lists
- packfile: move the MRU list into the packfile store
- packfile: use astrmapto store packs by name
- Merge branch 'ps/remove-packfile-store-get-packs' into ps/packed-git-in-object-store
Quoted 2 lines
The list of packfiles used in a running Git process is moved from the object-database layer down to object-store layer.
Correction: the list of packfiles is still essentially on the object database layer. The change here is that it's not contained in struct packed_git anymore, but instead it's moved into the packfile store. So packfiles become a standalone entity, and the packfile store is completely responsible for managing the list of packfiles.
Quoted 2 lines
Will merge to 'next'?
source: <[email protected]>
I think the series is already in a good shape after the last round of reviews, but let's give reviewers a few more days to reply to the second version.
Quoted 8 lines
* lo/repo-info-all (2025-10-26) 2 commits
- repo: add --all to git-repo-info
- repo: factor out field printing to dedicated function"git repo info" learned "--all" option.
Will merge to 'next'?
source: <[email protected]>
I think there's still a couple of comments from Eric on v3 of this series that probably need addressing?
Quoted 19 lines
* ps/ref-peeled-tags (2025-10-23) 16 commits
- ref-filter: parse objects on demand
- ref-filter: detect broken tags when dereferencing them
- refs: don't store peeled object IDs for invalid tags
- object: add flag topeel_object()to verify object type
- refs: drop infrastructure to peel via iterators
- refs: dropcurrent_ref_iterhack
- builtin/show-ref: convert to usereference_get_peeled_oid()
- ref-filter: propagate peeled object ID
- upload-pack: convert to usereference_get_peeled_oid()
- refs: expose peeled object ID via the iterator
- refs: refactor reference status flags
- refs: fully resetstruct ref_iterator::refon iteration
- refs: introduce.reffield for the base iterator
- refs: introduce wrapper struct foreach_ref_fn
- Merge branch 'jt/repo-structure' into ps/ref-peeled-tags
- Merge branch 'tb/incremental-midx-part-3.1' into ps/ref-peeled-tags (this branch is used by kn/refs-optim-cleanup; uses jt/repo-structure.)
Quoted 6 lines
Some ref backend storage can hold not just the object name of an annotated tag, but the object name of the object the tag points at. The code to handle this information has been streamlined.
Will merge to 'next' after base topics are merged.
source: <20251023-b4-pks-ref-filter-skip-parsing-objects-v4-0-2be68ce82c9a@pks.im>
Both dependencies have landed, so this should be ready to be merged now.
Quoted 7 lines
* je/doc-data-model (2025-10-27) 1 commit
- doc: add an explanation of Git's data modelAdd a new manual that describes the data model.
Comments?
source: <[email protected]>
Will have another look at v5 of this series. I think it's nearing a state where it's good enough to be merged down.
Thanks!
Patrick
Quoted 10 lines · Patrick Steinhardt
Quoted 7 lines
* je/doc-data-model (2025-10-27) 1 commit
- doc: add an explanation of Git's data modelAdd a new manual that describes the data model.
Comments?
source: <[email protected]>Will have another look at v5 of this series. I think it's nearing a state where it's good enough to be merged down.
I share that assessment.
Thanks.
Quoted 5 lines · Patrick Steinhardt
Quoted 4 lines · Junio C Hamano
* lo/repo-info-all (2025-10-26) 2 commits
- repo: add --all to git-repo-info
- repo: factor out field printing to dedicated function
Quoted 7 lines
Quoted 4 lines
"git repo info" learned "--all" option.
Will merge to 'next'?
source: <[email protected]>I think there's still a couple of comments from Eric on v3 of this series that probably need addressing?
Agreed, a re-roll is likely warranted for this series, not only to address the comments I posted, but also to adopt a very sensible suggestion[*] from Junio.
Quoted 6 lines
Agreed, a re-roll is likely warranted for this series, not only to address the comments I posted, but also to adopt a very sensible suggestion[*] from Junio.
Indeed. I intend to send a new version soon, but I'll be busy finishing and defending my master's until next week.
Quoted 7 lines · Patrick Steinhardt
Quoted 7 lines
* ps/ref-peeled-tags (2025-10-23) 16 commits
- ref-filter: parse objects on demand
...
- Merge branch 'jt/repo-structure' into ps/ref-peeled-tags
- Merge branch 'tb/incremental-midx-part-3.1' into ps/ref-peeled-tags (this branch is used by kn/refs-optim-cleanup; uses jt/repo-structure.)
Quoted 8 lines
Quoted 6 lines
Some ref backend storage can hold not just the object name of an annotated tag, but the object name of the object the tag points at. The code to handle this information has been streamlined.
Will merge to 'next' after base topics are merged.
source: <20251023-b4-pks-ref-filter-skip-parsing-objects-v4-0-2be68ce82c9a@pks.im>Both dependencies have landed, so this should be ready to be merged now.
The tip of 'next' as of today after merging this topic, it seems.
$ git tag --list --sort=version:tag 'v*.0'
no longer works correctly and shows ascii sort.
v1.0.0
v1.1.0
...
v2.0.0
v2.1.0
v2.10.0
v2.11.0
...
v2.19.0
v2.2.0
v2.20.0
v2.21.0
...
v2.49.0
v2.5.0
v2.50.0
v2.51.0
v2.6.0
v2.7.0
v2.8.0
v2.9.0The merge on 'next' immediately before this topic got merged, i.e., 9ab444ed (Merge branch 'tc/last-modified-active-paths-optimization' into next, 2025-11-03), is the last commit on the 'next' first-parent chain with which the above command works correctly.
I haven't dug it further yet.
Quoted 28 lines · Junio C Hamano
The tip of 'next' as of today after merging this topic, it seems.
$ git tag --list --sort=version:tag 'v*.0'no longer works correctly and shows ascii sort.
v1.0.0 v1.1.0 ... v2.0.0 v2.1.0 v2.10.0 v2.11.0 ... v2.19.0 v2.2.0 v2.20.0 v2.21.0 ... v2.49.0 v2.5.0 v2.50.0 v2.51.0 v2.6.0 v2.7.0 v2.8.0 v2.9.0
Quoted 6 lines
The merge on 'next' immediately before this topic got merged, i.e.,
9ab444ed(Merge branch 'tc/last-modified-active-paths-optimization' into next, 2025-11-03), is the last commit on the 'next' first-parent chain with which the above command works correctly.I haven't dug it further yet.
Bisect points at 054f5f45 (ref-filter: parse objects on demand, 2025-10-23), which is unfortunate, as that is the motivating step of the whole topic.
Quoted 3 lines · Junio C Hamano
Bisect points at
054f5f45(ref-filter: parse objects on demand, 2025-10-23), which is unfortunate, as that is the motivating step of the whole topic.
Here is a fairly simple reproduction. It appears that this does not require the refs to be packed (i.e., "t7004-tag.sh -i -v" fails after saying "*** Loose ***" here, without moving to the packed test).
t/t7004-tag.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
t/t7004-tag.sh +21 -0
@@ -2332,4 +2332,25 @@ test_expect_success 'If tag cannot be created then tag message file is not unlin test_path_exists .git/TAG_EDITMSG ' +test_expect_success 'annotated tag version sort' ' + git tag -a -m "sample 1.0" vsample-1.0 && + git tag -a -m "sample 2.0" vsample-2.0 && + git tag -a -m "sample 10.0" vsample-10.0 && + cat >expect <<-EOF && + vsample-1.0 + vsample-2.0 + vsample-10.0 + EOF + + echo "*** Loose ***" && + git tag --list --sort=version:tag vsample-\* >actual && + test_cmp expect actual && + + echo "*** Packed ***" && + git pack-refs --all && + git tag --list --sort=version:tag vsample-\* && + test_cmp expect actual +' + + test_done
Quoted 10 lines · Junio C Hamano
Quoted 3 lines · Junio C Hamano
Bisect points at
054f5f45(ref-filter: parse objects on demand, 2025-10-23), which is unfortunate, as that is the motivating step of the whole topic.Here is a fairly simple reproduction. It appears that this does not require the refs to be packed (i.e., "
t7004-tag.sh-i -v" fails after saying "*** Loose ***" here, without moving to the packed test).
I think the issue is that nobody ever resets data->maybe_object. So it is left cached with the very first object that gets looked up.
Something like this seems to fix it, but there may be a better place to do the reset.
ref-filter.c +2 -0
@@ -2124,6 +2124,8 @@ static int grab_values(struct atom_value *val, int deref, struct expand_data *davoid *buf = data->content;int ret; + data->maybe_object =NULL ; +switch (data->type) {case OBJ_TAG : ret =grab_tag_values (val, deref, data, refname, err, eaten);
-Peff
Quoted 4 lines · Jeff King
Quoted 2 lines · Junio C Hamano
Junio C Hamano <[email protected]> writes:
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Bisect points at
054f5f45(ref-filter: parse objects on demand, 2025-10-23), which is unfortunate, as that is the motivating step of the whole topic.Here is a fairly simple reproduction. It appears that this does not require the refs to be packed (i.e., "
t7004-tag.sh-i -v" fails after saying "*** Loose ***" here, without moving to the packed test).
Oof.
Quoted 5 lines
I think the issue is that nobody ever resets
data->maybe_object. So it is left cached with the very first object that gets looked up.Something like this seems to fix it, but there may be a better place to do the reset.
Yeah, I think this makes sense. I'd attribute the root cause here to the fact that both oi and oi_peeled are global variables. I didn't realize that and thought it would be populated for every reference individually, but that's obviously not the case.
Only thing I'd change is to instead call get_object(), which is the entry point for grab_values().
Will send a patch in a bit, thanks both!
Patrick