Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=jch 2026-05-17T13:58:51Z 2026-05-17T13:58:51Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:51Z urn:sha1:403180414760edf5d97fdba22061cca68641dd76 The limit_list() function that is one of the core part of the revision traversal infrastructure has been optimized by replacing its use of linear list with priority queue. * kk/limit-list-optim: revision: use priority queue in limit_list() 2026-05-17T13:58:51Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:51Z urn:sha1:eaa7468ed3ebfa33d9cec5e4167d704eb14c4280 * ob/more-repo-config-values: env: move "warn_on_object_refname_ambiguity" into `struct repo_config_values` env: move "sparse_expect_files_outside_of_patterns" into `repo_config_values` env: move "core_sparse_checkout_cone" into `struct repo_config_values` environment: move "precomposed_unicode" into `struct repo_config_values` environment: move "pack_compression_level" into `struct repo_config_values` environment: move `zlib_compression_level` into `struct repo_config_values` environment: move "check_stat" into `struct repo_config_values` environment: move "trust_ctime" into `struct repo_config_values` 2026-05-17T13:58:50Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:50Z urn:sha1:fc35bafc6f9a423a0008d647b43bc8b53b15b2cb "ort" merge backend handles merging corrupt trees better by aborting when it should. * en/ort-harden-against-corrupt-trees: cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts merge-ort: abort merge when trees have duplicate entries merge-ort: free diff pairs queue in clear_or_reinit_internal_opts() merge-ort: drop unnecessary show_all_errors from collect_merge_info() merge-ort: propagate callback errors from traverse_trees_wrapper() 2026-05-17T13:58:50Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:50Z urn:sha1:91b68bbb3be67da96b541eb779dd47de02c71595 Documentation updates. * kh/doc-trailers: doc: interpret-trailers: document comment line treatment doc: interpret-trailers: commit to “trailer block” term doc: interpret-trailers: add key format example doc: interpret-trailers: explain key format doc: interpret-trailers: explain the format after the intro doc: interpret-trailers: not just for commit messages doc: interpret-trailers: use “metadata” in Name as well doc: interpret-trailers: replace “lines” with “metadata” doc: interpret-trailers: stop fixating on RFC 822 2026-05-17T13:58:50Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:49Z urn:sha1:1074d974daeb9f9e7e04d77a9c00715242ca80a0 Many uses of the_repository has been updated to use a more appropriate struct repository instance in setup.c codepath. * ps/setup-wo-the-repository: setup: stop using `the_repository` in `init_db()` setup: stop using `the_repository` in `create_reference_database()` setup: stop using `the_repository` in `initialize_repository_version()` setup: stop using `the_repository` in `check_repository_format()` setup: stop using `the_repository` in `upgrade_repository_format()` setup: stop using `the_repository` in `setup_git_directory()` setup: stop using `the_repository` in `setup_git_directory_gently()` setup: stop using `the_repository` in `setup_git_env()` setup: stop using `the_repository` in `set_git_work_tree()` setup: stop using `the_repository` in `setup_work_tree()` setup: stop using `the_repository` in `enter_repo()` setup: stop using `the_repository` in `verify_non_filename()` setup: stop using `the_repository` in `verify_filename()` setup: stop using `the_repository` in `path_inside_repo()` setup: stop using `the_repository` in `prefix_path()` setup: stop using `the_repository` in `is_inside_git_dir()` setup: stop using `the_repository` in `is_inside_worktree()` setup: replace use of `the_repository` in static functions 2026-05-17T13:58:49Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:49Z urn:sha1:503e5b6fb1142dcd5d8e2c0cc89de9662122168d "git cat-file --batch" learns an in-line command "mailmap" that lets the user toggle use of mailmap. * sa/cat-file-batch-mailmap-switch: cat-file: add mailmap subcommand to --batch-command 2026-05-17T13:58:49Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:48Z urn:sha1:bde06d0ab28301b38fee4ec67d9ae2a0b7d08f25 Add a new odb "in-memory" source that is meant to only hold tentative objects (like the virtual blob object that represents the working tree file used by "git blame"). * ps/odb-in-memory: t/unit-tests: add tests for the in-memory object source odb: generic in-memory source odb/source-inmemory: stub out remaining functions odb/source-inmemory: implement `freshen_object()` callback odb/source-inmemory: implement `count_objects()` callback odb/source-inmemory: implement `find_abbrev_len()` callback odb/source-inmemory: implement `for_each_object()` callback odb/source-inmemory: convert to use oidtree oidtree: add ability to store data cbtree: allow using arbitrary wrapper structures for nodes odb/source-inmemory: implement `write_object_stream()` callback odb/source-inmemory: implement `write_object()` callback odb/source-inmemory: implement `read_object_stream()` callback odb/source-inmemory: implement `read_object_info()` callback odb: fix unnecessary call to `find_cached_object()` odb/source-inmemory: implement `free()` callback odb: introduce "in-memory" source 2026-05-17T13:58:48Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:48Z urn:sha1:9465e7902b82b1a46a41eef3231906fb437c9228 ODB transaction interface is being reworked to explicitly handle object writes. * jt/odb-transaction-write: odb/transaction: make `write_object_stream()` pluggable object-file: generalize packfile writes to use odb_write_stream object-file: avoid fd seekback by checking object size upfront object-file: remove flags from transaction packfile writes odb: update `struct odb_write_stream` read() callback odb/transaction: use pluggable `begin_transaction()` odb: split `struct odb_transaction` into separate header 2026-05-17T13:58:48Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:48Z urn:sha1:b19fcb44c63d716453a4311ff2877e7b17754a90 The final step, split from earlier attempt by Dscho, to loosen the sideband restriction for now and tighten later at Git v3.0 boundary. * jc/neuter-sideband-post-3.0: sideband: delay sanitizing by default to Git v3.0 2026-05-17T13:58:47Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:47Z urn:sha1:a392bb1d7b186558f72d9559581afc3212f639cf In a history with more than one root commit, "git log --graph --oneline" stuffed an unrelated commit immediately below a root commit, which has been corrected by making the spot below a root unavailable. * ps/shift-root-in-graph: graph: add indentation for commits preceded by a parentless commit