Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=jch 2026-05-17T13:58:50Z 2026-05-17T13:58:50Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:50Z urn:sha1:91b68bbb3be67da96b541eb779dd47de02c71595 Documentation updates. * kh/doc-trailers: doc: interpret-trailers: document comment line treatment doc: interpret-trailers: commit to “trailer block” term doc: interpret-trailers: add key format example doc: interpret-trailers: explain key format doc: interpret-trailers: explain the format after the intro doc: interpret-trailers: not just for commit messages doc: interpret-trailers: use “metadata” in Name as well doc: interpret-trailers: replace “lines” with “metadata” doc: interpret-trailers: stop fixating on RFC 822 2026-05-17T13:58:49Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:49Z urn:sha1:503e5b6fb1142dcd5d8e2c0cc89de9662122168d "git cat-file --batch" learns an in-line command "mailmap" that lets the user toggle use of mailmap. * sa/cat-file-batch-mailmap-switch: cat-file: add mailmap subcommand to --batch-command 2026-05-17T13:58:48Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:48Z urn:sha1:b19fcb44c63d716453a4311ff2877e7b17754a90 The final step, split from earlier attempt by Dscho, to loosen the sideband restriction for now and tighten later at Git v3.0 boundary. * jc/neuter-sideband-post-3.0: sideband: delay sanitizing by default to Git v3.0 2026-05-17T13:58:47Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:47Z urn:sha1:aff24012b8ebc2a2672f8b43f44fa7d2197ac261 The repacking code has been refactored and compaction of MIDX layers have been implemented, and incremental strategy that does not require all-into-one repacking has been introduced. * tb/incremental-midx-part-3.3: repack: allow `--write-midx=incremental` without `--geometric` repack: introduce `--write-midx=incremental` repack: implement incremental MIDX repacking packfile: ensure `close_pack_revindex()` frees in-memory revindex builtin/repack.c: convert `--write-midx` to an `OPT_CALLBACK` repack-geometry: prepare for incremental MIDX repacking repack-midx: extract `repack_fill_midx_stdin_packs()` repack-midx: factor out `repack_prepare_midx_command()` midx: expose `midx_layer_contains_pack()` repack: track the ODB source via existing_packs midx: support custom `--base` for incremental MIDX writes midx: introduce `--no-write-chain-file` for incremental MIDX writes midx: use `strvec` for `keep_hashes` midx: build `keep_hashes` array in order midx: use `strset` for retained MIDX files midx-write: handle noop writes when converting incremental chains 2026-05-17T13:58:46Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:46Z urn:sha1:8b653b4dff43737f5a8de0a49cb6303b8dce5fc9 Fixes many bugs in pseudo-merge code. * tb/pseudo-merge-bugfixes: pack-bitmap: prevent pattern leak on pseudo-merge re-assignment Documentation: fix broken `sampleRate` in gitpacking(7) pack-bitmap: reject pseudo-merge "sampleRate" of 0 pack-bitmap: parse commits in `find_pseudo_merge_group_for_ref()` pack-bitmap: fix pseudo-merge lookup for shared commits pack-bitmap: fix inverted binary search in `pseudo_merge_at()` pack-bitmap-write: sort pseudo-merge commit lookup table in pack order t5333: demonstrate various pseudo-merge bugs t/helper: add 'test-tool bitmap write' subcommand 2026-05-17T13:58:45Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:45Z urn:sha1:dabc6a9749f21697b448344767431277d98c416c Document the fact that .git/info/exclude is shared across worktrees linked to the same repository. * dk/doc-exclude-is-shared-per-repo: ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR 2026-05-17T13:58:44Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:44Z urn:sha1:cea30558198aa6622d25c8d835ab00f3176cca4e The internal URL parsing logic has been made accessible via a new subcommand "git url-parse". * mm/git-url-parse: t9904: add tests for the new url-parse builtin doc: describe the url-parse builtin builtin: create url-parse command urlmatch: define url_parse function url: return URL_SCHEME_UNKNOWN instead of dying url: move scheme detection to URL header/source url: move url_is_local_not_ssh to url.h connect: rename enum protocol to url_scheme 2026-05-17T13:58:43Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:43Z urn:sha1:f897e61d20729ee5a0499e243e4325c528c7236f Doc update. * kh/doc-log-decorate-list: doc: log: use the same delimiter in description list doc: log: fix --decorate description list 2026-05-17T13:58:42Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:42Z urn:sha1:930a85f0e685b29b012b575f65679e73b6c49eca "git history" learned "fixup" command. * ps/history-fixup: builtin/history: introduce "fixup" subcommand builtin/history: generalize function to commit trees replay: allow callers to control what happens with empty commits 2026-05-17T13:58:42Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:41Z urn:sha1:cd54823e7fad966f572ff64dc70bd92ee10af80e Some tests assume that bare repository accesses are by default allowed; rewrite some of them to avoid the assumption, rewrite others to explicitly set safe.bareRepository to allow them. * js/adjust-tests-to-explicitly-access-bare-repo: safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES status tests: filter `.gitconfig` from status output ls-files tests: filter `.gitconfig` from `--others` output t5601: restore `.gitconfig` after includeIf test t1305: use `--git-dir=.` for bare repo in include cycle test t1300: remove global config settings injected by test-lib.sh t7900: do not let `$HOME/.gitconfig` interfere with XDG tests test-lib: allow bare repository access when breaking changes are enabled