Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-scm/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ps/fix-reinit-includeif-onbranch (2024-05-22) 1 commit (merged to 'next' on 2024-05-25 at 89c035186d) + setup: fix bug with "includeIf.onbranch" when initializing dir "git init" in an already created directory, when the user configuration has includeif.onbranch, started to fail recently, which has been corrected. source: <cf182bb9ee7d4a7eb46e5dbf4f3ef5deb198d823.1716374321.git.ps@xxxxxx> * th/push-local-ff-check-without-lazy-fetch (2024-05-22) 1 commit (merged to 'next' on 2024-05-25 at 520b6b2897) + push: don't fetch commit object when checking existence When "git push" notices that the commit at the tip of the ref on the other side it is about to overwrite does not exist locally, it used to first try fetching it if the local repository is a partial clone. The command has been taught not to do so and immediately fail instead. source: <20240522201559.1677959-1-tom@xxxxxxxxxx> -------------------------------------------------- [New Topics] * jk/sparse-leakfix (2024-05-31) 14 commits - sparse-checkout: free duplicate hashmap entries - sparse-checkout: free string list after displaying - sparse-checkout: free pattern list in sparse_checkout_list() - sparse-checkout: free sparse_filename after use - sparse-checkout: refactor temporary sparse_checkout_patterns - sparse-checkout: always free "line" strbuf after reading input - sparse-checkout: reuse --stdin buffer when reading patterns - dir.c: always copy input to add_pattern() - dir.c: free removed sparse-pattern hashmap entries - sparse-checkout: clear patterns when init() sees existing sparse file - dir.c: free strings in sparse cone pattern hashmaps - sparse-checkout: pass string literals directly to add_pattern() - sparse-checkout: free string list in write_cone_to_file() - Merge branch 'jk/leakfixes' into jk/sparse-leakfix (this branch uses jk/leakfixes and ps/leakfixes.) Many memory leaks in the sparse-checkout code paths have been plugged. Will merge to 'next'? source: <20240531112433.GA428583@xxxxxxxxxxxxxxxxxxxxxxx> * jk/cap-exclude-file-size (2024-05-31) 1 commit - dir.c: skip .gitignore, etc larger than INT_MAX An overly large ".gitignore" files are now rejected silently. Will merge to 'next'. source: <20240531120034.GA442032@xxxxxxxxxxxxxxxxxxxxxxx> * ps/leakfixes-more (2024-06-03) 30 commits - builtin/blame: fix leaking ignore revs files - builtin/blame: fix leaking prefixed paths - blame: fix leaking data for blame scoreboards - line-range: plug leaking find functions - merge: fix leaking merge bases - builtin/merge: fix leaking `struct cmdnames` in `get_strategy()` - sequencer: fix memory leaks in `make_script_with_merges()` - builtin/clone: plug leaking HEAD ref in `wanted_peer_refs()` - apply: fix leaking string in `match_fragment()` - sequencer: fix leaking string buffer in `commit_staged_changes()` - commit: fix leaking parents when calling `commit_tree_extended()` - config: fix leaking "core.notesref" variable - rerere: fix various trivial leaks - builtin/stash: fix leak in `show_stash()` - revision: free diff options - builtin/log: fix leaking commit list in git-cherry(1) - merge-recursive: fix memory leak when finalizing merge - builtin/merge-recursive: fix leaking object ID bases - builtin/difftool: plug memory leaks in `run_dir_diff()` - object-name: free leaking object contexts - builtin/rev-list: fix leaking bitmap index when calculating disk usage - notes: fix memory leak when pruning notes - revision: fix leaking display notes - merge-recursive: fix leaging rename conflict info - biultin/rev-parse: fix memory leaks in `--parseopt` mode - bundle: plug leaks in `create_bundle()` - notes-utils: free note trees when releasing copied notes - parse-options: fix leaks for users of OPT_FILENAME - revision: fix memory leak when reversing revisions - Merge branch 'ps/leakfixes' into ps/leakfixes-more (this branch uses ps/leakfixes.) More memory leaks have been plugged. Needs review. source: <cover.1717402439.git.ps@xxxxxx> -------------------------------------------------- [Cooking] * gt/decorate-unit-test (2024-05-28) 1 commit - t/: migrate helper/test-example-decorate to the unit testing framework A test helper that essentially is unit tests on the "decorate" logic has been rewritten using the unit-tests framework. Will merge to 'next'? source: <20240528125837.31090-1-shyamthakkar001@xxxxxxxxx> * jc/safe-directory-leading-path (2024-05-29) 1 commit - safe.directory: allow "lead/ing/path/*" match The safe.directory configuration knob has been updated to optionally allow leading path matches. Will merge to 'next'. source: <xmqqplt4zjw7.fsf@gitster.g> * ps/no-writable-strings (2024-06-03) 28 commits - config.mak.dev: enable `-Wwrite-strings` warning - builtin/merge: always store allocated strings in `pull_twohead` - builtin/rebase: always store allocated string in `options.strategy` - builtin/rebase: do not assign default backend to non-constant field - imap-send: fix leaking memory in `imap_server_conf` - imap-send: drop global `imap_server_conf` variable - mailmap: always store allocated strings in mailmap blob - revision: always store allocated strings in output encoding - remote-curl: avoid assigning string constant to non-const variable - send-pack: always allocate receive status - parse-options: cast long name for OPTION_ALIAS - http: do not assign string constant to non-const field - compat/win32: fix const-correctness with string constants - pretty: add casts for decoration option pointers - object-file: make `buf` parameter of `index_mem()` a constant - object-file: mark cached object buffers as const - ident: add casts for fallback name and GECOS - entry: refactor how we remove items for delayed checkouts - line-log: always allocate the output prefix - line-log: stop assigning string constant to file parent buffer - diff: cast string constant in `fill_textconv()` - builtin/remote: cast away constness in `get_head_names()` - refspec: remove global tag refspec structure - reftable: cast away constness when assigning constants to records - refs/reftable: stop micro-optimizing refname allocations on copy - global: convert intentionally-leaking config strings to consts - global: improve const correctness when assigning string constants - Merge branch 'ps/leakfixes' into ps/no-writable-strings (this branch uses ps/leakfixes.) Building with "-Werror -Wwrite-strings" is now supported. Needs review. source: <cover.1717402403.git.ps@xxxxxx> * cp/reftable-unit-test (2024-05-30) 5 commits - t: improve the test-case for parse_names() - t: add test for put_be16() - t: move tests from reftable/record_test.c to the new unit test - t: move tests from reftable/stack_test.c to the new unit test - t: move reftable/basics_test.c to the unit testing framework Reimplement basic unit tests for reftable under the unit test framework. Will merge to 'next'. source: <20240529171439.18271-1-chandrapratap3519@xxxxxxxxx> * jc/t1517-more (2024-05-31) 1 commit (merged to 'next' on 2024-06-03 at 10b71e2a60) + t1517: more coverage for commands that work without repository "smoke tests" to ensure git commands that are designed to run outside repositories do work. Will merge to 'master'. source: <xmqqwmnajrrk.fsf@gitster.g> * jk/leakfixes (2024-05-30) 6 commits (merged to 'next' on 2024-06-03 at 1e8a6276a1) + mv: replace src_dir with a strvec + mv: factor out empty src_dir removal + mv: move src_dir cleanup to end of cmd_mv() + t-strvec: mark variable-arg helper with LAST_ARG_MUST_BE_NULL + t-strvec: use va_end() to match va_start() + Merge branch 'ps/leakfixes' into jk/leakfixes (this branch is used by jk/sparse-leakfix; uses ps/leakfixes.) Memory leaks in "git mv" has been plugged. Will merge to 'master'. source: <20240530063857.GA1942535@xxxxxxxxxxxxxxxxxxxxxxx> * gt/t-hash-unit-test (2024-05-29) 2 commits - t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash - strbuf: introduce strbuf_addstrings() to repeatedly add a string A pair of test helpers that essentially are unit tests on hash algorithms have been rewritten using the unit-tests framework. Will merge to 'next'? source: <20240529080030.64410-1-shyamthakkar001@xxxxxxxxx> * pp/add-parse-range-unit-test (2024-05-27) 1 commit - apply: add unit tests for parse_range A unit test for code that parses the hunk offset and length from a patch fragment header as been added. Will merge to 'next'? source: <pull.1677.v2.git.git.1716710073910.gitgitgadget@xxxxxxxxx> * rs/difftool-env-simplify (2024-05-27) 1 commit (merged to 'next' on 2024-05-29 at 4d3776a989) + difftool: add env vars directly in run_file_diff() Code simplification. Will merge to 'master'. source: <c7c843b9-0ccf-4bcb-a036-d794729a99d6@xxxxxx> * jc/format-patch-with-range-diff (2024-05-24) 2 commits - format-patch: move range/inter diff at the end of a single patch output - show_log: factor out interdiff/range-diff generation Move inter/range-diff output to the end of the patch when format-patch adds it to a single patch, instead of writing it before the patch text, to be consistent with what is done for a cover letter for a multi-patch series. Will merge to 'next'? source: <20240523225007.2871766-1-gitster@xxxxxxxxx> * cc/upload-pack-missing-action (2024-05-24) 3 commits - upload-pack: allow configuring a missing-action - pack-objects: use the missing action API - rev-list: refactor --missing=<missing-action> Allow a server S that is a lazy clone of another repository X to respond to a request by C that is a lazy clone of S in a way that it omits objects it itself does not have (and has to be lazily fetched from X). I would say this is a terribly irresponsive design, especially there is no negociation for S to learn if the objects it is going to omit is obtainable by C from elsewhere. Will discard. source: <20240524163926.2019648-1-christian.couder@xxxxxxxxx> * iw/trace-argv-on-alias (2024-05-31) 3 commits (merged to 'next' on 2024-06-03 at 190af38284) + run-command: show prepared command + Documentation: alias: add notes on shell expansion + Documentation: alias: rework notes into points Log the alias-expanded command lines to the trace output. Will merge to 'master'. source: <20240525234454.1489598-1-iwienand@xxxxxxxxxx> * ps/document-breaking-changes (2024-06-03) 4 commits - BreakingChanges: document that we do not plan to deprecate git-checkout - BreakingChanges: document removal of grafting - BreakingChanges: document upcoming change from "sha1" to "sha256" - docs: introduce document to announce breaking changes The structure of the document that records longer-term project decisions to deprecate/remove/update various behaviour has been outlined. Under discussion. source: <cover.1717402497.git.ps@xxxxxx> * ps/leakfixes (2024-05-27) 19 commits (merged to 'next' on 2024-05-29 at e75dcb3beb) + builtin/mv: fix leaks for submodule gitfile paths + builtin/mv: refactor to use `struct strvec` + builtin/mv duplicate string list memory + builtin/mv: refactor `add_slash()` to always return allocated strings + strvec: add functions to replace and remove strings + submodule: fix leaking memory for submodule entries + commit-reach: fix memory leak in `ahead_behind()` + builtin/credential: clear credential before exit + config: plug various memory leaks + config: clarify memory ownership in `git_config_string()` + builtin/log: stop using globals for format config + builtin/log: stop using globals for log config + convert: refactor code to clarify ownership of check_roundtrip_encoding + diff: refactor code to clarify memory ownership of prefixes + config: clarify memory ownership in `git_config_pathname()` + http: refactor code to clarify memory ownership + checkout: clarify memory ownership in `unique_tracking_name()` + strbuf: fix leak when `appendwholeline()` fails with EOF + transport-helper: fix leaking helper name (this branch is used by jk/leakfixes, jk/sparse-leakfix, ps/leakfixes-more and ps/no-writable-strings.) Leakfixes. Will merge to 'master'. source: <cover.1716810168.git.ps@xxxxxx> * ps/ref-storage-migration (2024-06-03) 14 commits - builtin/refs: new command to migrate ref storage formats - refs: implement logic to migrate between ref storage formats - refs: implement removal of ref storages - worktree: don't store main worktree twice - reftable: inline `merged_table_release()` - refs/files: fix NULL pointer deref when releasing ref store - refs/files: extract function to iterate through root refs - refs/files: refactor `add_pseudoref_and_head_entries()` - refs: allow to skip creation of reflog entries - refs: pass storage format to `ref_store_init()` explicitly - refs: convert ref storage format to an enum - setup: unset ref storage when reinitializing repository version - Merge branch 'ps/pseudo-ref-terminology' into ps/ref-storage-migration - Merge branch 'ps/refs-without-the-repository-updates' into ps/ref-storage-migration Allow migrating a repository that uses the files backend for its ref storage to use the reftable backend, with limitations. Will merge to 'next'? source: <cover.1717402363.git.ps@xxxxxx> * tb/midx-write-cleanup (2024-05-30) 8 commits (merged to 'next' on 2024-05-31 at 03f3d27e4f) + pack-bitmap.c: reimplement `midx_bitmap_filename()` with helper + midx: replace `get_midx_rev_filename()` with a generic helper + midx-write.c: support reading an existing MIDX with `packs_to_include` + midx-write.c: extract `fill_packs_from_midx()` + midx-write.c: extract `should_include_pack()` + midx-write.c: pass `start_pack` to `compute_sorted_entries()` + midx-write.c: reduce argument count for `get_sorted_entries()` + midx-write.c: tolerate `--preferred-pack` without bitmaps Code clean-up around writing the .midx files. Will merge to 'master'. source: <cover.1717023301.git.me@xxxxxxxxxxxx> * tb/pseudo-merge-reachability-bitmap (2024-05-24) 25 commits (merged to 'next' on 2024-06-03 at fcaa39de12) + t/perf: implement performance tests for pseudo-merge bitmaps + pseudo-merge: implement support for finding existing merges + ewah: `bitmap_equals_ewah()` + pack-bitmap: extra trace2 information + pack-bitmap.c: use pseudo-merges during traversal + t/test-lib-functions.sh: support `--notick` in `test_commit_bulk()` + pack-bitmap: implement test helpers for pseudo-merge + ewah: implement `ewah_bitmap_popcount()` + pseudo-merge: implement support for reading pseudo-merge commits + pack-bitmap.c: read pseudo-merge extension + pseudo-merge: scaffolding for reads + pack-bitmap: extract `read_bitmap()` function + pack-bitmap-write.c: write pseudo-merge table + pseudo-merge: implement support for selecting pseudo-merge commits + config: introduce `git_config_double()` + pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public + pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()` + pack-bitmap-write: support storing pseudo-merge commits + pseudo-merge.ch: initial commit + pack-bitmap: move some initialization to `bitmap_writer_init()` + ewah: implement `ewah_bitmap_is_subset()` + Documentation/technical: describe pseudo-merge bitmaps format + Documentation/gitpacking.txt: describe pseudo-merge bitmaps + Documentation/gitpacking.txt: initial commit + Merge branch 'tb/pack-bitmap-write-cleanups' into tb/pseudo-merge-reachability-bitmap The pseudo-merge reachability bitmap to help more efficient storage of the reachability bitmap in a repository with too many refs. Will merge to 'master'. source: <cover.1716499565.git.me@xxxxxxxxxxxx> * th/quiet-lazy-fetch-from-promisor (2024-05-26) 1 commit (merged to 'next' on 2024-05-29 at bb12492199) + promisor-remote: add promisor.quiet configuration option The promisor.quiet configuration knob can be set to true to make lazy fetching from promisor remotes silent. Will merge to 'master'. source: <20240525100927.2949808-1-tom@xxxxxxxxxx> * kn/update-ref-symref (2024-05-30) 7 commits - update-ref: add support for 'symref-update' command - reftable: pick either 'oid' or 'target' for new updates - update-ref: add support for 'symref-create' command - update-ref: add support for 'symref-delete' command - update-ref: add support for 'symref-verify' command - refs: create and use `ref_update_expects_existing_old_ref()` - Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref "git update-ref --stdin" learned to handle transactional updates of symbolic-refs. Expecting a (hopefully minor and final) reroll. source: <20240514124411.1037019-1-knayak@xxxxxxxxxx> * mt/openindiana-scalar (2024-05-17) 1 commit (merged to 'next' on 2024-05-30 at 190d4465cf) + scalar: make enlistment delete to work on all POSIX platforms Avoid removing the $(cwd) for portability. Will merge to 'master'. source: <Zkds81OB7C5bTCl_@telcontar> * ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit - archive: make --add-virtual-file honor --prefix The "--add-virtual-file" option of "git archive", added primarily to help "git diagnose", has always ignored the "--prefix", but been documented to honor it. Iffy if updating the implementation is the best approach. cf. <bc3711a7-37d5-46bc-979e-83bd0b2cf900@xxxxxx> source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@xxxxxxxxx> * tb/precompose-getcwd (2024-05-31) 1 commit - macOS: ls-files path fails if path of workdir is NFD We forgot to normalize the result of getcwd() to NFC on macOS where all other paths are normalized, which has been corrected. source: <20240531193156.28046-1-tboegi@xxxxxx> * pw/rebase-i-error-message (2024-05-30) 2 commits - rebase -i: improve error message when picking merge - rebase -i: pass struct replay_opts to parse_insn_line() When the user adds to "git rebase -i" instruction to "pick" a merge commit, the error experience is not pleasant. Such an error is now caught earlier in the process that parses the todo list. Expecting a reroll. cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@xxxxxxxxx> source: <pull.1672.v3.git.1717076630.gitgitgadget@xxxxxxxxx> * ew/khash-to-khashl (2024-03-28) 3 commits - khashl: fix ensemble lookups on empty table - treewide: switch to khashl for memory savings - list-objects-filter: use kh_size API The hashtable library "khash.h" has been replaced with "khashl.h" that has better memory usage characteristics. Will discard. cf. <xmqqy1a4ao3t.fsf@gitster.g> source: <20240328101356.300374-1-e@xxxxxxxxx> * ds/doc-config-reflow (2024-03-14) 1 commit - config.txt: perform some minor reformatting Reflow a paragraph in the documentation source without any effect to the formatted text. Will discard. source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@xxxxxxxxxxx> * ie/config-includeif-hostname (2024-03-19) 2 commits - config: learn the "hostname:" includeIf condition - t: add a test helper for getting hostname The conditional inclusion mechanism for configuration files learned to switch on the hostname. Expecting a reroll. cf. <20240319210428.GC1159535@xxxxxxxxxxxxxxxxxxxxxxx> cf. <20240320001934.GA903718@xxxxxxxxxxxxxxxxxxxxxxx> source: <20240319183722.211300-1-ignacio@xxxxxxxxxxxx> * cw/git-std-lib (2024-02-28) 4 commits . SQUASH??? get rid of apparent debugging crufts . test-stdlib: show that git-std-lib is independent . git-std-lib: introduce Git Standard Library . pager: include stdint.h because uintmax_t is used Split libgit.a out to a separate git-std-lib tor easier reuse. Expecting a reroll. source: <cover.1696021277.git.jonathantanmy@xxxxxxxxxx> * bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit - completion: dir-type optargs for am, format-patch Command line completion support (in contrib/) has been updated for a few commands to complete directory names where a directory name is expected. Expecting a reroll. cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@xxxxxxxxx> cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@xxxxxxxxx> source: <d37781c3-6af2-409b-95a8-660a9b92d20b@xxxxxxxxxxxxxxxxxxxxxxxxx> * bk/complete-send-email (2024-01-12) 1 commit - completion: don't complete revs when --no-format-patch Command line completion support (in contrib/) has been taught to avoid offering revision names as candidates to "git send-email" when the command is used to send pre-generated files. Expecting a reroll. cf. <CAC4O8c88Z3ZqxH2VVaNPpEGB3moL5dJcg3cOWuLWwQ_hLrJMtA@xxxxxxxxxxxxxx> source: <a718b5ee-afb0-44bd-a299-3208fac43506@xxxxxxxxxxxxxxxxxxxxxxxxx> * tb/path-filter-fix (2024-01-31) 16 commits - bloom: introduce `deinit_bloom_filters()` - commit-graph: reuse existing Bloom filters where possible - object.h: fix mis-aligned flag bits table - commit-graph: new Bloom filter version that fixes murmur3 - commit-graph: unconditionally load Bloom filters - bloom: prepare to discard incompatible Bloom filters - bloom: annotate filters with hash version - repo-settings: introduce commitgraph.changedPathsVersion - t4216: test changed path filters with high bit paths - t/helper/test-read-graph: implement `bloom-filters` mode - bloom.h: make `load_bloom_filter_from_graph()` public - t/helper/test-read-graph.c: extract `dump_graph_info()` - gitformat-commit-graph: describe version 2 of BDAT - commit-graph: ensure Bloom filters are read with consistent settings - revision.c: consult Bloom filters for root commits - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()` The Bloom filter used for path limited history traversal was broken on systems whose "char" is unsigned; update the implementation and bump the format version to 2. Waiting for a final ack? cf. <ZcFjkfbsBfk7JQIH@nand.local> source: <cover.1706741516.git.me@xxxxxxxxxxxx> * jc/rerere-cleanup (2023-08-25) 4 commits - rerere: modernize use of empty strbuf - rerere: try_merge() should use LL_MERGE_ERROR when it means an error - rerere: fix comment on handle_file() helper - rerere: simplify check_one_conflict() helper function Code clean-up. Not ready to be reviewed yet. source: <20230824205456.1231371-1-gitster@xxxxxxxxx>
