threads / discuss / 62848

What's cooking in git.git (Jan 2025, #07; Fri, 24)

Subject: What's cooking in git.git (Jan 2025, #07; Fri, 24)

## tl;dr

9 messages between Jan 24, 2025 and Jan 30, 2025.

replies: 8people: 4as markdown or json

Junio C Hamano· Jan 24, 2025, 20:19 UTC · lore

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).

There are quite a few topics that are listed here but without much review activities. I earlier said that I'll review the notes below with list archive myself to see which ones are truly stale and discard them, but this is progressing a lot slower than my liking. Help is greatly appreciated.

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']

* ak/instaweb-python-port-binding-fix (2025-01-10) 1 commit
  (merged to 'next' on 2025-01-17 at bcb5e21e0b)
 + instaweb: fix ip binding for the python http.server
 The "instaweb" bound only to local IP address without "--local" and
 to all addresses with "--local", which was the other way around, when
 using Python's http.server class, which has been corrected.
 source: <20250110101346.30416-1-alecsk@gmail.com>
* en/object-name-with-funny-refname-fix (2025-01-13) 2 commits
  (merged to 'next' on 2025-01-16 at 89cd7778c9)
 + object-name: be more strict in parsing describe-like output
 + object-name: fix resolution of object names containing curly braces
 Extended SHA-1 expression parser did not work well when a branch
 with an unusual name (e.g. "foo{bar") is involved.
 source: <pull.1844.v3.git.1736788417.gitgitgadget@gmail.com>
* jc/cli-doc-option-and-config (2025-01-17) 1 commit
  (merged to 'next' on 2025-01-17 at 71f41b00d8)
 + gitcli: document that command line trumps config and env
 Doc update.
 source: <xmqqzfjqmbza.fsf@gitster.g>
* mh/doc-credential-helpers-with-pat (2025-01-10) 2 commits
  (merged to 'next' on 2025-01-17 at a70beabaf5)
 + docs: discuss caching personal access tokens
 + docs: list popular credential helpers
 Document that it is insecure to use Personal Access Tokens, which
 some hosting providers take as username/password, embedded in URLs.
 source: <pull.1851.v2.git.1736549677.gitgitgadget@gmail.com>
* sj/meson-doc-technical-dependency-fix (2025-01-14) 1 commit
  (merged to 'next' on 2025-01-16 at 3ec55e0703)
 + meson: fix missing deps for technical articles
 The meson build procedure for Documentation/technical/ hierarchy was
 missing necessary dependencies, which has been corrected.
 source: <5114dc9a00377826a55f6bab007d2ad1a4de8bc5.1736866030.git.sam@gentoo.org>
* tc/meson-use-our-version-def-h (2025-01-14) 1 commit
  (merged to 'next' on 2025-01-16 at 76e9e81736)
 + meson: ensure correct version-def.h is used
 The meson build procedure looked for the 'version-def.h' file in a
 wrong directory, which has been corrected.
 source: <20250114-toon-fix-meson-version-v2-1-66ddb1a82c28@iotcl.com>

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

* ac/doc-http-ssl-type-config (2025-01-23) 1 commit
 - docs: indicate http.sslCertType and sslKeyType
 Two configuration variables about SSL authentication material that
 weren't mentioned in the documentations are now mentioned.
 Waiting for review response.
 cf. <Z5GOfwBR7JBloIs0@tapette.crustytoothpaste.net>
 source: <pull.1854.git.1737591366672.gitgitgadget@gmail.com>
* kn/reflog-migration-fix-fix (2025-01-23) 1 commit
 - SQUASH - needs to describe the breakage and fix in v1
 (this branch uses kn/reflog-migration-fix.)
 Fix bugs in an earlier attempt to fix "git refs migration".
 Expecting a reroll.
 cf. <xmqqbjvxs8me.fsf@gitster.g>
 source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>

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

* bc/doc-adoc-not-txt (2025-01-21) 5 commits
  (merged to 'next' on 2025-01-24 at 737049d332)
 + Remove obsolete ".txt" extensions for AsciiDoc files
 + doc: use .adoc extension for AsciiDoc files
 + gitattributes: mark AsciiDoc files as LF-only
 + editorconfig: add .adoc extension
 + doc: update gitignore for .adoc extension
 All the documentation .txt files have been renamed to .adoc to help
 content aware editors.
 Will cook in 'next' for at least 3 weeks til mid Feb 2025.
 cf. <xmqqmsfl2gro.fsf@gitster.g>
 source: <20250120015603.1980991-1-sandals@crustytoothpaste.net>
* jp/t8002-printf-fix (2025-01-21) 1 commit
  (merged to 'next' on 2025-01-22 at 20bc202378)
 + t8002: fix ambiguous printf conversion specifications
 Test fix.
 Will merge to 'master'.
 source: <20250120114106.2844157-1-jpalus@fastmail.com>
* am/trace2-with-valueless-true (2025-01-23) 1 commit
  (merged to 'next' on 2025-01-23 at 7dc4bdaea8)
 + trace2: prevent segfault on config collection with valueless true
 The trace2 code was not prepared to show a configuration variable
 that is set to true using the valueless true syntax, which has been
 corrected.
 Will merge to 'master'.
 source: <pull.1814.v2.git.1736494100622.gitgitgadget@gmail.com>
* kn/reflog-symref-fix (2025-01-23) 1 commit
  (merged to 'next' on 2025-01-23 at 123929bd42)
 + refs: fix creation of reflog entries for symrefs
 reflog entries for symbolic ref updates were broken, which has been
 corrected.
 Will merge to 'master'.
 source: <20250123112944.3922712-1-karthik.188@gmail.com>
* ps/reflog-migration-with-logall-fix (2025-01-22) 1 commit
  (merged to 'next' on 2025-01-23 at 079036d154)
 + refs: fix migration of reflogs respecting "core.logAllRefUpdates"
 The "git refs migrate" command did not migrate the reflog for
 refs/stash, which is the contents of the stashes, which has been
 corrected.
 Will merge to 'master'.
 source: <20250122-b4-pks-reflog-migration-fix-stash-v1-1-27dbae4602f7@pks.im>
* js/libgit-rust (2025-01-16) 6 commits
 - fixup! common-main: split init and exit code into new files
 - Makefile: add option to build and test libgit-rs and libgit-rs-sys
 - libgit: add higher-level libgit crate
 - libgit-sys: also export some config_set functions
 - libgit-sys: introduce Rust wrapper for libgit.a
 - common-main: split init and exit code into new files
 Foreign language interface for Rust into our code base has been added.
 Expecting a reroll.
 cf. <xmqqtt9ypj4m.fsf@gitster.g>
 cf. <Z47jgK-oMjFRSslr@tapette.crustytoothpaste.net>
 cf. <Z47kr0_fYYdaMWyA@tapette.crustytoothpaste.net>
 source: <cover.1736971328.git.steadmon@google.com>
* kn/reflog-migration-fix (2025-01-15) 1 commit
  (merged to 'next' on 2025-01-16 at ae8f9ce9a0)
 + reftable: write correct max_update_index to header
 (this branch is used by kn/reflog-migration-fix-fix and kn/reflog-migration-fix-followup.)
 "git refs migrate" for migrating reflog data was broken.
 On hold.
 cf. <Z4mUizLNUdq_1BgY@tapette.crustytoothpaste.net>
 cf. <CAOLa=ZT4nws0irdZKUuWc70Rv9RUNQuSXnGAt1SnE1O+umSReg@mail.gmail.com>
 source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>
* jc/show-usage-help (2025-01-17) 6 commits
  (merged to 'next' on 2025-01-21 at 5a17181a32)
 + builtin: send usage() help text to standard output
 + oddballs: send usage() help text to standard output
 + builtins: send usage_with_options() help text to standard output
 + usage: add show_usage_if_asked()
 + parse-options: add show_usage_with_options_if_asked()
 + t0012: optionally check that "-h" output goes to stdout
 The help text from "git $cmd -h" appear on the standard output for
 some $cmd and the standard error for others.  The built-in commands
 have been fixed to show them on the standard output consistently.
 Will merge to 'master'.
 cf. <20250117114123.GA2356746@coredump.intra.peff.net>
 source: <20250117213148.3974552-1-gitster@pobox.com>
* kn/pack-write-with-reduced-globals (2025-01-21) 5 commits
 - pack-write: pass hash_algo to internal functions
 - pack-write: pass hash_algo to `write_rev_file()`
 - pack-write: pass hash_algo to `write_idx_file()`
 - pack-write: pass repository to `index_pack_lockfile()`
 - pack-write: pass hash_algo to `fixup_pack_header_footer()`
 Code clean-up.
 Will merge to 'next'.
 source: <20250119-kn-the-repo-cleanup-v3-0-a495fce08d71@gmail.com>
* ps/reftable-sign-compare (2025-01-21) 10 commits
  (merged to 'next' on 2025-01-22 at a5ae1ce801)
 + reftable: address trivial -Wsign-compare warnings
 + reftable/blocksource: adjust `read_block()` to return `ssize_t`
 + reftable/blocksource: adjust type of the block length
 + reftable/block: adjust type of the restart length
 + reftable/block: adapt header and footer size to return a `size_t`
 + reftable/basics: adjust `hash_size()` to return `uint32_t`
 + reftable/basics: adjust `common_prefix_size()` to return `size_t`
 + reftable/record: handle overflows when decoding varints
 + reftable/record: drop unused `print` function pointer
 + meson: stop disabling -Wsign-compare
 The reftable/ library code has been made -Wsign-compare clean.
 Will merge to 'master'.
 source: <20250120-b4-pks-reftable-sign-compare-v2-0-b4566d02e4a5@pks.im>
* sk/unit-tests (2025-01-17) 4 commits
  (merged to 'next' on 2025-01-21 at 799bbc6b82)
 + t/unit-tests: convert reftable tree test to use clar test framework
 + t/unit-tests: adapt priority queue test to use clar test framework
 + t/unit-tests: convert mem-pool test to use clar test framework
 + t/unit-tests: handle dashes in test suite filenames
 Move a few more unit tests to the clar test framework.
 Will merge to 'master'.
 source: <20250117122926.101749-1-kuforiji98@gmail.com>
* zh/gc-expire-to (2025-01-16) 1 commit
 - gc: add `--expire-to` option
 "git gc" learned the "--expire-to" option and passes it down to
 underlying "git repack".
 Needs review.
 source: <pull.1843.v3.git.1736994932003.gitgitgadget@gmail.com>
* jk/pack-header-parse-alignment-fix (2025-01-21) 5 commits
  (merged to 'next' on 2025-01-21 at 60017ef61a)
 + index-pack, unpack-objects: use skip_prefix to avoid magic number
 + index-pack, unpack-objects: use get_be32() for reading pack header
 + parse_pack_header_option(): avoid unaligned memory writes
 + packfile: factor out --pack_header argument parsing
 + bswap.h: squelch potential sparse -Wcast-truncate warnings
 It was possible for "git unpack-objects" and "git index-pack" to
 make an unaligned access, which has been corrected.
 Will merge to 'master'.
 source: <20250119131224.GA1541095@coredump.intra.peff.net>
* kn/reflog-migration-fix-followup (2025-01-22) 4 commits
 - reftable: prevent 'update_index' changes after adding records
 - refs: use 'uint64_t' for 'ref_update.index'
 - refs: mark `ref_transaction_update_reflog()` as static
 - Merge branch 'kn/reflog-migration-fix' into kn/reflog-migration-fix-followup
 (this branch uses kn/reflog-migration-fix.)
 Code clean-up.
 On hold.
 cf. <Z5DgxQuc2j_-5GHg@pks.im>
 source: <20250122-461-corrupted-reftable-followup-v3-0-ae5f88bf04fa@gmail.com>
* mh/connect-sign-compare (2025-01-17) 1 commit
  (merged to 'next' on 2025-01-21 at 6d872e6042)
 + connect: address -Wsign-compare warnings
 The code in connect.c has been updated to work around complaints
 from -Wsign-compare.
 Will merge to 'master'.
 source: <20250117074909.1430067-1-mh@glandium.org>
* ps/build-meson-subtree (2025-01-17) 3 commits
  (merged to 'next' on 2025-01-21 at fe4e60a331)
 + meson: wire up the git-subtree(1) command
 + meson: introduce build option for contrib
 + contrib/subtree: fix building docs
 The meson-driven build is now aware of "git-subtree" housed in
 contrib/subtree hierarchy.
 Will merge to 'master'.
 source: <20250117-b4-pks-build-subtree-v1-0-03c2ed6cc42e@pks.im>
* bf/fetch-set-head-fix (2025-01-23) 1 commit
 - fetch set_head: fix non-mirror remotes in bare repositories
 Fetching into a bare repository incorrectly assumed it always used
 a mirror layout when deciding to update remote-tracking HEAD, which
 has been corrected.
 Expecting a (hopefully small and final) reroll.
 cf. <Z5Mrk02wMdABtrVZ@pks.im>
 source: <20250112165125.130400-1-bence@ferdinandy.com>
* ps/build-meson-fixes (2025-01-22) 12 commits
 - ci: wire up Visual Studio build with Meson
 - ci: raise error when Meson generates warnings
 - meson: fix compilation with Visual Studio
 - meson: make the CSPRNG backend configurable
 - meson: wire up fuzzers
 - meson: wire up generation of distribution archive
 - meson: wire up development environments
 - meson: fix dependencies for generated headers
 - meson: populate project version via GIT-VERSION-GEN
 - GIT-VERSION-GEN: allow running without input and output files
 - GIT-VERSION-GEN: simplify computing the dirty marker
 - Merge branch 'ps/meson-weak-sha1-build' into ps/build-meson-fixes
 (this branch is used by ps/zlib-ng.)
 More build fixes and enhancements on meson based build procedure.
 Will merge to 'next'.
 source: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
* ps/zlib-ng (2025-01-22) 12 commits
 - ci: make "linux-musl" job use zlib-ng
 - ci: switch linux-musl to use Meson
 - compat/zlib: allow use of zlib-ng as backend
 - git-zlib: cast away potential constness of `next_in` pointer
 - compat/zlib: provide stubs for `deflateSetHeader()`
 - compat/zlib: provide `deflateBound()` shim centrally
 - git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
 - compat: introduce new "zlib.h" header
 - git-compat-util: drop `z_const` define
 - compat: drop `uncompress2()` compatibility shim
 - Merge branch 'ps/build-meson-fixes' into ps/zlib-ng
 - Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng
 (this branch uses ps/build-meson-fixes.)
 The code paths to interact with zlib has been cleaned up in
 preparation for building with zlib-ng.
 Needs review.
 source: <20250116-b4-pks-compat-drop-uncompress2-v3-0-f2af1f5c4a06@pks.im>
* rs/ref-fitler-used-atoms-value-fix (2025-01-21) 3 commits
  (merged to 'next' on 2025-01-23 at 714518543f)
 + ref-filter: remove ref_format_clear()
 + ref-filter: move is-base tip to used_atom
 + ref-filter: move ahead-behind bases into used_atom
 "git branch --sort=..." and "git for-each-ref --format=... --sort=..."
 did not work as expected with some atoms, which has been corrected.
 Will merge to 'master'.
 source: <6b824f05-6f16-4cd9-85b7-3b8b236158b4@web.de>
* tb/unsafe-hash-cleanup (2025-01-23) 8 commits
 - hash.h: drop unsafe_ function variants
 - csum-file: introduce hashfile_checkpoint_init()
 - t/helper/test-hash.c: use unsafe_hash_algo()
 - csum-file.c: use unsafe_hash_algo()
 - hash.h: introduce `unsafe_hash_algo()`
 - csum-file.c: extract algop from hashfile_checksum_valid()
 - csum-file: store the hash algorithm as a struct field
 - t/helper/test-tool: implement sha1-unsafe helper
 The API around choosing to use unsafe variant of SHA-1
 implementation has been updated in an attempt to make it harder to
 abuse.
 Will merge to 'next'.
 source: <cover.1737653640.git.me@ttaylorr.com>
* sj/ref-consistency-checks-more (2025-01-06) 10 commits
 - builtin/fsck: add `git refs verify` child process
 - packed-backend: check whether the "packed-refs" is sorted
 - packed-backend: add check for object consistency
 - packed-backend: create "fsck_packed_ref_entry" to store parsing info
 - packed-backend: add "packed-refs" entry consistency check
 - packed-backend: check whether the refname contains NULL binaries
 - packed-backend: add "packed-refs" header consistency check
 - packed-backend: check whether the "packed-refs" is regular
 - builtin/refs.h: get worktrees without reading head info
 - files-backend: add object check for regular ref
 "git fsck" becomes more careful when checking the refs.
 Expecting a reroll.
 cf. <Z4pqVRsCg3KfjJf-@ArchLinux>
 source: <Z3qNUizvHJLgMx1y@ArchLinux>
* mh/credential-cache-authtype-request-fix (2025-01-09) 1 commit
  (merged to 'next' on 2025-01-22 at 51a22e98a1)
 + credential-cache: respect authtype capability
 The "cache" credential back-end did not handle authtype correctly,
 which has been corrected.
 Will merge to 'master'.
 source: <pull.1842.v5.git.1736462721156.gitgitgadget@gmail.com>
* jk/combine-diff-cleanup (2025-01-09) 14 commits
 - tree-diff: make list tail-passing more explicit
 - tree-diff: simplify emit_path() list management
 - tree-diff: use the name "tail" to refer to list tail
 - tree-diff: drop list-tail argument to diff_tree_paths()
 - combine-diff: drop public declaration of combine_diff_path_size()
 - tree-diff: inline path_appendnew()
 - tree-diff: pass whole path string to path_appendnew()
 - tree-diff: drop path_appendnew() alloc optimization
 - run_diff_files(): de-mystify the size of combine_diff_path struct
 - diff: add a comment about combine_diff_path.parent.path
 - combine-diff: use pointer for parent paths
 - tree-diff: clear parent array in path_appendnew()
 - combine-diff: add combine_diff_path_new()
 - run_diff_files(): delay allocation of combine_diff_path
 Code clean-up for code paths around combined diff.
 Will merge to 'next'.
 source: <20250109082723.GA2748497@coredump.intra.peff.net>
* sc/help-autocorrect-one (2025-01-13) 1 commit
 - help: interpret boolean string values for help.autocorrect
 "[help] autocorrect = 1" used to be a way to say "please wait for
 0.1 second after suggesting a typofix of the command name before
 running that command"; now it means "yes, if there is a plausible
 typofix for the command name, please run it immediately".
 Looking good except for "should 0 and false be 'tell it without doing it'?".
 source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
* ja/doc-notes-markup-updates (2025-01-10) 1 commit
  (merged to 'next' on 2025-01-24 at d02f3c8a9c)
 + doc: convert git-notes to new documentation format
 Doc mark-up updates.
 Will merge to 'master'.
 source: <pull.1846.v2.git.1736503703573.gitgitgadget@gmail.com>
* ja/doc-restore-markup-update (2025-01-10) 1 commit
  (merged to 'next' on 2025-01-24 at ba5df28904)
 + doc: convert git-restore to new style format
 Doc mark-up updates.
 Will merge to 'master'.
 source: <pull.1847.v2.git.1736503760086.gitgitgadget@gmail.com>
* ua/os-version-capability (2025-01-17) 6 commits
 - version: introduce osversion.command config for os-version output
 - connect: advertise OS version
 - t5701: add setup test to remove side-effect dependency
 - version: extend get_uname_info() to hide system details
 - version: refactor get_uname_info()
 - version: refactor redact_non_printables()
 The value of "uname -s" is by default sent over the wire as a new
 capability, with an opt-out for privacy-concious folks.
 source: <20250117104639.65608-1-usmanakinyemi202@gmail.com>
* ja/doc-commit-markup-updates (2025-01-15) 5 commits
  (merged to 'next' on 2025-01-23 at aa9235f015)
 + doc: migrate git-commit manpage secondary files to new format
 + doc: convert git commit config to new format
 + doc: make more direct explanations in git commit options
 + doc: the mode param of -u of git commit is optional
 + doc: apply new documentation guidelines to git commit
 Doc updates.
 Will merge to 'master'.
 source: <pull.1845.v2.git.1736972628.gitgitgadget@gmail.com>
* ps/ci-misc-updates (2025-01-10) 10 commits
 - ci: remove stale code for Azure Pipelines
 - ci: use latest Ubuntu release
 - ci: stop special-casing for Ubuntu 16.04
 - gitlab-ci: add linux32 job testing against i386
 - gitlab-ci: remove the "linux-old" job
 - github: simplify computation of the job's distro
 - github: convert all Linux jobs to be containerized
 - github: adapt containerized jobs to be rootless
 - t7422: fix flaky test caused by buffered stdout
 - t0060: fix EBUSY in MinGW when setting up runtime prefix
 CI updates (containerization, dropping stale ones, etc.).
 Will merge to 'master'.
 source: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im>
* sk/strlen-returns-size_t (2024-12-26) 1 commit
  (merged to 'next' on 2025-01-24 at 43464adc45)
 + date.c: Fix type missmatch warings from msvc
 Code clean-up.
 Will merge to 'master'.
 source: <20241223110407.3308-3-soekkle@freenet.de>
* sk/maintenance-remote-prune (2025-01-03) 1 commit
 - maintenance: add prune-remote-refs task
 A new periodic maintenance task to run "git remote prune" has been
 introduced.
 Expecting a reroll.
 source: <pull.1838.v3.git.1735928035056.gitgitgadget@gmail.com>
* jc/show-index-h-update (2024-12-20) 1 commit
 - show-index: the short help should say the command reads from its input
 Doc and short-help text for "show-index" has been clarified to
 stress that the command reads its data from the standard input.
 Will merge to 'next'.
 source: <xmqqfrmidyhk.fsf@gitster.g>
* jc/doc-attr-tree (2024-12-14) 1 commit
 - doc: give attr.tree a bit more visibility
 Make sure that "git --attr-source=X", GIT_ATTR_SOURCE, and
 attr.tree configuration variables appear at the same places in the
 documentation.
 On hold.
 cf. <20241216111112.GA2201417@coredump.intra.peff.net>
 source: <xmqq5xnladwi.fsf@gitster.g>
* ps/3.0-remote-deprecation (2025-01-24) 6 commits
 - remote: announce removal of "branches/" and "remotes/"
 - builtin/pack-redundant: remove subcommand with breaking changes
 - ci: repurpose "linux-gcc" job for deprecations
 - ci: merge linux-gcc-default into linux-gcc
 - Makefile: wire up build option for deprecated features
 - Merge branch 'ps/build' into ps/3.0-remote-deprecation
 Following the procedure we established to introduce breaking
 changes for Git 3.0, allow an early opt-in for removing support of
 $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
 remotes.
 Will merge to 'next'.
 source: <20250122-pks-remote-branches-deprecation-v4-0-5cbf5b28afd5@pks.im>
* cc/lop-remote (2024-12-07) 5 commits
 . doc: add technical design doc for large object promisors
 . promisor-remote: check advertised name or URL
 . Add 'promisor-remote' capability to protocol v2
 . strbuf: refactor strbuf_trim_trailing_ch()
 . version: refactor strbuf_sanitize()
 Expecting a reroll.
 cf. <CAP8UFD3bdEo1_bg+aX52xSGxmg9KfNrpiX+2LwUM-yDqjvfZbQ@mail.gmail.com>
 source: <20241206124248.160494-1-christian.couder@gmail.com>
* ds/backfill (2025-01-23) 6 commits
 - backfill: assume --sparse when sparse-checkout is enabled
 - backfill: add --sparse option
 - backfill: add --min-batch-size=<n> option
 - backfill: basic functionality and tests
 - backfill: add builtin boilerplate
 - Merge branch 'ds/path-walk-1' into ds/backfill
 (this branch uses ds/path-walk-1.)
 Lazy-loading missing files in a blobless clone on demand is costly
 as it tends to be one-blob-at-a-time.  "git backfill" is introduced
 to help bulk-download necessary files beforehand.
 Expecting a reroll.
 cf. <Z4jeQSLmARruE5l3@pks.im>
 source: <pull.1820.v2.git.1734712193.gitgitgadget@gmail.com>
* tb/incremental-midx-part-2 (2024-11-20) 15 commits
 - midx: implement writing incremental MIDX bitmaps
 - pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
 - pack-bitmap.c: keep track of each layer's type bitmaps
 - ewah: implement `struct ewah_or_iterator`
 - pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs
 - pack-bitmap.c: compute disk-usage with incremental MIDXs
 - pack-bitmap.c: teach `rev-list --test-bitmap` about incremental MIDXs
 - pack-bitmap.c: support bitmap pack-reuse with incremental MIDXs
 - pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs
 - pack-bitmap.c: teach `bitmap_for_commit()` about incremental MIDXs
 - pack-bitmap.c: open and store incremental bitmap layers
 - pack-revindex: prepare for incremental MIDX bitmaps
 - Documentation: describe incremental MIDX bitmaps
 - Merge branch 'tb/pseudo-merge-bitmap-fixes' into tb/incremental-midx-part-2
 - Merge branch 'tb/incremental-midx-part-1' into tb/incremental-midx-part-2
 Incrementally updating multi-pack index files.
 Needs review.
 source: <cover.1732054032.git.me@ttaylorr.com>
* ps/send-pack-unhide-error-in-atomic-push (2024-11-14) 2 commits
 - transport: don't ignore git-receive-pack(1) exit code on atomic push
 - t5504: modernize test by moving heredocs into test bodies
 "git push --atomic --porcelain" used to ignore failures from the
 other side, losing the error status from the child process, which
 has been corrected.
 On hold.
 Needs to see if competing parallel topic needs to replace this one.
 cf. <Z5MuCd_GbbLK_puS@pks.im>
 source: <20241113-pks-push-atomic-respect-exit-code-v1-0-7965f01e7f4e@pks.im>
* ds/name-hash-tweaks (2024-12-20) 8 commits
 - pack-objects: add third name hash version
 - pack-objects: prevent name hash version change
 - test-tool: add helper for name-hash values
 - p5313: add size comparison test
 - pack-objects: add GIT_TEST_NAME_HASH_VERSION
 - repack: add --name-hash-version option
 - pack-objects: add --name-hash-version option
 - pack-objects: create new name-hash function version
 "git pack-objects" and its wrapper "git repack" learned an option
 to use an alternative path-hash function to improve delta-base
 selection to produce a packfile with deeper history than window
 size.
 Will merge to 'next'?
 cf. <Z5E5KdbwHE7fmiJx@nand.local>
 source: <pull.1823.v3.git.1734715194.gitgitgadget@gmail.com>
* ds/path-walk-1 (2025-01-22) 8 commits
  (merged to 'next' on 2025-01-23 at 1d3743f005)
 + path-walk: drop redundant parse_tree() call
  (merged to 'next' on 2025-01-22 at 3171845b73)
 + path-walk: reorder object visits
 + path-walk: mark trees and blobs as UNINTERESTING
 + path-walk: visit tags and cached objects
 + path-walk: allow consumer to specify object types
 + t6601: add helper for testing path-walk API
 + test-lib-functions: add test_cmp_sorted
 + path-walk: introduce an object walk by path
 (this branch is used by ds/backfill.)
 Introduce a new API to visit objects in batches based on a common
 path, or by type.
 Will merge to 'master'.
 cf. <Z4jeQSLmARruE5l3@pks.im>
 source: <pull.1818.v4.git.1734711675.gitgitgadget@gmail.com>
* ej/cat-file-remote-object-info (2025-01-14) 8 commits
 - cat-file: add remote-object-info to batch-command
 - transport: add client support for object-info
 - serve: advertise object-info feature
 - fetch-pack: move fetch initialization
 - fetch-pack: refactor packet writing
 - t1006: split test utility functions into new "lib-cat-file.sh"
 - cat-file: add declaration of variable i inside its for loop
 - git-compat-util: add strtoul_ul() with error handling
 "git cat-file --batch" and friends can optionally ask a remote
 server about objects it does not have.
 Comments?
 source: <20250114021502.41499-1-eric.peijian@gmail.com>

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

* jc/move-is-bare-repository-cfg-variable-to-repo (2024-11-07) 3 commits
 . repository: BUG when is_bare_cfg is not initialized
 . setup: initialize is_bare_cfg
 . git: remove is_bare_repository_cfg global variable
 Code rewrite to turn the is_bare_repository_cfg global variable
 into a member in the the_repo singleton repository object.
 Has been in "Waiting for response to reviews" state for too long.
 cf. <xmqqy116xvr3.fsf@gitster.g>
 Seems to break t0021-conversion on Windows.
 cf. https://lore.kernel.org/git/xmqqzfl1hl52.fsf@gitster.g/
 source: <pull.1826.git.git.1730926082.gitgitgadget@gmail.com>
Jeff King· Jan 28, 2025, 16:46 UTC · re: Junio C Hamano · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

On Fri, Jan 24, 2025 at 12:19:00PM -0800, Junio C Hamano wrote:
Show 14 quoted lines
> * bc/doc-adoc-not-txt (2025-01-21) 5 commits
>   (merged to 'next' on 2025-01-24 at 737049d332)
>  + Remove obsolete ".txt" extensions for AsciiDoc files
>  + doc: use .adoc extension for AsciiDoc files
>  + gitattributes: mark AsciiDoc files as LF-only
>  + editorconfig: add .adoc extension
>  + doc: update gitignore for .adoc extension
> 
>  All the documentation .txt files have been renamed to .adoc to help
>  content aware editors.
> 
>  Will cook in 'next' for at least 3 weeks til mid Feb 2025.
>  cf. <xmqqmsfl2gro.fsf@gitster.g>
>  source: <20250120015603.1980991-1-sandals@crustytoothpaste.net>
I noticed CI complaining about a missing include file:
  2025-01-28T15:51:45.3979314Z asciidoc: WARNING: difftool.adoc: line 16: include file not found: /home/runner/work/git/git/Documentation/mergetools-diff.txt

The problem is that the line was introduced by another concurrent branch, aj/difftool-config-doc-fix. So we can't fix it independently on either branch; the line does not exist yet in brian's adoc branch, and the file is still ".txt" in Adam's doc-fix branch.

It has to be fixed in an evil merge of the two (or brian's rebased on Adam's, which has since graduated to master).

-Peff
Junio C Hamano· Jan 28, 2025, 17:59 UTC · re: Jeff King · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

Jeff King <peff@peff.net> writes:
Show 11 quoted lines
> I noticed CI complaining about a missing include file:
>
>   2025-01-28T15:51:45.3979314Z asciidoc: WARNING: difftool.adoc: line 16: include file not found: /home/runner/work/git/git/Documentation/mergetools-diff.txt
>
> The problem is that the line was introduced by another concurrent
> branch, aj/difftool-config-doc-fix. So we can't fix it independently on
> either branch; the line does not exist yet in brian's adoc branch, and
> the file is still ".txt" in Adam's doc-fix branch.
>
> It has to be fixed in an evil merge of the two (or brian's rebased on
> Adam's, which has since graduated to master).

Thanks; I had this one on my radar and I thought there was a merge-fix I made somewhere, but it is likely to have been lost during shuffling the order of merges. Will take a look again.

Thanks.
Junio C Hamano· Jan 28, 2025, 18:26 UTC · re: Junio C Hamano · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

Junio C Hamano <gitster@pobox.com> writes:
Show 19 quoted lines
> Jeff King <peff@peff.net> writes:
>
>> I noticed CI complaining about a missing include file:
>>
>>   2025-01-28T15:51:45.3979314Z asciidoc: WARNING: difftool.adoc: line 16: include file not found: /home/runner/work/git/git/Documentation/mergetools-diff.txt
>>
>> The problem is that the line was introduced by another concurrent
>> branch, aj/difftool-config-doc-fix. So we can't fix it independently on
>> either branch; the line does not exist yet in brian's adoc branch, and
>> the file is still ".txt" in Adam's doc-fix branch.
>>
>> It has to be fixed in an evil merge of the two (or brian's rebased on
>> Adam's, which has since graduated to master).
>
> Thanks; I had this one on my radar and I thought there was a
> merge-fix I made somewhere, but it is likely to have been lost
> during shuffling the order of merges.  Will take a look again.
>
> Thanks.

Here is what I'd directly apply to 'next'. The merge-fix mechanism knows about the same change, so when I merge the bc/doc-adoc-not-txt topic down to 'master', the same tweak will be made as an evil merge.

Thanks.
--- >8 ---
Subject: [PATCH] Fix mismerge at 737049d332

The world order after merging the bc/doc-adoc-not-txt topic is that there is no .txt files in Documentation/ hierarchy, as everything should have been migrated to .adoc suffix.

There were a fiew topics that were simultaneously in flight that got graduated earlier than the topic, hence needed an evil merge to adjust. This commit belatedly adjusts the merge result to account for them. The same merge-fix will be made when the topic eventually graduates to 'master'.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/config/difftool.adoc                              | 2 +-
 .../technical/{api-path-walk.txt => api-path-walk.adoc}         | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/technical/{api-path-walk.txt => api-path-walk.adoc} (100%)
diff --git a/Documentation/config/difftool.adoc b/Documentation/config/difftool.adoc
index 6cd47331a9..4f7d40ce24 100644
--- a/Documentation/config/difftool.adoc
+++ b/Documentation/config/difftool.adoc
@@ -13,7 +13,7 @@ diff.guitool::
 	and requires that a corresponding difftool.<guitool>.cmd variable
 	is defined.
 
-include::{build_dir}/mergetools-diff.txt[]
+include::{build_dir}/mergetools-diff.adoc[]
 
 difftool.<tool>.cmd::
 	Specify the command to invoke the specified diff tool.
diff --git a/Documentation/technical/api-path-walk.txt b/Documentation/technical/api-path-walk.adoc
similarity index 100%
rename from Documentation/technical/api-path-walk.txt
rename to Documentation/technical/api-path-walk.adoc
-- 
2.48.1-325-g31d6edeeb9
Jeff King· Jan 29, 2025, 06:03 UTC · re: Junio C Hamano · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

On Tue, Jan 28, 2025 at 10:26:12AM -0800, Junio C Hamano wrote:
Show 13 quoted lines
> >> It has to be fixed in an evil merge of the two (or brian's rebased on
> >> Adam's, which has since graduated to master).
> >
> > Thanks; I had this one on my radar and I thought there was a
> > merge-fix I made somewhere, but it is likely to have been lost
> > during shuffling the order of merges.  Will take a look again.
> >
> > Thanks.
> 
> Here is what I'd directly apply to 'next'.  The merge-fix mechanism
> knows about the same change, so when I merge the bc/doc-adoc-not-txt
> topic down to 'master', the same tweak will be made as an evil
> merge.
Yeah, that looks perfect, thanks.
-Peff
brian m. carlson· Jan 30, 2025, 02:29 UTC · re: Junio C Hamano · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

On 2025-01-28 at 18:26:12, Junio C Hamano wrote:
> Here is what I'd directly apply to 'next'.  The merge-fix mechanism
> knows about the same change, so when I merge the bc/doc-adoc-not-txt
> topic down to 'master', the same tweak will be made as an evil
> merge.
I agree that seems like the right solution.
-- 
brian m. carlson (they/them or he/him)
Toronto, Ontario, CA
Junio C Hamano· Jan 30, 2025, 17:26 UTC · re: brian m. carlson · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

"brian m. carlson" <sandals@crustytoothpaste.net> writes:
Show 7 quoted lines
> On 2025-01-28 at 18:26:12, Junio C Hamano wrote:
>> Here is what I'd directly apply to 'next'.  The merge-fix mechanism
>> knows about the same change, so when I merge the bc/doc-adoc-not-txt
>> topic down to 'master', the same tweak will be made as an evil
>> merge.
>
> I agree that seems like the right solution.
Thanks.
Derrick Stolee· Jan 29, 2025, 13:40 UTC · re: Junio C Hamano · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

On 1/24/25 3:19 PM, Junio C Hamano wrote:
 > * ds/name-hash-tweaks (2024-12-20) 8 commits
 >   - pack-objects: add third name hash version
 >   - pack-objects: prevent name hash version change
 >   - test-tool: add helper for name-hash values
 >   - p5313: add size comparison test
 >   - pack-objects: add GIT_TEST_NAME_HASH_VERSION
 >   - repack: add --name-hash-version option
 >   - pack-objects: add --name-hash-version option
 >   - pack-objects: create new name-hash function version
 >
 >   "git pack-objects" and its wrapper "git repack" learned an option
 >   to use an alternative path-hash function to improve delta-base
 >   selection to produce a packfile with deeper history than window
 >   size.
 >
 >   Will merge to 'next'?
 >   cf. <Z5E5KdbwHE7fmiJx@nand.local>
 >   source: <pull.1823.v3.git.1734715194.gitgitgadget@gmail.com>

After Taylor's review, I believe the latest version is ready for 'next'.

Show 16 quoted lines
> * ds/backfill (2025-01-23) 6 commits
>   - backfill: assume --sparse when sparse-checkout is enabled
>   - backfill: add --sparse option
>   - backfill: add --min-batch-size=<n> option
>   - backfill: basic functionality and tests
>   - backfill: add builtin boilerplate
>   - Merge branch 'ds/path-walk-1' into ds/backfill
>   (this branch uses ds/path-walk-1.)
> 
>   Lazy-loading missing files in a blobless clone on demand is costly
>   as it tends to be one-blob-at-a-time.  "git backfill" is introduced
>   to help bulk-download necessary files beforehand.
> 
>   Expecting a reroll.
>   cf. <Z4jeQSLmARruE5l3@pks.im>
>   source: <pull.1820.v2.git.1734712193.gitgitgadget@gmail.com>

I plan to reroll this in a week or so. I wanted to focus on the other series for a bit and will bring this back up (and may submit the 'git-survey' series as well).

Thanks, -Stolee

Junio C Hamano· Jan 29, 2025, 15:03 UTC · re: Derrick Stolee · lore

Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

Derrick Stolee <stolee@gmail.com> writes:
Show 14 quoted lines
> On 1/24/25 3:19 PM, Junio C Hamano wrote:
>
>
>> * ds/name-hash-tweaks (2024-12-20) 8 commits
> ...
> After Taylor's review, I believe the latest version is ready
> for 'next'.
>
>
>> * ds/backfill (2025-01-23) 6 commits
>> ...
> I plan to reroll this in a week or so. I wanted to focus on the
> other series for a bit and will bring this back up (and may submit
> the 'git-survey' series as well).
Excellent.  Thanks.

← back to recent threads