What's cooking in git.git (Mar 2024, #09; Thu, 28)

[Junio C Hamano <gitster@pobox.com>]

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-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']

* bt/fuzz-config-parse (2024-03-15) 1 commit
  (merged to 'next' on 2024-03-21 at 6e9f331d68)
 + fuzz: add fuzzer for config parsing

 A new fuzz target that exercises config parsing code has been
 added.
 source: <pull.1692.v2.git.1710481652130.gitgitgadget@gmail.com>


* eb/hash-transition (2023-10-02) 30 commits
  (merged to 'next' on 2024-03-11 at 9cff2e4ab7)
 + 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

 Work to support a repository that work with both SHA-1 and SHA-256
 hash algorithms has started.
 source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>


* jc/show-untracked-false (2024-03-13) 2 commits
  (merged to 'next' on 2024-03-21 at 6d1f5603c6)
 + status: allow --untracked=false and friends
 + status: unify parsing of --untracked= and status.showUntrackedFiles

 The status.showUntrackedFiles configuration variable had a name
 that tempts users to set a Boolean value expressed in our usual
 "false", "off", and "0", but it only took "no".  This has been
 corrected so "true" and its synonyms are taken as "normal", while
 "false" and its synonyms are taken as "no".
 source: <20240313173214.962532-1-gitster@pobox.com>


* jk/drop-hg-to-git (2024-03-20) 1 commit
  (merged to 'next' on 2024-03-21 at 603d614310)
 + contrib: drop hg-to-git script

 Remove an ancient and not well maintained Hg-to-git migration
 script from contrib/.

 Acked-by: Stelian Pop <stelian@popies.net>
 cf. <37e4cd61-b370-437e-bd42-f98f47d3ad32@popies.net>
 source: <20240320094824.GA2445978@coredump.intra.peff.net>


* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
  (merged to 'next' on 2024-03-21 at 96801520db)
 + diff.*Prefix: use camelCase in the doc and test titles
 + diff: add diff.srcPrefix and diff.dstPrefix configuration variables

 "git diff" and friends learned two extra configuration variables,
 diff.srcPrefix and diff.dstPrefix.
 source: <20240315010310.GA1901653@quokka>
 source: <xmqq8r2ioh19.fsf@gitster.g>


* rs/t-prio-queue-fixes (2024-03-18) 2 commits
  (merged to 'next' on 2024-03-21 at 0730741187)
 + t-prio-queue: check result array bounds
 + t-prio-queue: shorten array index message

 Test clean-up.
 source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>

--------------------------------------------------
[New Topics]

* 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.

 Needs review.
 source: <20240328101356.300374-1-e@80x24.org>


* ps/reftable-block-iteration-optim (2024-03-27) 9 commits
 - reftable/block: reuse `zstream` state on inflation
 - reftable/block: open-code call to `uncompress2()`
 - reftable/block: reuse uncompressed blocks
 - reftable/reader: iterate to next block in place
 - reftable/block: move ownership of block reader into `struct table_iter`
 - reftable/block: introduce `block_reader_release()`
 - reftable/block: better grouping of functions
 - reftable/block: merge `block_iter_seek()` and `block_reader_seek()`
 - reftable/block: rename `block_reader_start()`

 The code to iterate over reftable blocks has seen some optimization
 to reduce memory allocation and deallocation.

 Needs review.
 source: <cover.1711519925.git.ps@pks.im>


* rj/add-p-explicit-reshow (2024-03-28) 2 commits
 - add-patch: do not print hunks repeatedly
 - add-patch: introduce 'p' in interactive-patch

 "git add -p" and other "interactive hunk selection" UI has learned to
 skip showing the hunk immediately after it has already been shown, and
 an additional action to explicitly ask to reshow the current hunk.

 Will merge to 'next'?
 source: <60d978d0-f69a-4b65-b4ba-d30dac8f112a@gmail.com>

--------------------------------------------------
[Cooking]

* az/grep-group-error-message-update (2024-03-25) 1 commit
  (merged to 'next' on 2024-03-27 at 567bf00ed4)
 + grep: improve errors for unmatched ( and )

 Error message clarification.

 Will merge to 'master'.
 source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>


* bc/credential-scheme-enhancement (2024-03-27) 12 commits
 . credential: add support for multistage credential rounds
 . t5563: refactor for multi-stage authentication
 . docs: set a limit on credential line length
 . credential: enable state capability
 . credential: add an argument to keep state
 . http: add support for authtype and credential
 . docs: indicate new credential protocol fields
 . credential: gate new fields on capability
 . credential: add a field for pre-encoded credentials
 . http: use new headers for each object request
 . remote-curl: reset headers on new request
 . credential: add an authtype field

 The credential helper protocol, together with the HTTP layer, have
 been enhanced to support authentication schemes different from
 username & password pair, like Bearer and NTLM.

 Expecting a reroll.
 cf. <ZgSQ5o_KyqDaxz1m@tapette.crustytoothpaste.net>
 source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>


* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
  (merged to 'next' on 2024-03-28 at e2749914ab)
 + pretty: find pretty formats case-insensitively
 + pretty: update tests to use `test_config`

 The "--pretty=<shortHand>" option of the commands in the "git log"
 family, defined as "[pretty] shortHand = <expansion>" should have
 been looked up case insensitively, but was not, which has been
 corrected.

 Will merge to 'master'.
 source: <20240324214316.917513-1-brianmlyles@gmail.com>


* ds/grep-doc-updates (2024-03-25) 2 commits
  (merged to 'next' on 2024-03-27 at 681f08cbc5)
 + grep docs: describe --no-index further and improve formatting a bit
 + grep docs: describe --recurse-submodules further and improve formatting a bit

 Documentation updates.

 Will merge to 'master'.
 source: <cover.1711398665.git.dsimic@manjaro.org>


* ja/doc-markup-updates (2024-03-25) 4 commits
 - doc: git-clone: apply new documentation guidelines
 - doc: git-init: apply new documentation formatting guidelines
 - doc: allow literal and emphasis format in doc vs help tests
 - doc: rework CodingGuidelines with new formatting rules

 Documentation rules has been explicitly described how to mark-up
 literal parts and a few manual pages have been updated as examples.

 Will merge to 'next'?
 source: <pull.1702.git.1711318739.gitgitgadget@gmail.com>


* mg/editorconfig-makefile (2024-03-23) 1 commit
 - editorconfig: add Makefiles to "text files"

 The .editorconfig file has been taught that a Makefile uses HT
 indentation.

 Will merge to 'next'?
 source: <20240322221813.13019-1-mg@max.gautier.name>


* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
  (merged to 'next' on 2024-03-27 at 9ef22a39b6)
 + t/README: mention test files are make targets

 The README now gives a hint on running individual tests in the "t/"
 directory with "make t<num>-*.sh t<num>-*.sh".

 Will merge to 'master'.
 source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>


* ps/reftable-binsearch-updates (2024-03-25) 7 commits
 - reftable/block: avoid decoding keys when searching restart points
 - reftable/record: extract function to decode key lengths
 - reftable/block: fix error handling when searching restart points
 - reftable/block: refactor binary search over restart points
 - reftable/refname: refactor binary search over refnames
 - reftable/basics: improve `binsearch()` test
 - reftable/basics: fix return type of `binsearch()` to be `size_t`

 Reftable code clean-up and some bugfixes.

 Needs review.
 source: <cover.1711361340.git.ps@pks.im>


* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
  (merged to 'next' on 2024-03-27 at 16969df3e8)
 + midx: use strvec_pushf() for pack-objects base name

 Code clean-up.

 Will merge to 'master'.
 source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>


* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
  (merged to 'next' on 2024-03-27 at 1f9dbf70a0)
 + cat-file: use strbuf_expand_bad_format()
 + factor out strbuf_expand_bad_format()

 Code clean-up.

 Will merge to 'master'.
 source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>


* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
  (merged to 'next' on 2024-03-25 at 7c3dd28ca5)
 + doc/gitremote-helpers: fix more missing single-quotes

 Documentation mark-up fix.

 Will merge to 'master'.
 source: <20240320091748.GA2444639@coredump.intra.peff.net>


* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
  (merged to 'next' on 2024-03-25 at 4d3d391330)
 + reftable: fix tests being broken by NFS' delete-after-close semantics

 A unit test for reftable code tried to enumerate all files in a
 directory after reftable operations and expected to see nothing but
 the files it wanted to leave there, but was fooled by .nfs* cruft
 files left, which has been corrected.

 Will merge to 'master'.
 source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>


* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
  (merged to 'next' on 2024-03-25 at e7b1ec4df4)
 + t/README: document how to loop around test cases
 + t7800: use single quotes for test bodies
 + t7800: improve test descriptions with empty arguments

 Fix the way recently added tests interpolate variables defined
 outside them, and document the best practice to help future
 developers.

 Will merge to 'master'.
 source: <cover.1711074118.git.ps@pks.im>


* tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
 - t/perf: implement performace 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 `--date` 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
 - pack-bitmap-write.c: select pseudo-merge commits
 - pseudo-merge: implement support for selecting pseudo-merge commits
 - 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()`
 - pack-bitmap: drop unused `max_bitmaps` parameter
 - ewah: implement `ewah_bitmap_is_subset()`
 - config: repo_config_get_expiry()
 - Documentation/technical: describe pseudo-merge bitmaps format

 The pack-bitmap machinery learned to write pseudo-merge bitmaps,
 which act as imaginary octopus merges covering un-bitmapped
 reference tips. This enhances bitmap coverage, and thus,
 performance, for repositories with many references using bitmaps.

 Expecting a reroll.
 cf. <ZfyxCLpjbaScIdWA@nand.local>
 source: <cover.1710972293.git.me@ttaylorr.com>


* jc/release-notes-entry-experiment (2024-03-26) 1 commit
  (merged to 'next' on 2024-03-27 at 74ebe224e9)
 + SubmittingPatches: release-notes entry experiment

 Introduce an experimental protocol for contributors to propose the
 topic description to be used in the "What's cooking" report, the
 merge commit message for the topic, and in the release notes and
 document it in the SubmittingPatches document.

 Will merge to 'master'.
 source: <xmqq8r26eyva.fsf@gitster.g>


* jk/rebase-apply-leakfix (2024-03-22) 1 commit
  (merged to 'next' on 2024-03-25 at f9358272af)
 + rebase: use child_process_clear() to clean

 Leakfix.

 Will merge to 'master'.
 source: <20240322103502.GA2045297@coredump.intra.peff.net>


* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
 - MyFirstObjectWalk: add stderr to pipe processing
 - MyFirstObjectWalk: fix description for counting omitted objects
 - MyFirstObjectWalk: fix filtered object walk
 - MyFirstObjectWalk: fix misspelled "builtins/"
 - MyFirstObjectWalk: use additional arg in config_fn_t

 Update a more recent tutorial doc.

 Will merge to 'next'?
 source: <cover.1711537370.git.dirk@gouders.net>


* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
  (merged to 'next' on 2024-03-25 at f3393cabe5)
 + config.txt: describe handling of whitespace further
 + t1300: add more tests for whitespace and inline comments
 + config: really keep value-internal whitespace verbatim
 + config: minor addition of whitespace

 "git config" corrupted literal HT characters written in the
 configuration file as part of a value, which has been corrected.

 Will merge to 'master'.
 source: <cover.1711001016.git.dsimic@manjaro.org>


* jc/apply-parse-diff-git-header-names-fix (2024-03-28) 2 commits
  (merged to 'next' on 2024-03-28 at a35de15836)
 + t4126: make sure a directory with SP at the end is usable
  (merged to 'next' on 2024-03-27 at d586367985)
 + apply: parse names out of "diff --git" more carefully

 "git apply" failed to extract the filename the patch applied to,
 when the change was about an empty file created in or deleted from
 a directory whose name ends with a SP, which has been corrected.

 Will merge to 'master'.
 source: <xmqqh6gqt674.fsf_-_@gitster.g>
 source: <xmqqfrwlltjn.fsf@gitster.g>


* jk/pretty-subject-cleanup (2024-03-22) 7 commits
  (merged to 'next' on 2024-03-22 at 2796f347ad)
 + format-patch: fix leak of empty header string
 + format-patch: simplify after-subject MIME header handling
 + format-patch: return an allocated string from log_write_email_headers()
 + log: do not set up extra_headers for non-email formats
 + pretty: drop print_email_subject flag
 + pretty: split oneline and email subject printing
 + shortlog: stop setting pp.print_email_subject

 Code clean-up in the "git log" machinery that implements custom log
 message formatting.

 Will merge to 'master'.
 source: <20240320002555.GB903718@coredump.intra.peff.net>


* la/hide-trailer-info (2024-03-16) 7 commits
 - trailer: retire trailer_info_get() from API
 - trailer: make trailer_info struct private
 - trailer: make parse_trailers() return trailer_info pointer
 - interpret-trailers: access trailer_info with new helpers
 - sequencer: use the trailer iterator
 - trailer: teach iterator about non-trailer lines
 - Merge branch 'la/format-trailer-info' into la/hide-trailer-info
 (this branch uses la/format-trailer-info.)

 The trailer API has been reshuffled a bit.

 Needs review.
 source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>


* pb/advice-merge-conflict (2024-03-18) 2 commits
  (merged to 'next' on 2024-03-25 at 4414e31d81)
 + builtin/am: allow disabling conflict advice
 + sequencer: allow disabling conflict advice

 Hints that suggest what to do after resolving conflicts can now be
 squelched by disabling advice.mergeConflict.

 Acked-by: Phillip Wood <phillip.wood123@gmail.com>
 cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>

 Will merge to 'master'.
 source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>


* ps/pack-refs-auto (2024-03-25) 16 commits
 - builtin/gc: pack refs when using `git maintenance run --auto`
 - builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
 - t6500: extract objects with "17" prefix
 - builtin/gc: move `struct maintenance_run_opts`
 - builtin/pack-refs: introduce new "--auto" flag
 - builtin/pack-refs: release allocated memory
 - refs/reftable: expose auto compaction via new flag
 - refs: remove `PACK_REFS_ALL` flag
 - refs: move `struct pack_refs_opts` to where it's used
 - t/helper: drop pack-refs wrapper
 - refs/reftable: print errors on compaction failure
 - reftable/stack: gracefully handle failed auto-compaction due to locks
 - reftable/stack: use error codes when locking fails during compaction
 - reftable/error: discern locked/outdated errors
 - reftable/stack: fix error handling in `reftable_stack_init_addition()`
 - Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto

 "git pack-refs" learned the "--auto" option, which is a useful
 addition to be triggered from "git gc --auto".

 Acked-by: Karthik Nayak <karthik.188@gmail.com>
 cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>

 Will merge to 'next'.
 source: <cover.1711360631.git.ps@pks.im>


* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
  (merged to 'next' on 2024-03-25 at 8d11bd8bd4)
 + t5601: exercise clones with "includeIf.*.onbranch"

 An additional test to demonstrate something I am not sure what.

 Will merge to 'master'.
 source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>


* 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@manjaro.org>


* la/format-trailer-info (2024-03-15) 5 commits
 - trailer: finish formatting unification
 - trailer: begin formatting unification
 - format_trailer_info(): append newline for non-trailer lines
 - format_trailer_info(): drop redundant unfold_value()
 - format_trailer_info(): use trailer_item objects
 (this branch is used by la/hide-trailer-info.)

 The code to format trailers have been cleaned up.

 Comments?
 source: <pull.1694.git.1710485706.gitgitgadget@gmail.com>


* rs/config-comment (2024-03-15) 3 commits
  (merged to 'next' on 2024-03-28 at 83eaadc2b6)
 + config: allow tweaking whitespace between value and comment
 + config: fix --comment formatting
 + config: add --comment option to add a comment

 "git config" learned "--comment=<message>" option to leave a
 comment immediately after the "variable = value" on the same line
 in the configuration file.

 Will merge to 'master'.
 source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>


* pw/checkout-conflict-errorfix (2024-03-14) 5 commits
  (merged to 'next' on 2024-03-22 at 9977ac6c75)
 + checkout: fix interaction between --conflict and --merge
 + checkout: cleanup --conflict=<style> parsing
 + merge options: add a conflict style member
 + merge-ll: introduce LL_MERGE_OPTIONS_INIT
 + xdiff-interface: refactor parsing of merge.conflictstyle

 "git checkout --conflict=bad" reported a bad conflictStyle as if it
 were given to a configuration variable; it has been corrected to
 report that the command line option is bad.

 Will merge to 'master'.
 source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>


* bl/cherry-pick-empty (2024-03-25) 7 commits
  (merged to 'next' on 2024-03-28 at 22e8e4a68e)
 + cherry-pick: add `--empty` for more robust redundant commit handling
 + cherry-pick: enforce `--keep-redundant-commits` incompatibility
 + sequencer: do not require `allow_empty` for redundant commit options
 + sequencer: handle unborn branch with `--allow-empty`
 + rebase: update `--empty=ask` to `--empty=stop`
 + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
 + docs: address inaccurate `--empty` default with `--exec`

 Allow git-cherry-pick(1) to automatically drop redundant commits via
 a new `--empty` option, similar to the `--empty` options for
 git-rebase(1) and git-am(1). Includes a soft deprecation of
 `--keep-redundant-commits` as well as some related docs changes and
 sequencer code cleanup.

 Will merge to 'master'.
 cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
 source: <20240119060721.3734775-2-brianmlyles@gmail.com>


* 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@coredump.intra.peff.net>
 cf. <20240320001934.GA903718@coredump.intra.peff.net>
 source: <20240319183722.211300-1-ignacio@iencinas.com>


* jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits
  (merged to 'next' on 2024-03-27 at 5c9d5be660)
 + transport-helper: send "true" value for object-format option
 + transport-helper: drop "object-format <algo>" option
 + transport-helper: use write helpers more consistently

 The implementation and documentation of "object-format" option
 exchange between the Git itself and its remote helpers did not
 quite match.

 Will merge to 'master'.
 source: <20240320093226.GA2445531@coredump.intra.peff.net>


* jk/core-comment-string (2024-03-27) 17 commits
  (merged to 'next' on 2024-03-28 at fbf8eb9331)
 + config: add core.commentString
 + config: allow multi-byte core.commentChar
 + environment: drop comment_line_char compatibility macro
 + wt-status: drop custom comment-char stringification
 + sequencer: handle multi-byte comment characters when writing todo list
 + find multi-byte comment chars in unterminated buffers
 + find multi-byte comment chars in NUL-terminated strings
 + prefer comment_line_str to comment_line_char for printing
 + strbuf: accept a comment string for strbuf_add_commented_lines()
 + strbuf: accept a comment string for strbuf_commented_addf()
 + strbuf: accept a comment string for strbuf_stripspace()
 + environment: store comment_line_char as a string
 + strbuf: avoid shadowing global comment_line_char name
 + commit: refactor base-case of adjust_comment_line_char()
 + strbuf: avoid static variables in strbuf_add_commented_lines()
 + strbuf: simplify comment-handling in add_lines() helper
 + config: forbid newline as core.commentChar

 core.commentChar used to be limited to a single byte, but has been
 updated to allow an arbitrary multi-byte sequence.

 Will merge to 'master'.
 source: <20240312091013.GA95442@coredump.intra.peff.net>
 source: <20240327081922.GA830163@coredump.intra.peff.net>


* js/build-fuzz-more-often (2024-03-05) 3 commits
 - SQUASH???
 - fuzz: link fuzz programs with `make all` on Linux
 - ci: also define CXX environment variable

 In addition to building the objects needed, try to link the objects
 that are used in fuzzer tests, to make sure at least they build
 without bitrot, in Linux CI runs.

 Stalled.
 cf. <xmqq1q7w8xx6.fsf@gitster.g>
 source: <cover.1709673020.git.steadmon@google.com>


* sj/userdiff-c-sharp (2024-03-28) 1 commit
 - userdiff: better method/property matching for C#

 The userdiff patterns for C# has been updated.

 Needs review.
 source: <pull.1682.v4.git.git.1711653257043.gitgitgadget@gmail.com>


* 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@google.com>


* js/cmake-with-test-tool (2024-02-23) 2 commits
 - cmake: let `test-tool` run the unit tests, too
 - Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool
 (this branch uses js/unit-test-suite-runner.)

 "test-tool" is now built in CMake build to also run the unit tests.

 May want to roll it into the base topic.
 source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>


* js/unit-test-suite-runner (2024-02-23) 8 commits
 - ci: use test-tool as unit test runner on Windows
 - t/Makefile: run unit tests alongside shell tests
 - unit tests: add rule for running with test-tool
 - test-tool run-command testsuite: support unit tests
 - test-tool run-command testsuite: remove hardcoded filter
 - test-tool run-command testsuite: get shell from env
 - t0080: turn t-basic unit test into a helper
 - Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
 (this branch is used by js/cmake-with-test-tool.)

 The "test-tool" has been taught to run testsuite tests in parallel,
 bypassing the need to use the "prove" tool.

 Needs review.
 source: <cover.1708728717.git.steadmon@google.com>


* 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@gmail.com>
 cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@gmail.com>
 source: <d37781c3-6af2-409b-95a8-660a9b92d20b@smtp-relay.sendinblue.com>


* 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@mail.gmail.com>
 source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>


* 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@ttaylorr.com>


* 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@pobox.com>