What's cooking in git.git (Dec 2023, #05; Wed, 27)
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).
The RelNotes symbolic link says we are now working towards Git 2.44. It may not be a bad idea to reflect on what technical debt and UI warts we have accumulated so far to see if we have enough of them to start planning for a breaking Git 3.0 release (or, of course, keep incrementally improve the system, which is much more preferrable--- continuity and stability is good). End of year being a relatively quiet period, it may be a good time to think about your favorite pet peeve, to be discussed early next year.
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-vcs/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']
* es/add-doc-list-short-form-of-all-in-synopsis (2023-12-15) 1 commit (merged to 'next' on 2023-12-18 at a4f20da2bf)
+ git-add.txt: add missing short option -A to synopsis
Doc update.
source: <[email protected]>
* jc/checkout-B-branch-in-use (2023-12-13) 2 commits
(merged to 'next' on 2023-12-14 at 0a3998619e)
+ checkout: forbid "-B <branch>" from touching a branch used elsewhere
+ checkout: refactor die_if_checked_out() caller
"git checkout -B <branch> [<start-point>]" allowed a branch that is in use in another worktree to be updated and checked out, which might be a bit unexpected. The rule has been tightened, which is a breaking change. "--ignore-other-worktrees" option is required to unbreak you, if you are used to the current behaviour that "-B" overrides the safety.
source: <[email protected]>
* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
(merged to 'next' on 2023-12-15 at 4aa7596593)
+ diff-lib: fix check_removed() when fsmonitor is active
+ Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
+ Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix (this branch uses jc/fake-lstat.)
The optimization based on fsmonitor in the "diff --cached" codepath is resurrected with the "fake-lstat" introduced earlier. cf. <[email protected]>
source: <[email protected]>
* jc/doc-misspelt-refs-fix (2023-12-18) 1 commit (merged to 'next' on 2023-12-18 at e7799fd5c9)
+ doc: format.notes specify a ref under refs/notes/ hierarchy
Doc update.
source: <[email protected]>
* jc/doc-most-refs-are-not-that-special (2023-12-15) 5 commits (merged to 'next' on 2023-12-18 at aead30fcc8)
+ docs: MERGE_AUTOSTASH is not that special
+ docs: AUTO_MERGE is not that special
+ refs.h: HEAD is not that special
+ git-bisect.txt: BISECT_HEAD is not that special
+ git.txt: HEAD is not that special
Doc updates.
source: <[email protected]>
* jc/fake-lstat (2023-09-15) 1 commit
(merged to 'next' on 2023-12-15 at 48e34cc0b4)
+ cache: add fake_lstat()
(this branch is used by jc/diff-cached-fsmonitor-fix.)
A new helper to let us pretend that we called lstat() when we know our cache_entry is up-to-date via fsmonitor.
cf. <[email protected]>
source: <[email protected]>
* jk/mailinfo-iterative-unquote-comment (2023-12-14) 2 commits (merged to 'next' on 2023-12-18 at 92363605fd)
+ mailinfo: avoid recursion when unquoting From headers
+ t5100: make rfc822 comment test more careful (this branch uses jk/mailinfo-oob-read-fix.)
The code to parse the From e-mail header has been updated to avoid recursion.
source: <[email protected]>
* jk/mailinfo-oob-read-fix (2023-12-12) 1 commit
(merged to 'next' on 2023-12-14 at 0dcfcb0d02)
+ mailinfo: fix out-of-bounds memory reads in unquote_quoted_pair() (this branch is used by jk/mailinfo-iterative-unquote-comment.)
OOB read fix.
source: <[email protected]>
* jx/fetch-atomic-error-message-fix (2023-12-18) 2 commits (merged to 'next' on 2023-12-18 at a1988b00e5)
+ fetch: no redundant error message for atomic fetch
+ t5574: test porcelain output of atomic fetch
"git fetch --atomic" issued an unnecessary empty error message, which has been corrected.
cf. <ZX__e7VjyLXIl-uV@tanuki>
source: <[email protected]>
* ps/chainlint-self-check-update (2023-12-15) 1 commit (merged to 'next' on 2023-12-18 at 0de2e1807f)
+ tests: adjust whitespace in chainlint expectations
Test framework update.
source: <fb312f559de7b99244e4c86a995250599cd9be06.1702622508.git.ps@pks.im>
* ps/clone-into-reftable-repository (2023-12-12) 7 commits (merged to 'next' on 2023-12-19 at adf7eb1f84)
+ builtin/clone: create the refdb with the correct object format
+ builtin/clone: skip reading HEAD when retrieving remote
+ builtin/clone: set up sparse checkout later
+ builtin/clone: fix bundle URIs with mismatching object formats
+ remote-curl: rediscover repository when fetching refs
+ setup: allow skipping creation of the refdb
+ setup: extract function to create the refdb
(this branch is used by ps/refstorage-extension.)
"git clone" has been prepared to allow cloning a repository with non-default hash function into a repository that uses the reftable backend.
source: <[email protected]>
* ps/reftable-fixes (2023-12-11) 11 commits
(merged to 'next' on 2023-12-15 at ebba966016)
+ reftable/block: reuse buffer to compute record keys
+ reftable/block: introduce macro to initialize struct block_iter
+ reftable/merged: reuse buffer to compute record keys
+ reftable/stack: fix use of unseeded randomness
+ reftable/stack: fix stale lock when dying
+ reftable/stack: reuse buffers when reloading stack
+ reftable/stack: perform auto-compaction with transactional interface
+ reftable/stack: verify that reftable_stack_add() uses auto-compaction
+ reftable: handle interrupted writes
+ reftable: handle interrupted reads
+ reftable: wrap EXPECT macros in do/while
(this branch is used by ps/reftable-fixes-and-optims.)
Bunch of small fix-ups to the reftable code.
source: <[email protected]>
* rs/c99-stdbool-test-balloon (2023-12-18) 1 commit (merged to 'next' on 2023-12-18 at 5a62aaa127)
+ git-compat-util: convert skip_{prefix,suffix}{,_mem} to bool
Test balloon to use C99 "bool" type from <stdbool.h>.
source: <[email protected]>
* rs/show-ref-incompatible-options (2023-12-11) 1 commit (merged to 'next' on 2023-12-18 at 5a092285f7)
+ show-ref: use die_for_incompatible_opt3()
Code clean-up for sanity checking of command line options for "git show-ref".
source: <[email protected]>
* rs/t6300-compressed-size-fix (2023-12-12) 1 commit (merged to 'next' on 2023-12-19 at 37ed09549c)
+ t6300: avoid hard-coding object sizes
Test fix.
source: <[email protected]>
* sp/test-i18ngrep (2023-12-18) 1 commit
(merged to 'next' on 2023-12-18 at d54442693a)
+ test-lib-functions.sh: fix test_grep fail message wording
Error message fix in the test framework.
source: <[email protected]>
--------------------------------------------------
[New Topics]
* ml/doc-merge-updates (2023-12-20) 2 commits
- Documentation/git-merge.txt: use backticks for command wrapping
- Documentation/git-merge.txt: fix reference to synopsis
Doc update.
Will merge to 'next'.
source: <[email protected]>
* cp/apply-core-filemode (2023-12-26) 3 commits
- apply: code simplification
- apply: correctly reverse patch's pre- and post-image mode bits
- apply: ignore working tree filemode when !core.filemode
"git apply" on a filesystem without filemode support have learned to take a hint from what is in the index for the path, even when not working with the "--index" or "--cached" option, when checking the executable bit match what is required by the preimage in the patch.
Needs review.
source: <[email protected]>
* jc/archive-list-with-extra-args (2023-12-21) 1 commit
- archive: "--list" does not take further options
"git archive --list extra garbage" silently ignored excess command line parameters, which has been corrected.
Will merge to 'next'.
source: <[email protected]>
* jk/t1006-cat-file-objectsize-disk (2023-12-21) 1 commit
- t1006: add tests for %(objectsize:disk)
Test update.
Will merge to 'next'.
source: <[email protected]>
* js/contributor-docs-updates (2023-12-21) 9 commits
- SubmittingPatches: hyphenate non-ASCII
- SubmittingPatches: clarify GitHub artifact format
- SubmittingPatches: clarify GitHub visual
- SubmittingPatches: improve extra tags advice
- SubmittingPatches: update extra tags list
- SubmittingPatches: discourage new trailers
- SubmittingPatches: drop ref to "What's in git.git"
- CodingGuidelines: write punctuation marks
- CodingGuidelines: move period inside parentheses
Doc update.
Expecting a reroll, but basically looking good.
source: <[email protected]>
* al/unit-test-ctype (2023-12-26) 1 commit
- unit-tests: rewrite t/helper/test-ctype.c as a unit test.
Move test-ctype helper to the unit-test framework.
Expecting a reroll.
source: <[email protected]>
* bk/bisect-doc-fix (2023-12-27) 1 commit
- doc: use singular form of repeatable path arg
Synopsis fix.
Expecting a reroll.
source: <[email protected]>
* en/sparse-checkout-eoo (2023-12-26) 2 commits
- sparse-checkout: be consistent with end of options markers
- Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
"git sparse-checkout (add|set) --[no-]cone --end-of-options" did not handle "--end-of-options" correctly after a recent update.
Will merge to 'next'.
source: <[email protected]>
* ja/doc-placeholders-fix (2023-12-26) 2 commits
- doc: enforce placeholders in documentation
- doc: enforce dashes in placeholders
Docfix.
Needs review.
source: <[email protected]>
* jc/sparse-checkout-set-default-fix (2023-12-26) 1 commit
- sparse-checkout: use default patterns for 'set' only !stdin
"git sparse-checkout set" added default patterns even when the patterns are being fed from the standard input, which has been corrected.
Will merge to 'next'.
source: <[email protected]>
* rs/fast-import-simplify-mempool-allocation (2023-12-26) 1 commit
- fast-import: use mem_pool_calloc()
Code simplification.
Will merge to 'next'.
source: <[email protected]>
* rs/mem-pool-improvements (2023-12-26) 2 commits
- mem-pool: simplify alignment calculation
- mem-pool: fix big allocations
MemPool allocator fixes.
Will merge to 'next'.
source: <[email protected]>
--------------------------------------------------
[Cooking]
* jc/retire-cas-opt-name-constant (2023-12-19) 1 commit (merged to 'next' on 2023-12-21 at 39ef057c8b)
+ remote.h: retire CAS_OPT_NAME
Code clean-up.
Will merge to 'master'.
source: <[email protected]>
* rs/rebase-use-strvec-pushf (2023-12-20) 1 commit (merged to 'next' on 2023-12-20 at ecb190973c)
+ rebase: use strvec_pushf() for format-patch revisions
Code clean-up.
Will merge to 'master'.
source: <[email protected]>
* ps/refstorage-extension (2023-12-20) 13 commits
- t9500: write "extensions.refstorage" into config
- builtin/clone: introduce --ref-format= value flag
- builtin/init: introduce --ref-format= value flag
- builtin/rev-parse: introduce --show-ref-format flag
- t: introduce GIT_TEST_DEFAULT_REF_FORMAT envvar
- setup: introduce GIT_DEFAULT_REF_FORMAT envvar
- setup: introduce "extensions.refStorage" extension
- setup: set repository's formats on init
- setup: start tracking ref storage format when
- refs: refactor logic to look up storage backends
- worktree: skip reading HEAD when repairing worktrees
- t: introduce DEFAULT_REPO_FORMAT prereq
- Merge branch 'ps/clone-into-reftable-repository' into ps/refstorage-extension
Introduce a new extension "refstorage" so that we can mark a repository that uses a non-default ref backend, like reftable.
Needs review.
source: <[email protected]>
* ps/reftable-fixes-and-optims (2023-12-20) 9 commits
- SQUASH??? make "make hdr-check" pass
- reftable/merged: transfer ownership of records when iterating
- reftable/merged: really reuse buffers to compute record keys
- reftable/record: store "val2" hashes as static arrays
- reftable/record: store "val1" hashes as static arrays
- reftable/record: constify some parts of the interface
- reftable/writer: fix index corruption when writing multiple indices
- reftable/stack: do not overwrite errors when compacting
- Merge branch 'ps/reftable-fixes' into ps/reftable-fixes-and-optims
More fixes and optimizations to the reftable backend.
Needs review.
source: <[email protected]>
* ps/pseudo-refs (2023-12-14) 4 commits
(merged to 'next' on 2023-12-21 at 3460e3d667)
+ bisect: consistently write BISECT_EXPECTED_REV via the refdb
+ refs: complete list of special refs
+ refs: propagate errno when reading special refs fails
+ wt-status: read HEAD and ORIG_HEAD via the refdb
Assorted changes around pseudoref handling.
Will merge to 'master'.
source: <[email protected]>
* tb/multi-pack-verbatim-reuse (2023-12-14) 26 commits
- t/perf: add performance tests for multi-pack reuse
- pack-bitmap: enable reuse from all bitmapped packs
- pack-objects: allow setting pack.allowPackReuse to "single"
- t/test-lib-functions.sh: implement test_trace2_data helper
- pack-objects: add tracing for various packfile metrics
- pack-bitmap: prepare to mark objects from multiple packs for reuse
- pack-revindex: implement midx_pair_to_pack_pos()
- pack-revindex: factor out midx_key_to_pack_pos() helper
- midx: implement midx_preferred_pack()
- git-compat-util.h: implement checked size_t to uint32_t conversion
- pack-objects: include number of packs reused in output
- pack-objects: prepare write_reused_pack_verbatim() for multi-pack reuse
- pack-objects: prepare write_reused_pack() for multi-pack reuse
- pack-objects: pass bitmapped_pack's to pack-reuse functions
- pack-objects: keep track of pack_start for each reuse pack
- pack-objects: parameterize pack-reuse routines over a single pack
- pack-bitmap: return multiple packs via reuse_partial_packfile_from_bitmap()
- pack-bitmap: simplify reuse_partial_packfile_from_bitmap() signature
- ewah: implement bitmap_is_empty()
- pack-bitmap: pass bitmapped_pack struct to pack-reuse functions
- midx: implement midx_locate_pack()
- midx: implement BTMP chunk
- midx: factor out fill_pack_info()
- pack-bitmap: plug leak in find_objects()
- pack-bitmap-write: deep-clear the bb_commit slab
- pack-objects: free packing_data in more places
Streaming spans of packfile data used to be done only from a single, primary, pack in a repository with multiple packfiles. It has been extended to allow reuse from other packfiles, too.
Will merge to 'next'?
cf. <[email protected]>
source: <[email protected]>
* jc/bisect-doc (2023-12-09) 1 commit
- bisect: document "terms" subcommand more fully
Doc update.
Needs review.
source: <[email protected]>
* sh/completion-with-reftable (2023-12-19) 2 commits (merged to 'next' on 2023-12-20 at 7957d4aa5b)
+ completion: support pseudoref existence checks for reftables
+ completion: refactor existence checks for pseudorefs
Command line completion script (in contrib/) learned to work better with the reftable backend.
Will merge to 'master'.
source: <[email protected]>
* en/header-cleanup (2023-12-26) 12 commits
- treewide: remove unnecessary includes in source files
- treewide: add direct includes currently only pulled in transitively
- trace2/tr2_tls.h: remove unnecessary include
- submodule-config.h: remove unnecessary include
- pkt-line.h: remove unnecessary include
- line-log.h: remove unnecessary include
- http.h: remove unnecessary include
- fsmonitor--daemon.h: remove unnecessary includes
- blame.h: remove unnecessary includes
- archive.h: remove unnecessary include
- treewide: remove unnecessary includes in source files
- treewide: remove unnecessary includes from header files
Remove unused header "#include".
Will merge to 'next'.
source: <[email protected]>
* jc/orphan-unborn (2023-11-24) 2 commits
(merged to 'next' on 2023-12-21 at 030300487a)
+ orphan/unborn: fix use of 'orphan' in end-user facing messages
+ orphan/unborn: add to the glossary and use them consistently
Doc updates to clarify what an "unborn branch" means.
Will merge to 'master'.
source: <[email protected]>
* jw/builtin-objectmode-attr (2023-12-12) 2 commits
- SQUASH??? - leakfix
- attr: add builtin objectmode values support
The builtin_objectmode attribute is populated for each path without adding anything in .gitattributes files, which would be useful in magic pathspec, e.g., ":(attr:builtin_objectmode=100755)" to limit to executables.
Needs to get leakfix reviewed.
cf. <[email protected]>
source: <[email protected]>
* tb/merge-tree-write-pack (2023-10-23) 5 commits
- builtin/merge-tree.c: implement support for --write-pack
- bulk-checkin: introduce index_tree_bulk_checkin_incore()
- bulk-checkin: introduce index_blob_bulk_checkin_incore()
- bulk-checkin: generify stream_blob_to_pack() for arbitrary types
- bulk-checkin: extract abstract bulk_checkin_source
"git merge-tree" learned "--write-pack" to record its result without creating loose objects.
Broken when an object created during a merge is needed to continue merge cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
source: <[email protected]>
* tb/pair-chunk-expect (2023-11-10) 8 commits
- midx: read OOFF chunk with pair_chunk_expect()
- midx: read OIDL chunk with pair_chunk_expect()
- commit-graph: read BIDX chunk with pair_chunk_expect()
- commit-graph: read GDAT chunk with pair_chunk_expect()
- commit-graph: read CDAT chunk with pair_chunk_expect()
- commit-graph: read OIDL chunk with pair_chunk_expect()
- chunk-format: introduce pair_chunk_expect() helper
- Merge branch 'jk/chunk-bounds-more' into HEAD
Further code clean-up.
Needs review.
source: <[email protected]>
* tb/path-filter-fix (2023-10-18) 17 commits
- bloom: introduce deinit_bloom_filters()
- commit-graph: reuse existing Bloom filters where possible
- object.h: fix mis-aligned flag bits table
- commit-graph: drop unnecessary graph_read_bloom_data_context
- commit-graph.c: unconditionally load Bloom filters
- bloom: prepare to discard incompatible Bloom filters
- bloom: annotate filters with hash version
- commit-graph: new filter ver. that fixes murmur3
- 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.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* ak/color-decorate-symbols (2023-10-23) 7 commits
- log: add color.decorate.pseudoref config variable
- refs: exempt pseudorefs from pattern prefixing
- refs: add pseudorefs array and iteration functions
- log: add color.decorate.ref config variable
- log: add color.decorate.symbol config variable
- log: use designated inits for decoration_colors
- config: restructure color.decorate documentation
A new config for coloring.
Needs review.
source: <[email protected]>
* la/trailer-cleanups (2023-12-20) 3 commits
(merged to 'next' on 2023-12-21 at e26ede5f55)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: find the end of the log message
+ commit: ignore_non_trailer computes number of bytes to ignore
Code clean-up.
Will merge to 'master'.
source: <[email protected]>
* eb/hash-transition (2023-10-02) 30 commits
- t1016-compatObjectFormat: add tests to verify the conversion between objects
- t1006: test oid compatibility with cat-file
- t1006: rename sha1 to oid
- test-lib: compute the compatibility hash so tests may use it
- builtin/ls-tree: let the oid determine the output algorithm
- object-file: handle compat objects in check_object_signature
- tree-walk: init_tree_desc take an oid to get the hash algorithm
- builtin/cat-file: let the oid determine the output algorithm
- rev-parse: add an --output-object-format parameter
- repository: implement extensions.compatObjectFormat
- object-file: update object_info_extended to reencode objects
- object-file-convert: convert commits that embed signed tags
- object-file-convert: convert commit objects when writing
- object-file-convert: don't leak when converting tag objects
- object-file-convert: convert tag objects when writing
- object-file-convert: add a function to convert trees between algorithms
- object: factor out parse_mode out of fast-import and tree-walk into in object.h
- cache: add a function to read an OID of a specific algorithm
- tag: sign both hashes
- commit: export add_header_signature to support handling signatures on tags
- commit: convert mergetag before computing the signature of a commit
- commit: write commits for both hashes
- object-file: add a compat_oid_in parameter to write_object_file_flags
- object-file: update the loose object map when writing loose objects
- loose: compatibilty short name support
- loose: add a mapping between SHA-1 and SHA-256 for loose objects
- repository: add a compatibility hash algorithm
- object-names: support input of oids in any supported hash
- oid-array: teach oid-array to handle multiple kinds of oids
- object-file-convert: stubs for converting from one object format to another
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
Needs review.
source: <[email protected]>
* jx/remote-archive-over-smart-http (2023-12-14) 4 commits
- archive: support remote archive from stateless transport
- transport-helper: call do_take_over() in connect_helper
- transport-helper: call do_take_over() in process_connect
- transport-helper: no connection restriction in connect_helper
"git archive --remote=<remote>" learned to talk over the smart http (aka stateless) transport.
Needs review.
source: <[email protected]>
* jx/sideband-chomp-newline-fix (2023-12-18) 3 commits
- pkt-line: do not chomp newlines for sideband messages
- pkt-line: memorize sideband fragment in reader
- test-pkt-line: add option parser for unpack-sideband
Sideband demultiplexer fixes.
Will merge to 'next'?
source: <[email protected]>
* 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: <[email protected]>
* rj/status-bisect-while-rebase (2023-10-16) 1 commit (merged to 'next' on 2023-12-21 at 929a027fb7)
+ status: fix branch shown when not only bisecting
"git status" is taught to show both the branch being bisected and being rebased when both are in effect at the same time.
Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>
--------------------------------------------------
[Discarded]
* jc/sparse-checkout-eoo (2023-12-21) 5 commits
. sparse-checkout: tighten add_patterns_from_input()
. sparse-checkout: use default patterns for 'set' only !stdin
. SQUASH??? end-of-options test
. sparse-checkout: take care of "--end-of-options" in set/add/check-rules
- Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options
"git sparse-checkout (add|set) --[no-]cone --end-of-options" did not handle "--end-of-options" correctly after a recent update.
Superseded by the en/sparse-checkout-eoo topic.
source: <[email protected]>