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). Let's wait for git-gui, gitk, and possibly po/ and delay the tagging of the -rc1. Many people are already offline for the end-of-year holidays and it is a slow week, and 'master' front has too many new things graduated from 'next' a bit too early for me to feel comfortable. 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'] * as/show-index-uninitialized-hash (2024-11-11) 2 commits (merged to 'next' on 2024-12-16 at b54e9a56f0) + t5300: add test for 'show-index --object-format' + show-index: fix uninitialized hash function Regression fix for 'show-index' when run outside of a repository. source: <20241109092739.14276-1-abhijeet.nkt@xxxxxxxxx> * jk/prio-queue-sign-compare-fix (2024-12-20) 1 commit (merged to 'next' on 2024-12-21 at 11a5c3d11f) + prio-queue: use size_t rather than int for size Type clean-up. source: <20241220084949.GA132704@xxxxxxxxxxxxxxxxxxxxxxx> * js/github-windows-setup-fix (2024-12-17) 1 commit (merged to 'next' on 2024-12-17 at 6d59340ec5) + GitHub ci(windows): speed up initializing Git for Windows' minimal SDK again Revert recent changes to the way windows environment is set up for GitHub CI. source: <pull.1841.git.1734447458896.gitgitgadget@xxxxxxxxx> * js/mingw-rename-fix (2024-12-17) 1 commit (merged to 'next' on 2024-12-17 at 57dc9a0ebb) + mingw_rename: do support directory renames Update the way rename() emulation on Windows handle directories to correct an earlier attempt to do the same. source: <pull.1839.git.1734439924842.gitgitgadget@xxxxxxxxx> * js/ps-build-cmake-fixup (2024-12-17) 5 commits (merged to 'next' on 2024-12-17 at 653a20d2f5) + cmake/vcxproj: stop special-casing `remote-ext` + cmake: put the Perl modules into the correct location again + cmake: use the correct file name for the Perl header + cmake(mergetools): better support for out-of-tree builds + cmake: better support for out-of-tree builds follow-up Build fixes for Windows. source: <pull.1840.git.1734456721.gitgitgadget@xxxxxxxxx> * js/range-diff-diff-merges (2024-12-16) 3 commits (merged to 'next' on 2024-12-18 at 47394ea998) + range-diff: introduce the convenience option `--remerge-diff` + range-diff: optionally include merge commits' diffs in the analysis + Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges "git range-diff" learned to optionally show and compare merge commits in the ranges being compared, with the --diff-merges option. source: <pull.1734.v3.git.1734358282.gitgitgadget@xxxxxxxxx> * kl/doc-build-fix (2024-12-17) 1 commit (merged to 'next' on 2024-12-21 at d6f8295805) + doc: remove extra quotes in generated docs Build fix. source: <pull.1847.v2.git.git.1734483422181.gitgitgadget@xxxxxxxxx> * kn/reflog-migration (2024-12-20) 10 commits (merged to 'next' on 2024-12-22 at b75456bef5) + refs: mark invalid refname message for translation (merged to 'next' on 2024-12-18 at 5634446b20) + refs: add support for migrating reflogs + refs: allow multiple reflog entries for the same refname + refs: introduce the `ref_transaction_update_reflog` function + refs: add `committer_info` to `ref_transaction_add_update()` + refs: extract out refname verification in transactions + refs/files: add count field to ref_lock + refs: add `index` field to `struct ref_udpate` + refs: include committer info in `ref_update` struct + Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migration (this branch uses kn/reftable-writer-log-write-verify.) "git refs migrate" learned to also migrate the reflog data across backends. source: <20241216-320-git-refs-migrate-reflogs-v4-0-d7cd3f197453@xxxxxxxxx> source: <20241220125837.2774153-1-karthik.188@xxxxxxxxx> * kn/reftable-writer-log-write-verify (2024-12-07) 1 commit (merged to 'next' on 2024-12-15 at 7e6b58d98e) + reftable/writer: ensure valid range for log's update_index (this branch is used by kn/reflog-migration.) Reftable backend adds check for upper limit of log's update_index. source: <20241206-424-reftable-writer-add-check-for-limits-v2-1-82ca350b10be@xxxxxxxxx> * ma/asciidoctor-build-fixes (2024-12-20) 4 commits (merged to 'next' on 2024-12-22 at 7a2aad750e) + asciidoctor-extensions.rb.in: inject GIT_DATE + asciidoctor-extensions.rb.in: add missing word + asciidoctor-extensions.rb.in: delete existing <refmiscinfo/> + Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixes (this branch uses ps/build-hotfix.) A topic to optionally build with meson, which has graduated to 'master' recently, broke Documentation pipeline with asciidoctor for the normal Makefile build as well as meson-based one, which have been corrected. cf. <Z2abxaGVzA5Kce-s@xxxxxx> source: <cover.1734734612.git.martin.agren@xxxxxxxxx> * ps/build-hotfix (2024-12-20) 6 commits (merged to 'next' on 2024-12-22 at 0d4dfd121e) + meson: add options to override build information + GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE + GIT-VERSION-GEN: fix overriding GIT_VERSION + Makefile: introduce template for GIT-VERSION-GEN + Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs + Makefile: stop including "GIT-VERSION-FILE" in docs (this branch is used by ma/asciidoctor-build-fixes.) A topic to optionally build with meson, which has graduated to 'master' recently, has regressed the normal Makefile build, which is being corrected. source: <20241220-b4-pks-git-version-via-environment-v3-0-1fd79b52a5fb@xxxxxx> * ps/build-meson-gitweb (2024-12-20) 1 commit (merged to 'next' on 2024-12-21 at f775554ea5) + meson: skip gitweb build when Perl is disabled meson-based build still tried to build and install gitweb even when Perl is disabled, which has been corrected. source: <20241220-b4-pks-meson-fix-gitweb-wo-perl-v2-1-18ab23dd6446@xxxxxx> * ps/build-sign-compare (2024-12-06) 16 commits (merged to 'next' on 2024-12-16 at 1ddb1485df) + t/helper: don't depend on implicit wraparound + scalar: address -Wsign-compare warnings + builtin/patch-id: fix type of `get_one_patchid()` + builtin/blame: fix type of `length` variable when emitting object ID + gpg-interface: address -Wsign-comparison warnings + daemon: fix type of `max_connections` + daemon: fix loops that have mismatching integer types + global: trivial conversions to fix `-Wsign-compare` warnings + pkt-line: fix -Wsign-compare warning on 32 bit platform + csum-file: fix -Wsign-compare warning on 32-bit platform + diff.h: fix index used to loop through unsigned integer + config.mak.dev: drop `-Wno-sign-compare` + global: mark code units that generate warnings with `-Wsign-compare` + compat/win32: fix -Wsign-compare warning in "wWinMain()" + compat/regex: explicitly ignore "-Wsign-compare" warnings + git-compat-util: introduce macros to disable "-Wsign-compare" warnings (this branch is used by ps/the-repository.) Start working to make the codebase buildable with -Wsign-compare. source: <20241206-pks-sign-compare-v4-0-0344c6dfb219@xxxxxx> * ps/ci-gitlab-update (2024-12-12) 4 commits (merged to 'next' on 2024-12-15 at e0ca818197) + ci/lib: fix "CI setup" sections with GitLab CI + ci/lib: do not interpret escape sequences in `group ()` arguments + ci/lib: remove duplicate trap to end "CI setup" group + gitlab-ci: update macOS images to Sonoma GitLab CI updates. source: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@xxxxxx> * ps/ci-meson (2024-12-13) 10 commits (merged to 'next' on 2024-12-17 at fc95a5a9cb) + ci: wire up Meson builds + t: introduce compatibility options to clar-based tests + t: fix out-of-tree tests for some git-p4 tests + Makefile: detect missing Meson tests + meson: detect missing tests at configure time + t/unit-tests: rename clar-based unit tests to have a common prefix + Makefile: drop -DSUPPRESS_ANNOTATED_LEAKS + ci/lib: support custom output directories when creating test artifacts + Merge branch 'ps/build' into ps/ci-meson + Merge branch 'cw/worktree-extension' into ps/ci-meson The meson-build procedure is integrated into CI to catch and prevent bitrotting. cf. <87zfkwgehr.fsf@xxxxxxxxx> source: <20241213-pks-meson-ci-v2-0-634affccc694@xxxxxx> * ps/reftable-alloc-failures-zalloc-fix (2024-12-22) 4 commits (merged to 'next' on 2024-12-22 at 92bc55b18e) + reftable/basics: return NULL on zero-sized allocations + reftable/stack: fix zero-sized allocation when there are no readers + reftable/merged: fix zero-sized allocation when there are no readers + reftable/stack: don't perform auto-compaction with less than two tables Recent reftable updates mistook a NULL return from a request for 0-byte allocation as OOM and died unnecessarily, which has been corrected. source: <20241222-b4-pks-reftable-oom-fix-without-readers-v2-0-19550090d15a@xxxxxx> * sk/calloc-not-malloc-plus-memset (2024-12-18) 1 commit (merged to 'next' on 2024-12-18 at 5af85a77f3) + git: use calloc instead of malloc + memset where possible Code clean-up. source: <pull.1390.v11.git.git.1734540512582.gitgitgadget@xxxxxxxxx> * tb/bitmap-fix-pack-reuse (2024-12-18) 1 commit (merged to 'next' on 2024-12-21 at 104463402b) + pack-bitmap.c: ensure pack validity for all reuse packs Code to reuse objects based on bitmap contents have been tightened to avoid race condition even when multiple packs are involved. source: <7fdbfadc04926efc094633b238a55168c92e3d58.1734117577.git.me@xxxxxxxxxxxx> -------------------------------------------------- [New Topics] * 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. Comments? source: <xmqqfrmidyhk.fsf@gitster.g> -------------------------------------------------- [Cooking] * ps/the-repository (2024-12-18) 15 commits - match-trees: stop using `the_repository` - graph: stop using `the_repository` - add-interactive: stop using `the_repository` - tmp-objdir: stop using `the_repository` - resolve-undo: stop using `the_repository` - credential: stop using `the_repository` - mailinfo: stop using `the_repository` - diagnose: stop using `the_repository` - server-info: stop using `the_repository` - send-pack: stop using `the_repository` - serve: stop using `the_repository` - trace: stop using `the_repository` - pager: stop using `the_repository` - progress: stop using `the_repository` - Merge branch 'ps/build-sign-compare' into ps/the-repository More code paths have a repository passed through the callchain, instead of assuming the primary the_repository object. source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@xxxxxx> * ps/build-meson-html (2024-12-13) 11 commits - meson: install static files for HTML documentation - meson: generate articles - Documentation: refactor "howto-index.sh" for out-of-tree builds - Documentation: refactor "api-index.sh" for out-of-tree builds - meson: generate user manual - Documentation: inline user-manual.conf - meson: generate HTML pages for all man page categories - meson: fix generation of merge tools - meson: properly wire up dependencies for our docs - meson: wire up support for AsciiDoctor - Merge branch 'ps/build' into ps/build-meson-html The build procedure based on meson learned to generate HTML documention pages. Needs review. On hold. source: <20241213-b4-pks-meson-docs-v1-0-0c7895952cd3@xxxxxx> * 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@xxxxxxxxxxxxxxxxxxxxxxx> source: <xmqq5xnladwi.fsf@gitster.g> * ps/3.0-remote-deprecation (2024-12-12) 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. Needs review. source: <20241211-pks-remote-branches-deprecation-v1-0-1431e2369135@xxxxxx> * 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@xxxxxxxxxxxxxx> source: <20241206124248.160494-1-christian.couder@xxxxxxxxx> * ds/backfill (2024-12-20) 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. Comments? source: <pull.1820.v2.git.1734712193.gitgitgadget@xxxxxxxxx> * re/submodule-parse-opt (2024-12-11) 7 commits (merged to 'next' on 2024-12-21 at 9e65a56a63) + git-submodule.sh: rename some variables + git-submodule.sh: improve variables readability + git-submodule.sh: add some comments + git-submodule.sh: get rid of unused variable + git-submodule.sh: get rid of isnumber + git-submodule.sh: improve parsing of short options + git-submodule.sh: improve parsing of some long options "git submodule" learned various ways to spell the same option, e.g. "--branch=B" can be spelled "--branch B" or "-bB". Will cook in 'next'. source: <20241211063234.7610-1-royeldar0@xxxxxxxxx> * tb/unsafe-hash-test (2024-11-21) 2 commits - t/helper/test-tool: implement sha1-unsafe helper - t/helper/test-sha1: prepare for an unsafe mode Preliminary addition to the test tool to allow a plain SHA-1 hash algorithm without collision protection. Comments? cf. <xmqqr073antj.fsf@gitster.g> source: <cover.1730833506.git.me@xxxxxxxxxxxx> * 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@xxxxxxxxxxxx> * 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. Needs to see if competing parallel topic needs to replace this one. source: <20241113-pks-push-atomic-respect-exit-code-v1-0-7965f01e7f4e@xxxxxx> * 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. Waiting for response to reviews. 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@xxxxxxxxx> * 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. Comments? source: <pull.1823.v3.git.1734715194.gitgitgadget@xxxxxxxxx> * ds/path-walk-1 (2024-12-20) 7 commits - 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. Comments? source: <pull.1818.v4.git.1734711675.gitgitgadget@xxxxxxxxx> * km/config-remote-by-name (2024-10-21) 1 commit - config: support remote name in includeIf.hasconfig condition Support conditionally including configuration by remote name, instead of just URL. Will discard? source: <20241020173216.40852-2-ken@xxxxxxxxxx> * y5/diff-pager (2024-10-21) 1 commit - diff: setup pager only before diff contents truly ready Delay setting up the pager in 'git diff' until after the diff contents itself is fully prepared. Will discard? source: <pull.1817.git.git.1729370390416.gitgitgadget@xxxxxxxxx> * ej/cat-file-remote-object-info (2024-11-25) 6 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 - cat-file: add declaration of variable i inside its for loop "git cat-file --batch" and friends can optionally ask a remote server about objects it does not have. Expecting a reroll. cf. <Z0RIrKwUnaWWm_gJ@xxxxxx> source: <20241125053616.25170-1-eric.peijian@xxxxxxxxx> * js/libgit-rust (2024-10-16) 5 commits - 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 A rust binding to libgit.a functions has been introduced. Will discard? source: <cover.1729032373.git.steadmon@xxxxxxxxxx>
