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] * cp/unit-test-reftable-tree (2024-06-13) 5 commits - t-reftable-tree: improve the test for infix_walk() - t-reftable-tree: add test for non-existent key - t-reftable-tree: split test_tree() into two sub-test functions - t: move reftable/tree_test.c to the unit testing framework - reftable: remove unnecessary curly braces in reftable/tree.c A test in reftable library has been rewritten using the unit test framework. Needs review. source: <20240612130217.8877-1-chandrapratap3519@xxxxxxxxx> * ps/use-the-repository (2024-06-14) 22 commits - hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE` - t/helper: remove dependency on `the_repository` in "proc-receive" - t/helper: fix segfault in "oid-array" command without repository - t/helper: use correct object hash in partial-clone helper - compat/fsmonitor: fix socket path in networked SHA256 repos - replace-object: use hash algorithm from passed-in repository - protocol-caps: use hash algorithm from passed-in repository - oidset: pass hash algorithm when parsing file - http-fetch: don't crash when parsing packfile without a repo - hash-ll: merge with "hash.h" - refs: avoid include cycle with "repository.h" - global: introduce `USE_THE_REPOSITORY_VARIABLE` macro - hash: require hash algorithm in `empty_tree_oid_hex()` - hash: require hash algorithm in `is_empty_{blob,tree}_oid()` - hash: make `is_null_oid()` independent of `the_repository` - hash: convert `oidcmp()` and `oideq()` to compare whole hash - global: ensure that object IDs are always padded - hash: require hash algorithm in `oidread()` and `oidclr()` - hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()` - hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions - Merge branch 'gt/unit-test-oidtree' into ps/use-the-repository - Merge branch 'ps/ref-storage-migration' into ps/use-the-repository (this branch uses gt/unit-test-oidtree and ps/ref-storage-migration.) A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help transition the codebase to rely less on the availability of the singleton the_repository instance. Needs review. source: <cover.1718347699.git.ps@xxxxxx> * sj/ref-fsck (2024-06-13) 8 commits - fsck: add ref content check for files backend - fsck: add ref name check for files backend - files-backend: add unified interface for refs scanning - builtin/fsck: add `git-refs verify` child process - builtin/refs: add verify subcommand - refs: set up ref consistency check infrastructure - fsck: add refs check interfaces to interface with fsck error levels - Merge branch 'ps/ref-storage-migration' into sj/ref-fsck (this branch uses ps/ref-storage-migration.) "git fsck" infrastructure has been taught to also check the sanity of the ref database, in addition to the object database. Needs review. source: <20240612085349.710785-1-shejialuo@xxxxxxxxx> * en/ort-inner-merge-error-fix (2024-06-13) 7 commits - merge-ort: convert more error() cases to path_msg() - merge-ort: upon merge abort, only show messages causing the abort - merge-ort: loosen commented requirements - merge-ort: clearer propagation of failure-to-function from merge_submodule - merge-ort: fix type of local 'clean' var in handle_content_merge() - merge-ort: maintain expected invariant for priv member - merge-ort: extract handling of priv member into reusable function The "ort" merge backend saw one bugfix for a crash that happens when inner merge gets killed, and assorted code clean-ups. Waiting for comments or a reroll. source: <pull.1748.git.1718310307.gitgitgadget@xxxxxxxxx> * cp/unit-test-reftable-pq (2024-06-14) 7 commits - t-reftable-pq: add tests for merged_iter_pqueue_top() - t-reftable-pq: add test for index based comparison - t-reftable-pq: make merged_iter_pqueue_check() callable by reference - t-reftable-pq: make merged_iter_pqueue_check() static - t: move reftable/pq_test.c to the unit testing framework - reftable: change the type of array indices to 'size_t' in reftable/pq.c - reftable: remove unncessary curly braces in reftable/pq.c The tests for "pq" part of reftable library got rewritten to use the unit test framework. Needs review. source: <20240614095136.12052-1-chandrapratap3519@xxxxxxxxx> * jc/archive-prefix-with-add-virtual-file (2024-06-14) 1 commit - archive: document that --add-virtual-file takes full path "git archive --add-virtual-file=<path>:<contents>" never paid attention to the --prefix=<prefix> option but the documentation said it would. The documentation has been corrected. Waiting for comments. source: <xmqq5xubfjuu.fsf_-_@gitster.g> * jk/remote-wo-url (2024-06-14) 11 commits - remote: drop checks for zero-url case - remote: always require at least one url in a remote - t5801: test remote.*.vcs config - t5801: make remote-testgit GIT_DIR setup more robust - remote: allow resetting url list - config: document remote.*.url/pushurl interaction - remote: simplify url/pushurl selection - remote: use strvecs to store remote url/pushurl - remote: transfer ownership of memory in add_url(), etc - remote: refactor alias_url() memory ownership - archive: fix check for missing url Memory ownership rules for the in-core representation of remote.*.url configuration values have been straightened out, which resulted in a few leak fixes and code clarification. Waiting for comments. source: <20240614102439.GA222287@xxxxxxxxxxxxxxxxxxxxxxx> -------------------------------------------------- [Cooking] * jk/am-retry (2024-06-06) 2 commits (merged to 'next' on 2024-06-10 at 4d62361bc7) + test-terminal: drop stdin handling + am: add explicit "--retry" option "git am" has a safety feature to prevent it from starting a new session when there already is a session going. It reliably triggers when a mbox is given on the command line, but it has to rely on the tty-ness of the standard input. Add an explicit way to opt out of this safety with a command line option. Will merge to 'master'. source: <20240606081724.GA1166769@xxxxxxxxxxxxxxxxxxxxxxx> * ps/ci-fix-detection-of-ubuntu-20 (2024-06-06) 1 commit (merged to 'next' on 2024-06-10 at 2d6725a946) + ci: fix check for Ubuntu 20.04 Fix for an embarrassing typo that prevented running Python2 tests anywhere. Will merge to 'master'. source: <f91004a4382c95b1b87bf3d1aafc018af2b7b92e.1717662814.git.ps@xxxxxx> * db/date-underflow-fix (2024-06-13) 4 commits - SQUASH??? skip "near the end-of-git-time" tests on 32-bit systems - SQUASH??? t0006: simplify prerequisite - SQUASH??? the git-end-of-time is beyond time_t on 32-bit systems - date: detect underflow/overflow when parsing dates with timezone offset date parser updates to be more careful about underflowing epoch based timestamp. Expecting a reroll. cf. <xmqq1q58ejnw.fsf@gitster.g> cf. <xmqqtthzrraw.fsf@gitster.g> source: <pull.1726.v3.git.git.1717719428510.gitgitgadget@xxxxxxxxx> * tb/commit-graph-use-tempfile (2024-06-07) 2 commits - server-info.c: remove temporary info files on exit - commit-graph.c: remove temporary graph layers on exit "git update-server-info" and "git commit-graph --write" have been updated to use the tempfile API to avoid leaving cruft after failing. Will merge to 'next'. source: <cover.1717712358.git.me@xxxxxxxxxxxx> * tb/incremental-midx-part-1 (2024-06-07) 19 commits - midx: implement support for writing incremental MIDX chains - t/t5313-pack-bounds-checks.sh: prepare for sub-directories - t: retire 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' - midx: implement verification support for incremental MIDXs - midx: support reading incremental MIDX chains - midx: teach `midx_fanout_add_midx_fanout()` about incremental MIDXs - midx: teach `midx_preferred_pack()` about incremental MIDXs - midx: teach `midx_contains_pack()` about incremental MIDXs - midx: remove unused `midx_locate_pack()` - midx: teach `fill_midx_entry()` about incremental MIDXs - midx: teach `nth_midxed_offset()` about incremental MIDXs - midx: teach `bsearch_midx()` about incremental MIDXs - midx: introduce `bsearch_one_midx()` - midx: teach `nth_bitmapped_pack()` about incremental MIDXs - midx: teach `nth_midxed_object_oid()` about incremental MIDXs - midx: teach `prepare_midx_pack()` about incremental MIDXs - midx: teach `nth_midxed_pack_int_id()` about incremental MIDXs - midx: add new fields for incremental MIDX chains - Documentation: describe incremental MIDX format Incremental updates of multi-pack index files. Needs review. source: <cover.1717715060.git.me@xxxxxxxxxxxx> * ds/doc-add-interactive-singlekey (2024-06-07) 1 commit (merged to 'next' on 2024-06-12 at cf3de70246) + doc: interactive.singleKey is disabled by default Doc update. Will merge to 'master'. source: <xmqq4ja4e6d6.fsf@gitster.g> * gt/unit-test-oidtree (2024-06-12) 1 commit (merged to 'next' on 2024-06-13 at eb3700b002) + t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c (this branch is used by ps/use-the-repository.) "oidtree" tests were rewritten to use the unit test framework. Will merge to 'master'. cf. <7o6fuymnfn6b6buyw3yyctjd4dlwlrazspv3xgxvys6djjivxh@qbhyurorgbtt> source: <20240608165731.29467-1-shyamthakkar001@xxxxxxxxx> * jc/varargs-attributes (2024-06-10) 4 commits (merged to 'next' on 2024-06-10 at a9c55c0f89) + __attribute__: add a few missing format attributes + __attribute__: mark some functions with LAST_ARG_MUST_BE_NULL + __attribute__: remove redundant attribute declaration for git_die_config() + __attribute__: trace2_region_enter_printf() is like "printf" Varargs functions that are unannotated as printf-like or execl-like have been annotated as such. Will merge to 'master'. source: <20240608183747.2084294-1-gitster@xxxxxxxxx> * jc/worktree-git-path (2024-06-08) 1 commit - worktree_git_path(): move the declaration to path.h Code cleanup. Will merge to 'next'. source: <20240608183901.2084546-1-gitster@xxxxxxxxx> * ds/ahead-behind-fix (2024-06-12) 1 commit (merged to 'next' on 2024-06-13 at df378ec81e) + commit-graph: increment progress indicator Fix for a progress bar. Will merge to 'master'. source: <pull.1743.git.1718118555197.gitgitgadget@xxxxxxxxx> * ps/abbrev-length-before-setup-fix (2024-06-12) 3 commits (merged to 'next' on 2024-06-13 at e5d17f7da2) + object-name: don't try to abbreviate to lengths greater than hexsz + parse-options-cb: stop clamping "--abbrev=" to hash length + config: fix segfault when parsing "core.abbrev" without repo Setting core.abbrev too early before the repository set-up (typically in "git clone") caused segfault, which as been corrected. Will merge to 'master'. source: <cover.1718178996.git.ps@xxxxxx> * ps/make-append-to-cflags (2024-06-11) 1 commit (merged to 'next' on 2024-06-12 at d57b04bf16) + Makefile: add ability to append to CFLAGS and LDFLAGS To help developers, the build procedure now allows builders to use CFLAGS_APPEND to specify additional CFLAGS. Will merge to 'master'. source: <8120ddaf0bdfd50e0fc4cf9a04f833102630b639.1718001244.git.ps@xxxxxx> * tb/multi-pack-reuse-fix (2024-06-11) 3 commits (merged to 'next' on 2024-06-13 at 1cd0259667) + pack-revindex.c: guard against out-of-bounds pack lookups + pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse + midx-write.c: do not read existing MIDX with `packs_to_include` Assorted fixes to multi-pack-index code paths. Will merge to 'master'. source: <cover.1718126886.git.me@xxxxxxxxxxxx> * vd/mktree (2024-06-11) 16 commits - mktree: remove entries when mode is 0 - mktree: allow deeper paths in input - mktree: optionally add to an existing tree - mktree: add directory-file conflict hashmap - mktree: use iterator struct to add tree entries to index - mktree: create tree using an in-core index - mktree: overwrite duplicate entries - mktree: validate paths more carefully - mktree: add a --literally option - mktree: use read_index_info to read stdin lines - index-info.c: parse object type in provided in read_index_info - index-info.c: identify empty input lines in read_index_info - update-index: generalize 'read_index_info' - mktree: use non-static tree_entry array - mktree: rename treeent to tree_entry - mktree: use OPT_BOOL "git mktree" has been rewritten, taking advantage of the cache-tree API. Waiting for comments or a reroll. source: <pull.1746.git.1718130288.gitgitgadget@xxxxxxxxx> * xx/bundie-uri-fixes (2024-06-11) 3 commits - unbundle: support object verification for fetches - fetch-pack: expose fsckObjects configuration logic - bundle-uri: verify oid before writing refs When bundleURI interface fetches multiple bundles, Git failed to take full advantage of all bundles and ended up slurping duplicated objects. Expecting a reroll. cf. <xmqqa5jruwkr.fsf@gitster.g> cf. <xmqqsexjtfcg.fsf@gitster.g> source: <pull.1730.v6.git.1718109943.gitgitgadget@xxxxxxxxx> * rj/add-p-pager (2024-06-04) 6 commits . add-patch: introduce the command '|' . test-terminal: introduce --no-stdin-pty . pager: introduce setup_custom_pager . pager: introduce wait_for_pager . pager: do not close fd 2 unnecessarily . add-patch: test for 'p' command "git add -i" and friends learned a new '|' command that sends the current hunk to the pager, instead of dumping it to the terminal. Expecting a reroll to work well with jk/am-retry source: <1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@xxxxxxxxx> * ap/credential-clear-fix (2024-06-06) 1 commit (merged to 'next' on 2024-06-07 at 933f06b899) + credential: clear expired c->credential, unify secret clearing Upon expiration event, we forgot to clear in-core authentication material other than password (whose support was added recently), which has been corrected. Will merge to 'master'. source: <20240606183516.4077896-2-aplattner@xxxxxxxxxx> * jc/heads-are-branches (2024-06-04) 3 commits (merged to 'next' on 2024-06-14 at b56b59d1d7) + show-ref: introduce --branches and deprecate --heads + ls-remote: introduce --branches and deprecate --heads + refs: call branches branches The "--heads" option of "ls-remote" and "show-ref" has been been deprecated; "--branches" replaces "--heads". Will merge to 'master'. source: <20240604220145.3260714-1-gitster@xxxxxxxxx> * jk/imap-send-plug-all-msgs-leak (2024-06-07) 3 commits (merged to 'next' on 2024-06-10 at 9b8ec7b97d) + imap-send: free all_msgs strbuf in "out" label + Merge branch 'jc/t1517-more' into jk/imap-send-plug-all-msgs-leak + Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak (this branch uses ps/no-writable-strings.) A leak in "git imap-send" that somehow escapes LSan has been plugged. Will merge to 'master'. source: <20240605083526.GB2345232@xxxxxxxxxxxxxxxxxxxxxxx> * ps/check-docs-fix (2024-06-06) 4 commits (merged to 'next' on 2024-06-10 at 12570afc8e) + ci/test-documentation: work around SyntaxWarning in Python 3.12 + gitlab-ci: add job to run `make check-docs` + Documentation/lint-manpages: bubble up errors + Makefile: extract script to lint missing/extraneous manpages "make check-docs" noticed problems and reported to its output but failed to signal its findings with its exit status, which has been corrected. Will merge to 'master'. source: <cover.1717660597.git.ps@xxxxxx> * rj/format-patch-auto-cover-with-interdiff (2024-06-07) 2 commits (merged to 'next' on 2024-06-13 at 3fad4afcfd) + format-patch: assume --cover-letter for diff in multi-patch series + t4014: cleanups in a few tests "git format-patch --interdiff" for multi-patch series learned to turn on cover letters automatically (unless told never to enable cover letter with "--no-cover-letter" and such). Will merge to 'master'. * rs/diff-exit-code-with-external-diff (2024-06-10) 3 commits (merged to 'next' on 2024-06-12 at 9ce495b6cc) + diff: let external diffs report that changes are uninteresting + userdiff: add and use struct external_diff + t4020: test exit code with external diffs "git diff --exit-code --ext-diff" learned to take the exit status of the external diff driver into account when deciding the exit status of the overall "git diff" invocation when configured to do so. Will merge to 'master'. source: <168fecaa-2ebd-4897-b0ba-3bd2a37c01e7@xxxxxx> * jc/add-i-retire-usebuiltin-config (2024-06-05) 1 commit - add-i: finally retire add.interactive.useBuiltin For over a year, setting add.interactive.useBuiltin configuration variable did nothing but giving a "this does not do anything" warning. Finally remove it. Will merge to 'next'. source: <xmqqikynqdvq.fsf@gitster.g> * jc/no-default-attr-tree-in-bare (2024-06-05) 1 commit - attr.tree: HEAD:.gitattributes is no longer the default in a bare repo Earlier we stopped using the tree of HEAD as the default source of attributes in a bare repository, but failed to document it. This has been corrected. Will merge to 'next'. source: <xmqqa5jzqd5k.fsf_-_@gitster.g> * ps/leakfixes-more (2024-06-11) 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 leaking 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 More memory leaks have been plugged. Needs review. source: <cover.1718095906.git.ps@xxxxxx> * ps/no-writable-strings (2024-06-07) 28 commits (merged to 'next' on 2024-06-10 at 9678851a9f) + 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 is used by jk/imap-send-plug-all-msgs-leak.) Building with "-Werror -Wwrite-strings" is now supported. Will merge to 'master'. source: <cover.1717740365.git.ps@xxxxxx> * 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. Expecting a reroll. cf. <b7eca313-9ea8-4132-ba1d-ed9236e07095@xxxxxxxxx> source: <pull.1677.v2.git.git.1716710073910.gitgitgadget@xxxxxxxxx> * jc/format-patch-with-range-diff (2024-05-24) 2 commits (merged to 'next' on 2024-06-07 at 394989ee78) + 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 'master'. source: <20240523225007.2871766-1-gitster@xxxxxxxxx> * ps/document-breaking-changes (2024-06-14) 4 commits (merged to 'next' on 2024-06-14 at 8089bf6f81) + 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. Will merge to 'master'. source: <cover.1718345026.git.ps@xxxxxx> * ps/ref-storage-migration (2024-06-06) 14 commits (merged to 'next' on 2024-06-10 at 81b46b6916) + 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 (this branch is used by ps/use-the-repository and sj/ref-fsck.) Allow migrating a repository that uses the files backend for its ref storage to use the reftable backend, with limitations. Will merge to 'master'. source: <cover.1717649802.git.ps@xxxxxx> * tb/pseudo-merge-reachability-bitmap (2024-06-14) 27 commits (merged to 'next' on 2024-06-14 at 447d99e1c3) + pack-bitmap.c: ensure pseudo-merge offset reads are bounded + Documentation/technical/bitmap-format.txt: add missing position table (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 has been added. Will merge to 'next'? source: <cover.1716499565.git.me@xxxxxxxxxxxx> source: <cover.1718392943.git.me@xxxxxxxxxxxx> * kn/update-ref-symref (2024-06-07) 8 commits (merged to 'next' on 2024-06-13 at 5cf8d7513e) + 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: specify error for regular refs with `old_target` + 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. Will merge to 'master'. source: <20240607133304.2333280-1-knayak@xxxxxxxxxx> * 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. This still does not address the case where core.precomposeUnicode configuration is not defined globally. Will merge to 'next'. source: <20240531193156.28046-1-tboegi@xxxxxx> * pw/rebase-i-error-message (2024-05-30) 2 commits (merged to 'next' on 2024-06-13 at dbec12cfda) + 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. Will merge to 'master'. source: <pull.1672.v3.git.1717076630.gitgitgadget@xxxxxxxxx> * 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> -------------------------------------------------- [Discarded] * ps/ci-use-Og-in-some-jobs (2024-06-10) 2 commits . ci: compile "linux-gcc-default" job with -Og . Makefile: add ability to append to CFLAGS and LDFLAGS Compile with -Og, which is different from the usual -O2, in one CI job, to see if we can get more warning coverage. Discarded. False positives in "-Og -Wall -Werror" are too annoying. source: <cover.1718001244.git.ps@xxxxxx> * 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. Discarded. source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@xxxxxxxxxxx> * 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. Discarded. source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@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. Discarded. source: <20240524163926.2019648-1-christian.couder@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. Discarded. cf. <20240419214644.M168521@dcvr> source: <20240328101356.300374-1-e@xxxxxxxxx> * tb/pseudo-merge-reachability-bitmap-fixes (2024-06-06) 2 commits - pack-bitmap.c: ensure pseudo-merge offset reads are bounded - Documentation/technical/bitmap-format.txt: add missing position table (this branch uses tb/pseudo-merge-reachability-bitmap.) Two rather straight-forward fixes to the base topic that is cooking in 'next'. Once people find it satisfactory, I plan to merge them into the base topic. Merged into the base topic.
