What's cooking in git.git (Dec 2025, #06)
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/
--------------------------------------------------
[New Topics]
* js/symlink-windows (2025-12-17) 19 commits
- mingw: special-case index entries for symlinks with buggy size
- mingw: emulate stat() a little more faithfully
- mingw: try to create symlinks without elevated permissions
- mingw: add support for symlinks to directories
- mingw: implement basic symlink() functionality (file symlinks only)
- mingw: implement readlink()
- mingw: allow mingw_chdir() to change to symlink-resolved directories
- mingw: support renaming symlinks
- mingw: handle symlinks to directories in mingw_unlink()
- mingw: add symlink-specific error codes
- mingw: change default of core.symlinks to false
- mingw: factor out the retry logic
- mingw: compute the correct size for symlinks in mingw_lstat()
- mingw: teach dirent about symlinks
- mingw: let mingw_lstat() error early upon problems with reparse points
- mingw: drop the separate do_lstat() function
- mingw: implement stat() with symlink support
- mingw: don't call GetFileAttributes() twice in mingw_lstat()
- Merge branch 'js/prep-symlink-windows' into js/symlink-windows (this branch uses js/prep-symlink-windows and js/test-symlink-windows.)
Upstream symbolic link support on Windows from Git-for-Windows.
Will merge to 'next'?
source: <[email protected]>
* mh/doc-core-attributesfile (2025-12-17) 1 commit
- docs: note the type of core.attributesfile
Doc update.
Will merge to 'next'.
source: <[email protected]>
* pc/lockfile-pid (2025-12-17) 1 commit
- lockfile: add PID file for debugging stale locks
Allow recording process ID of the process that holds the lock next to a lockfile for diagnosis.
source: <[email protected]>
* jc/object-read-stream-fix (2025-12-17) 2 commits
- odb: do not use "blank" substitute for NULL
- Merge branch 'ps/object-read-stream' into jc/object-read-stream-fix (this branch is used by ps/read-object-info-improvements.)
Fix a performance regression in recently graduated topic.
Will merge to 'next'.
source: <[email protected]>
* js/neuter-sideband (2025-12-17) 4 commits
- sideband: add options to allow more control sequences to be passed through
- sideband: do allow ANSI color sequences by default
- sideband: introduce an "escape hatch" to allow control characters
- sideband: mask control characters
Invalidate control characters in sideband messages, to avoid terminal state getting messed up.
Comments?
cf. <[email protected]>
source: <[email protected]>
* ps/read-object-info-improvements (2025-12-18) 8 commits
- packfile: drop repository parameter from packed_object_info()
- packfile: skip unpacking object header for disk size requests
- packfile: disentangle return value of packed_object_info()
- packfile: always populate pack-specific info when reading object info
- packfile: extend is_delta field to allow for "unknown" state
- packfile: always declare object info to be OI_PACKED
- object-file: always set OI_LOOSE when reading object info
- Merge branch 'jc/object-read-stream-fix' into ps/read-object-info-improvements (this branch uses jc/object-read-stream-fix.)
The object-info API has been cleaned up.
Comments?
source: <20251218-b4-pks-odb-read-object-info-improvements-v2-0-62e3e49072bc@pks.im>
* jk/test-curl-updates (2025-12-18) 3 commits
- t5563: relax whitespace assumptions for unfolded headers
- t5563: add missing end-of-line in HTTP header
- t5551: handle trailing slashes in expected cookies output
Update HTTP tests to adjust for changes in curl 8.18.0
Will merge to 'next'?
cf. <[email protected]>
source: <[email protected]>
* dk/ci-rust-fix (2025-12-18) 2 commits
- rust: build correctly without GNU sed
- Merge branch 'ps/ci-rust' into dk/ci-rust-fix
Build fix.
Will merge to 'next'.
source: <a33f4e5118938300bcd5b2991feeee855a1c8f86.1766100330.git.ben.knoble+github@gmail.com>
* gf/clear-path-cache-cleanup (2025-12-18) 1 commit
- repository: remove duplicate free of cache->squash_msg
Code clean-up.
Will merge to 'next'.
source: <[email protected]>
* gf/maintenance-is-needed-fix (2025-12-18) 1 commit
- refs: dereference the value of the required pointer
Brown-paper-bag fix to a recently graduated
'kn/maintenance-is-needed' topic.
Will merge to 'next'.
source: <[email protected]>
* js/test-func-comment-fix (2025-12-18) 1 commit
- test_detect_ref_format: fix comment
Comment fix.
Will merge to 'next'.
source: <[email protected]>
--------------------------------------------------
[Cooking]
* ja/doc-misc-fixes (2025-12-15) 1 commit
(merged to 'next' on 2025-12-18 at d30d8cac71)
+ doc: flock of small fixes to various documentation files
Various documentation fixes.
Will merge to 'master'.
source: <[email protected]>
* jt/doc-rev-list-filter-provided-objects (2025-12-15) 1 commit
- docs: clarify git-rev-list(1) --filter behavior
Document "rev-list --filter-provided-objects" better.
Will merge to 'next'.
source: <[email protected]>
* tb/macos-iconv-workarounds (2025-12-15) 6 commits
. config.mak.uname: activate ICONV_RESTART_RESET if needed
. Makefile: make all darwin into config.mak.uname
. utf8.c: prepare workaround for iconv under macOS 14/15
. Merge branch 'rs/macos-iconv-workaround' into tb/macos-iconv-workarounds . config.mak.uname: use iconv from Homebrew on macOS
. Makefile: add NO_HOMEBREW
The iconv library on macOS fails to correctly handle stateful ISO/IEC 2022 encoded strings. Work it around instead of replacing it wholesale from homebrew.
RFC.
needs to be debased from older rs/macos-iconv-workaround topic.
source: <[email protected]>
* js/prep-symlink-windows (2025-12-16) 6 commits
- trim_last_path_component(): avoid hard-coding the directory separator
- strbuf_readlink(): support link targets that exceed PATH_MAX
- strbuf_readlink(): avoid calling readlink() twice in corner-cases
- init: do parse _all_ core.* settings early
- mingw: do resolve symlinks in getcwd()
- Merge branch 'js/test-symlink-windows' into js/prep-symlink-windows (this branch is used by js/symlink-windows; uses js/test-symlink-windows.)
Further preparation to upstream symbolic link support on Windows.
Will merge to 'next'?
source: <[email protected]>
* ap/http-probe-rpc-use-auth (2025-11-12) 1 commit
- remote-curl: Use auth for probe_rpc() requests too
source: <[email protected]>
* kj/pull-options-decl-cleanup (2025-12-11) 1 commit (merged to 'next' on 2025-12-14 at f59cad1d37)
+ pull: move options[] array into function scope
Code clean-up.
Will merge to 'master'.
source: <[email protected]>
* jc/memzero-array (2025-12-12) 3 commits (merged to 'next' on 2025-12-17 at 0dd398f0b4)
+ cocci: use MEMZERO_ARRAY() a bit more
+ coccicheck: emit the contents of cocci patch
+ Merge branch 'tc/memzero-array' into jc/memzero-array (this branch uses tc/memzero-array.)
Further application of MEMZERO_ARRAY() macro to the rest of the code base.
Will merge to 'next' together with the base topic.
source: <[email protected]>
* rs/t4014-git-version-string-fix (2025-12-13) 1 commit (merged to 'next' on 2025-12-14 at eef802176c)
+ t4014: support Git version strings with spaces
Test fix.
Will merge to 'master'.
source: <[email protected]>
* jc/doc-commit-signoff-config (2025-12-19) 2 commits (merged to 'next' on 2025-12-19 at 0814c687bb)
+ signoff-option: linkify the reference to gitfaq (merged to 'next' on 2025-12-18 at 27c9ad156c)
+ commit: document that $command.signoff will not be added
Documentation update.
Will merge to 'master'.
source: <[email protected]>
* ps/packfile-store-in-odb-source (2025-12-17) 12 commits
- packfile: move MIDX into packfile store
- packfile: refactor find_pack_entry() to work on the packfile store
- packfile: inline find_kept_pack_entry()
- packfile: only prepare owning store in packfile_store_prepare()
- packfile: only prepare owning store in packfile_store_get_packs()
- packfile: move packfile store into object source
- packfile: refactor misleading code when unusing pack windows
- packfile: refactor kept-pack cache to work with packfile stores
- packfile: pass source to prepare_pack()
- packfile: create store via its owning source
- Merge branch 'ps/odb-misc-fixes' into ps/packfile-store-in-odb-source
- Merge branch 'ps/object-read-stream' into ps/packfile-store-in-odb-source (this branch uses ps/odb-misc-fixes.)
The packfile_store data structure is moved from object store to odb source.
Comments?
source: <[email protected]>
* rs/diff-files-r-find-copies-fix (2025-12-14) 2 commits
(merged to 'next' on 2025-12-17 at 2c9d72ec4b)
+ diff-files: fix copy detection
+ Merge branch 'rs/diff-index-find-copies-harder-optim' into rs/diff-files-r-find-copies-fix
"git diff-files -R --find-copies-harder" has been taught to use the potential copy sources from the index correctly.
Will merge to 'master'.
source: <[email protected]>
* jt/repo-struct-more-objinfo (2025-12-17) 7 commits
- builtin/repo: add object disk size info to structure table
- builtin/repo: add disk size info to keyvalue stucture output
- builtin/repo: add inflated object info to structure table
- builtin/repo: add inflated object info to keyvalue structure output
- builtin/repo: humanise count values in structure output
- strbuf: split out logic to humanise byte values
- builtin/repo: group per-type object values into struct
More object database related information are shown in "git repo structure" output.
Will merge to 'next'.
source: <[email protected]>
* jc/c99-fam (2025-12-12) 1 commit
(merged to 'next' on 2025-12-18 at c11ebcf075)
+ FLEX_ARRAY: require platforms to support the C99 syntax
Require C99 style flexible array member support from all platforms.
Will merge to 'master'.
source: <[email protected]>
* jc/macports-darwinports (2025-12-10) 1 commit (merged to 'next' on 2025-12-14 at 5c608e07fe)
+ Makefile: help macOS novices by mentioning MacPorts
Makefile in-comment doc update.
Will merge to 'master'.
source: <[email protected]>
* rs/macos-iconv-workaround (2025-12-16) 2 commits
- macOS: use iconv from Homebrew if present
- macOS: make Homebrew use configurable
Workaround the "iconv" shipped as part of macOS, which is broken handling stateful ISO/IEC 2022 encoded strings.
Comments?
source: <[email protected]>
* rs/replay-wrong-onto-fix (2025-12-11) 2 commits
(merged to 'next' on 2025-12-14 at d34966465f)
+ replay: move onto NULL check before first use
+ Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix
"git replay --onto=<commit> ...", when <commit> is mistyped, started to segfault with recent change, which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* tc/memzero-array (2025-12-10) 3 commits
(merged to 'next' on 2025-12-17 at 4d2f7755b5)
+ contrib/coccinelle: pass include paths to spatch(1)
+ git-compat-util: introduce MEMZERO_ARRAY() macro
+ Merge branch 'tc/last-modified-active-paths-optimization' into tc/memzero-array (this branch is used by jc/memzero-array.)
MEMZERO_ARRAY() helper is introduced to avoid clearing only the first N bytes of an N-element array whose elements are larger than a byte.
Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>
* kh/doc-replay-updates (2025-12-13) 3 commits
(merged to 'next' on 2025-12-14 at 71a8f83876)
+ doc: replay: link section using markup
+ replay: improve --contained and add to doc
+ doc: replay: mention no output on conflicts
"git replay" documentation updates.
Will merge to 'master'.
source: <[email protected]>
* lo/repo-info-keys (2025-12-09) 3 commits
- repo: add new flag --keys to git-repo-info
- repo: add a default output format to enum output_format
- Merge branch 'lo/repo-struct-z' into lo/repo-info-keys
"git repo info" learns "--keys" action to list known keys.
Comments?
source: <[email protected]>
* ps/odb-alternates-object-sources (2025-12-11) 8 commits (merged to 'next' on 2025-12-12 at 1dd061c0dc)
+ odb: write alternates via sources
+ odb: read alternates via sources
+ odb: drop forward declaration of read_info_alternates()
+ odb: remove mutual recursion when parsing alternates
+ odb: stop splitting alternate in odb_add_to_alternates_file()
+ odb: move computation of normalized objdir into alt_odb_usable()
+ odb: resolve relative alternative paths when parsing
+ odb: refactor parsing of alternates to be self-contained
Code refactoring around alternate object store.
Will merge to 'master'.
source: <20251211-b4-pks-odb-alternates-via-source-v3-0-00e3f54d07ba@pks.im>
* ps/repack-avoid-noop-midx-rewrite (2025-12-10) 3 commits
- midx-write: skip rewriting MIDX with --stdin-packs unless needed
- midx-write: extract function to test whether MIDX needs updating
- midx: fix BUG() when getting preferred pack without a reverse index
Even when there is no changes in the packfile and no need to recompute bitmaps, "git repack" recomputed and updated the MIDX file, which has been corrected.
Will merge to 'next'.
cf.
source: <[email protected]>
* sb/doc-update-ref-markup-fix (2025-12-08) 1 commit
- doc: fix update-ref symref-create formatting
Doc mark-up fix.
Will merget to 'next'.
source: <[email protected]>
* ap/packfile-promisor-object-optim (2025-12-08) 2 commits (merged to 'next' on 2025-12-18 at ee94076814)
+ packfile: skip hash checks in add_promisor_object()
+ object: apply skip_hash and discard_tree optimizations to unknown blobs too
The code path that enumerates promisor objects have been optimized to skip pointlessly parsing blob objects.
Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>
* ps/odb-misc-fixes (2025-12-10) 3 commits
- odb: properly close sources before freeing them
- builtin/gc: fix condition for whether to write commit graphs
- Merge branch 'ps/object-source-management' into ps/odb-misc-fixes (this branch is used by ps/packfile-store-in-odb-source.)
Miscellaneous fixes on object database layer.
Comments?
source: <[email protected]>
* ps/clar-integers (2025-12-06) 3 commits
- gitattributes: disable blank-at-eof errors for clar test expectations
- t/unit-tests: demonstrate use of integer comparison assertions
- t/unit-tests: update clar to 39f11fe
Import newer version of "clar", unit testing framework.
Comments?
source: <[email protected]>
* tb/incremental-midx-part-3.2 (2025-12-06) 17 commits
- midx: enable reachability bitmaps during MIDX compaction
- midx: implement MIDX compaction
- t/helper/test-read-midx.c: plug memory leak when selecting layer
- midx-write.c: factor fanout layering from compute_sorted_entries()
- midx-write.c: enumerate pack_int_id values directly
- midx-write.c: extract fill_pack_from_midx()
- midx-write.c: introduce midx_pack_perm() helper
- git-compat-util.h: introduce u32_add()
- midx: do not require packs to be sorted in lexicographic order
- midx-write.c: introduce struct write_midx_opts
- midx-write.c: don't use pack_perm when assigning bitmap_pos
- t/t5319-multi-pack-index.sh: fix copy-and-paste error in t5319.39
- git-multi-pack-index(1): align SYNOPSIS with 'git multi-pack-index -h'
- git-multi-pack-index(1): remove non-existent incompatibility
- builtin/multi-pack-index.c: make '--progress' a common option
- midx: split get_midx_checksum() by adding get_midx_hash()
- midx: mark get_midx_checksum() arguments as const
Further work on incremental repacking using MIDX/bitmap
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* yc/histogram-hunk-shift-fix (2025-12-06) 1 commit
- xdiff: re-diff shifted change groups when using histogram algorithm
The final clean-up phase of the diff output could turn the result of histogram diff algorithm suboptimal, which has been corrected.
Comments?
source: <[email protected]>
* jc/completion-no-single-letter-options (2025-12-06) 1 commit (merged to 'next' on 2025-12-17 at d8ae4b5ac4)
+ completion: clarify support for short options and arguments
In-code comment update to clarify that single-letter options are outside of the scope of command line completion script.
Will merge to 'master'.
source: <[email protected]>
* jk/parse-int (2025-11-30) 5 commits
- fsck: use parse_unsigned_from_buf() for parsing timestamp
- cache-tree: use parse_int_from_buf()
- parse: add functions for parsing from non-string buffers
- parse: prefer bool to int for boolean returns
- Merge branch 'jk/asan-bonanza' into jk/parse-int
Introduce a more robust way to parse a decimal integer stored in a piece of memory that is not necessarily terminated with NUL (which Asan strict-string-check complains even when use of strtol() is safe due to varified existence of whitespace after the digits).
Expecting a reroll.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>
* js/test-symlink-windows (2025-12-17) 10 commits
- t7800: work around the MSYS path conversion on Windows
- t6423: introduce Windows-specific handling for symlinking to /dev/null
- t1305: skip symlink tests that do not apply to Windows
- t1006: accommodate for symlink support in MSYS2
- t0600: fix incomplete prerequisite for a test case
- t0301: another fix for Windows compatibility
- t0001: handle diff --no-index gracefully
- mingw: special-case open(symlink, O_CREAT | O_EXCL)
- apply: symbolic links lack a "trustable executable bit"
- t9700: accommodate for Windows paths
(this branch is used by js/prep-symlink-windows and js/symlink-windows.)
Prepare test suite for Git for Windows that supports symbolic links.
Will merge to 'next'.
source: <[email protected]>
* tc/last-modified-options-cleanup (2025-11-26) 4 commits
- fixup! last-modified: document option --max-depth
- last-modified: document how depth is handled better
- last-modified: document option --max-depth
- last-modified: handle and document NUL termination
The "-z" and "--max-depth" documentation (and implementation of "-z") in the "git last-modified" command have been updated.
Expecting a reroll.
source: <[email protected]>
* ds/doc-scalar-config (2025-12-12) 5 commits (merged to 'next' on 2025-12-16 at 221721824f)
+ scalar: document config settings
+ scalar: alphabetize and simplify config
+ scalar: remove stale config values
+ scalar: use index.skipHash=true for performance
+ scalar: annotate config file with "set by scalar"
Documentation updates.
Will merge to 'master'.
source: <[email protected]>
* pw/replay-drop-empty (2025-12-18) 2 commits
- replay: drop commits that become empty
- Merge branch 'ps/history' into pw/replay-drop-empty (this branch uses ps/history.)
"git replay" is taught to drop commits that become empty (not the ones that are empty in the original).
On hold, until the base topic gains consensus and stabilizes.
source: <375adc4e941f3bb22a2b12ee26a083951ed724dd.1766076625.git.phillip.wood@dunelm.org.uk>
* sp/shallow-time-boundary (2025-11-23) 1 commit
- shallow: set borders which are all reachable after clone shallow since
The set of shallow boundary "git clone --shallow-since" leaves contained commits that are not on the boundary, which has been corrected.
Comments?
source: <[email protected]>
* kn/ref-location (2025-12-01) 2 commits
- refs: add GIT_REF_URI to specify reference backend and directory
- refs: support obtaining ref_store for given dir
A mechanism to specify what reference backend to use and store references in which directory is introduced, which would likely to be useful during ref migration.
Comments?
source: <[email protected]>
* dw/config-global-list (2025-10-09) 4 commits
- config: keep bailing on unreadable global files
- config: read global scope via config_sequence
- config: test home and xdg files in list --global
- cleanup_path: force forward slashes on Windows
"git config --list --global", unlike "git config --list", did not consult both of the two possible per-user sources of the configuration files, i.e. $HOME/.gitconfig and the XDG one, which has been corrected.
Expecting a reroll.
cf. <20251122020047.GB3947@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net>
source: <[email protected]>
* jc/submodule-add (2025-11-15) 1 commit (merged to 'next' on 2025-12-17 at 03e0b0b5d9)
+ submodule add: sanity check existing .gitmodules
"git submodule add" to add a submodule under <name> segfaulted, when a submodule.<name>.something is already in .gitmodules file without defining where its submodule.<name>.path is, which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* kn/fix-fetch-backfill-tag-with-batched-ref-updates (2025-11-21) 3 commits (merged to 'next' on 2025-12-17 at 3955b0be68)
+ fetch: fix failed batched updates skipping operations
+ fetch: fix non-conflicting tags not being committed
+ fetch: extract out reference committing logic
"git fetch" that involves fetching tags, when a tag being fetched needs to overwrite existing one, failed to fetch other tags, which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* lc/rebase-trailer (2025-11-05) 4 commits
- rebase: support --trailer
- trailer: append trailers in-process and drop the fork to interpret-trailers
- trailer: move process_trailers to trailer.h
- interpret-trailers: factor out buffer-based processing to process_trailers()
Refactor code paths to run "interpret-trailers" from "git commit/tag" and use it in "git rebase".
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* jc/exclude-with-gitignore (2025-11-04) 1 commit
- dir.c: do not be fooled by :(exclude) pathspec elements
"git add ':(exclude)foo.o'" is clearly a request not to add 'foo.o', but the command complained about listing an ignored path foo.o on the command line, which has been corrected.
Comments?
source: <[email protected]>
* bc/sha1-256-interop-02 (2025-11-17) 15 commits
- 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 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 object map
- csum-file: define hashwrite's count as a uint32_t
- rust: add additional helpers for ObjectID
- 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.
source: <[email protected]>
* ar/run-command-hook (2025-12-18) 11 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
- hook: allow overriding the ungroup option
- reference-transaction: use hook API instead of run-command
- 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
- run-command: add first helper for pp child states
Use hook API to replace ad-hoc invocation of hook scripts with the run_command() API.
Will merge to 'next'?
cf. <[email protected]>
source: <[email protected]>
* je/doc-reset (2025-12-18) 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.
Will merge to 'next'?
source: <[email protected]>
* ps/history (2025-12-03) 13 commits
- builtin/history: implement "split" subcommand
- cache-tree: allow writing in-memory index as tree
- add-patch: allow disabling editing of hunks
- 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 'pw/replay-exclude-gpgsig-fix' into ps/history (this branch is used by pw/replay-drop-empty.)
"git history" history rewriting UI.
What's the status of this topic?
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>
* ar/submodule-gitdir-tweak (2025-12-13) 10 commits
- submodule: hash the submodule name for the gitdir path
- submodule: fix case-folding gitdir filesystem collisions
- submodule--helper: fix filesystem collisions by encoding gitdir paths
- builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
- submodule--helper: add gitdir migration command
- submodule: allow runtime enabling extensions.submodulePathConfig
- submodule: introduce extensions.submodulePathConfig
- builtin/submodule--helper: add gitdir command
- submodule: always validate gitdirs inside submodule_name_to_gitdir
- 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.
Comments?
source: <[email protected]>
--------------------------------------------------
[Discarded]
* wm/complete-git-short-opts (2025-11-26) 1 commit
- completion: complete "git -<TAB>" with short options
The command line completion script (in contrib/) learned to complete "git -<TAB>" to give single-letter options like "-C".
Will discard. We do not complete single-letter options themselves. cf. <[email protected]>
source: <[email protected]>
Quoted 10 lines · On Friday, 19 December 2025 17:47:45 CET Junio C Hamano wrote:
* ja/doc-misc-fixes (2025-12-15) 1 commit
(merged to 'next' on 2025-12-18 atd30d8cac71)
+ doc: flock of small fixes to various documentation filesVarious documentation fixes.
Will merge to 'master'.
source: <[email protected]>
After a review by Kristoffer Haugsbakk, a V2 has been pushed.
Quoted 10 lines · Junio C Hamano
* jk/test-curl-updates (2025-12-18) 3 commits
- t5563: relax whitespace assumptions for unfolded headers
- t5563: add missing end-of-line in HTTP header
- t5551: handle trailing slashes in expected cookies outputUpdate HTTP tests to adjust for changes in curl 8.18.0
Will merge to 'next'?
cf. <[email protected]>
source: <[email protected]>
I left a message in the thread, but it occurred to me that responding here might catch your attention better. With Daniel's fixes for curl, we could probably just drop the third patch (it doesn't hurt much to keep it, but if we don't need to complexify our tests, we might as well not do so). The first two patches will still be needed.
-Peff
Quoted 10 lines · Junio C Hamano
* ps/odb-misc-fixes (2025-12-10) 3 commits
- odb: properly close sources before freeing them
- builtin/gc: fix condition for whether to write commit graphs
- Merge branch 'ps/object-source-management' into ps/odb-misc-fixes (this branch is used by ps/packfile-store-in-odb-source.)Miscellaneous fixes on object database layer.
Comments?
source: <[email protected]>
Given that this series is somewhat small and has received two favorable reviews I'd suggest that this can probably be merged down to "next".
Quoted 9 lines
* ps/clar-integers (2025-12-06) 3 commits
- gitattributes: disable blank-at-eof errors for clar test expectations
- t/unit-tests: demonstrate use of integer comparison assertions
- t/unit-tests: update clar to 39f11feImport newer version of "clar", unit testing framework.
Comments?
source: <[email protected]>
I think this can be merged, too. Peff has positively reviewed the update itself, the only change relative to that in v2 was to mark the self-test files as being allowed to end in a blank line via gitattributes.
Quoted 10 lines
* kn/ref-location (2025-12-01) 2 commits
- refs: addGIT_REF_URIto specify reference backend and directory
- refs: support obtainingref_storefor given dirA mechanism to specify what reference backend to use and store references in which directory is introduced, which would likely to be useful during ref migration.
Comments?
source: <[email protected]>
I somehow lost track of reviewing this topic. I've put it into my backlog of stuff to review once I'm back in office (or when I find a quiet minute where I'm bored).
Quoted 13 lines
* ar/run-command-hook (2025-12-18) 11 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
- hook: allow overriding the ungroup option
- reference-transaction: use hook API instead of run-command
- transport: convert pre-push to hook API
- hook: convert 'post-rewrite' hook insequencer.cto hook API
- hook: provide stdin via callback
- run-command: add stdin callback for parallelization
- run-command: add first helper for pp child states
Quoted 6 lines
Use hook API to replace ad-hoc invocation of hook scripts with the
run_command()API.Will merge to 'next'?
cf. <[email protected]>
source: <[email protected]>
There's a small set of nits I had on the final patch, but I don't really think these necessarily need to be addressed. I'll leave it to Adrian to decide whether or not he wants to do a final reroll.
Quoted 16 lines
* ps/history (2025-12-03) 13 commits
- builtin/history: implement "split" subcommand
- cache-tree: allow writing in-memory index as tree
- add-patch: allow disabling editing of hunks
- add-patch: add support for in-memory index patching
- add-patch: remove dependency on "add-interactive" subsystem
- add-patch: split outstruct interactive_options
- add-patch: split out header from "add-interactive.h"
- builtin/history: implement "reword" subcommand
- builtin: add new "history" command
- replay: stop usingthe_repository
- replay: extract logic to pick commits
- wt-status: provide function to expose status for trees
- Merge branch 'pw/replay-exclude-gpgsig-fix' into ps/history (this branch is used by pw/replay-drop-empty.)
Quoted 4 lines
"git history" history rewriting UI.
What's the status of this topic?
source: <[email protected]>
I didn't find the time recently to focus on this topic. I think the discussions mostly reached consensus though that we also want to adapt these commands to rewrite dependent branches. I'll work this into the series, but will probably only get to it in early January.
Thanks!
Patrick