Skip to contentSkip to conversation

What's cooking in git.git (Aug 2024, #04; Mon, 12)

DISCUSSION Junio C Hamano 1 participant 1 message Aug 13, 2024

lore
Share & tools
lore
#0 lore raw

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]

* jc/tests-no-useless-tee (2024-08-08) 1 commit (merged to 'next' on 2024-08-12 at 188e777e16)
+ tests: drop use of 'tee' that hides exit status

Test fixes.

Will merge to 'master'.
source: <[email protected]>

* js/libgit-rust (2024-08-09) 5 commits
- cgit: add higher-level cgit crate
- config: add git_configset_alloc() and git_configset_clear_and_free()
- cgit-sys: add repo initialization and config access
- cgit-sys: introduce Rust wrapper for libgit.a
- common-main: split init and exit code into new files

An rust binding to libgit.a functions has been introduced.
source: <[email protected]>

* xx/diff-tree-remerge-diff-fix (2024-08-09) 1 commit (merged to 'next' on 2024-08-09 at cabe67c0d1)
+ diff-tree: fix crash when used with --remerge-diff (this branch is used by jc/range-diff-lazy-setup.)

"git rev-list ... | git diff-tree -p --remerge-diff --stdin" should behave more or less like "git log -p --remerge-diff" but instead it crashed, forgetting to prepare a temporary object store needed.

Will merge to 'master'.
source: <[email protected]>

* jc/grammo-fixes (2024-08-09) 2 commits
- doc: grammofix in git-diff-tree
- tutorial: grammofix

source: <[email protected]>

* jc/range-diff-lazy-setup (2024-08-09) 2 commits
- remerge-diff: clean up temporary objdir at a central place
- remerge-diff: lazily prepare temporary objdir on demand (this branch uses xx/diff-tree-remerge-diff-fix.)

source: <[email protected]>

--------------------------------------------------
[Stalled]

* 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. <[email protected]>
source: <[email protected]>

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

* jc/t3206-test-when-finished-fix (2024-08-06) 1 commit (merged to 'next' on 2024-08-08 at 46461db3a2)
+ t3206: test_when_finished before dirtying operations, not after

Test clean-up.

Will merge to 'master'.
source: <[email protected]>

* jc/too-many-arguments (2024-08-06) 4 commits
- miscellaneous: avoid "too many arguments"
- notes: avoid "too many arguments"
- cat-file: avoid "too many arguments"
- refs: avoid "too many arguments"

Error message clarification.

On hold.
source: <[email protected]>

* ps/leakfixes-part-4 (2024-08-08) 23 commits
- builtin/diff: free symmetric diff members
- diff: free state populated via options
- builtin/log: fix leak when showing converted blob contents
- userdiff: fix leaking memory for configured diff drivers
- builtin/format-patch: fix various trivial memory leaks
- diff: fix leak when parsing invalid ignore regex option
- unpack-trees: clear index when not propagating it
- sequencer: release todo list on error paths
- merge-ort: unconditionally release attributes index
- builtin/fast-export: plug leaking tag names
- builtin/fast-export: fix leaking diff options
- builtin/fast-import: plug trivial memory leaks
- builtin/notes: fix leaking struct notes_tree when merging notes
- builtin/rebase: fix leaking commit.gpgsign value
- config: fix leaking comment character config
- submodule-config: fix leaking name enrty when traversing submodules
- read-cache: fix leaking hashfile when writing index fails
- bulk-checkin: fix leaking state TODO
- object-name: fix leaking symlink paths in object context
- object-file: fix memory leak when reading corrupted headers
- git: fix leaking system paths
- remote: plug memory leak when aliasing URLs
- Merge branch 'ps/leakfixes-part-3' into ps/leakfixes-part-4 (this branch uses ps/leakfixes-part-3.)

More leak fixes.

Will merge to 'next'?
source: <[email protected]>

* cp/unit-test-reftable-readwrite (2024-08-09) 4 commits
- t-reftable-readwrite: add test for known error
- t-reftable-readwrite: use 'for' in place of infinite 'while' loops
- t-reftable-readwrite: use free_names() instead of a for loop
- t: move reftable/readwrite_test.c to the unit testing framework

Needs review.
source: <[email protected]>

* ps/config-wo-the-repository (2024-08-07) 21 commits
- config: hide functions using the_repository by default
- global: prepare for hiding away repo-less config functions
- config: don't depend on the_repository with branch conditions
- config: don't have setters depend on the_repository
- config: pass repo to functions that rename or copy sections
- config: pass repo to git_die_config()
- config: pass repo to git_config_get_expiry_in_days()
- config: pass repo to git_config_get_expiry()
- config: pass repo to git_config_get_max_percent_split_change()
- config: pass repo to git_config_get_split_index()
- config: pass repo to git_config_get_index_threads()
- config: expose repo_config_clear()
- config: introduce missing setters that take repo as parameter
- path: hide functions using the_repository by default
- path: stop relying on the_repository in worktree_git_path()
- path: stop relying on the_repository when reporting garbage
- hooks: remove implicit dependency on the_repository
- editor: do not rely on the_repository for interactive edits
- path: expose do_git_common_path() as strbuf_git_common_pathv()
- path: expose do_git_path() as repo_git_pathv()
- Merge branch 'ps/refs-wo-the-repository' into ps/config-wo-the-repository (this branch uses ps/refs-wo-the-repository.)

Use of API functions that implicitly depend on the_repository object in the config subsystem has been rewritten to pass a repository object through the callchain.

Needs review.
source: <[email protected]>

* ps/submodule-ref-format (2024-08-08) 8 commits
(merged to 'next' on 2024-08-09 at 2b17964809)
+ object: fix leaking packfiles when closing object store
+ submodule: fix leaking seen submodule names
+ submodule: fix leaking fetch tasks
+ builtin/submodule: allow "add" to use different ref storage format
+ refs: fix ref storage format for submodule ref stores
+ builtin/clone: propagate ref storage format to submodules
+ builtin/submodule: allow cloning with different ref storage format
+ git-submodule.sh: break overly long command lines

Support to specify ref backend for submodules has been enhanced.

Will merge to 'master'.
source: <[email protected]>

* jc/transport-leakfix (2024-08-07) 1 commit (merged to 'next' on 2024-08-07 at eec3a24826)
+ transport: fix leak with transport helper URLs (this branch is used by ps/transport-leakfix-test-updates.)

Leakfix.

Will merge to 'master'.
source: <[email protected]>

* ps/transport-leakfix-test-updates (2024-08-08) 1 commit (merged to 'next' on 2024-08-12 at ee80dbc4f6)
+ transport: mark more tests leak-free
(this branch uses jc/transport-leakfix.)

Test updates.

Will merge to 'master'.
source: <ZrRPD0ggZapZym7E@tanuki>

* ag/t7004-modernize (2024-08-08) 8 commits
(merged to 'next' on 2024-08-09 at 7bce577df4)
+ t7004: make use of write_script
+ t7004: use single quotes instead of double quotes
+ t7004: begin the test body on the same line as test_expect_success
+ t7004: description on the same line as test_expect_success
+ t7004: do not prepare things outside test_expect_success
+ t7004: use indented here-doc
+ t7004: one command per line
+ t7004: remove space after redirect operators

Coding style fixes to a test script.

Will merge to 'master'.
source: <[email protected]>

* ds/for-each-ref-is-base (2024-08-12) 3 commits
- p1500: add is-base performance tests
- for-each-ref: add 'is-base' token
- commit-reach: add get_branch_base_for_tip

'git for-each-ref' learned a new "--format" atom to find the branch that the history leading to a given commit "%(is-base:<commit>)" is likely based on.

Comments?
source: <[email protected]>

* jk/apply-patch-mode-check-fix (2024-08-05) 1 commit (merged to 'next' on 2024-08-05 at 2dc1a81c89)
+ apply: canonicalize modes read from patches

The patch parser in 'git apply' has been a bit more lenient against unexpected mode bits, like 100664, recorded on extended header lines.

Will merge to 'master'.
source: <[email protected]>

* kl/test-fixes (2024-08-05) 2 commits (merged to 'next' on 2024-08-06 at 2cdcac6ce4)
+ t6421: fix test to work when repo dir contains d0
+ set errno=0 before strtoX calls

A flakey test and incorrect calls to strtoX() functions have been fixed.

Will merge to 'master'.
source: <[email protected]>

* ps/ls-remote-out-of-repo-fix (2024-08-02) 1 commit (merged to 'next' on 2024-08-05 at 6438d8196d)
+ builtin/ls-remote: fall back to SHA1 outside of a repo

A recent update broke "git ls-remote" used outside a repository, which has been corrected.

Will merge to 'master'.
source: <c52112d3946b2fd8d030580cd7acb809fa54012a.1722573777.git.ps@pks.im>

* ps/ref-api-cleanup (2024-08-02) 1 commit
(merged to 'next' on 2024-08-05 at d57856ae19)
+ refs: drop ref_store-less functions

Code clean-up.

Will merge to 'master'.
source: <1d9add71065dabb3d7bf81529d04afbcf91e3a69.1722577074.git.ps@pks.im>

* rs/use-decimal-width (2024-08-05) 1 commit
(merged to 'next' on 2024-08-06 at 99ccbb43de)
+ log-tree: use decimal_width()

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* ss/packed-ref-store-leakfix (2024-08-05) 1 commit (merged to 'next' on 2024-08-06 at 5003ec4218)
+ refs/files: prevent memory leak by freeing packed_ref_store

Leakfix.

Will merge to 'master'.
source: <[email protected]>

* tb/t7704-deflake (2024-08-05) 1 commit
(merged to 'next' on 2024-08-07 at d3c0727946)
+ t/t7704-repack-cruft.sh: avoid failures during long-running tests

A test that fails on an unusually slow machine was found, and made less likely to cause trouble by lengthening the expiry value it uses.

Will merge to 'master'.
source: <95cdc30bad38f464b37e87d78f38e1d91c9e083b.1722886630.git.me@ttaylorr.com>

* sj/ref-fsck (2024-08-08) 9 commits
(merged to 'next' on 2024-08-09 at 3bde10da94)
+ fsck: add ref name check for files backend
+ files-backend: add unified interface for refs scanning
+ builtin/refs: add verify subcommand
+ refs: set up ref consistency check infrastructure
+ fsck: add refs report function
+ fsck: add a unified interface for reporting fsck messages
+ fsck: make "fsck_error" callback generic
+ fsck: rename objects-related fsck error functions
+ fsck: rename "skiplist" to "skip_oids"

"git fsck" infrastructure has been taught to also check the sanity of the ref database, in addition to the object database.

Will merge to 'master'.
source: <[email protected]>

* ps/refs-wo-the-repository (2024-07-30) 5 commits
(merged to 'next' on 2024-08-06 at fef5e26d47)
+ refs/reftable: stop using the_repository
+ refs/packed: stop using the_repository
+ refs/files: stop using the_repository
+ refs/files: stop using the_repository in parse_loose_ref_contents()
+ refs: stop using the_repository
(this branch is used by ps/config-wo-the-repository.)

In the refs subsystem, implicit reliance of the_repository has been eliminated; the repository associated with the ref store object is used instead.

Will merge to 'master'.
cf. <ZqnEuz9uFgUwWKkc@tanuki>
source: <[email protected]>

* rs/t-example-simplify (2024-07-30) 1 commit
(merged to 'next' on 2024-08-08 at edeb01c38e)
+ t-example-decorate: remove test messages

Unit test simplification.

Will merge to 'master'.
source: <[email protected]>

* cc/promisor-remote-capability (2024-07-31) 4 commits
- promisor-remote: check advertised name or URL
- Add 'promisor-remote' capability to protocol v2
- strbuf: refactor strbuf_trim_trailing_ch()
- version: refactor strbuf_sanitize()

The v2 protocol learned to allow the server to advertise possible promisor remotes, and the client to respond with what promissor remotes it uses, so that the server side can omit objects that the client can lazily obtain from these other promissor remotes.

Inviting further discussion.
source: <[email protected]>

* ps/reftable-stack-compaction (2024-08-08) 9 commits (merged to 'next' on 2024-08-09 at d7875bf14b)
+ reftable/stack: handle locked tables during auto-compaction
+ reftable/stack: fix corruption on concurrent compaction
+ reftable/stack: use lock_file when adding table to "tables.list"
+ reftable/stack: do not die when fsyncing lock file files
+ reftable/stack: simplify tracking of table locks
+ reftable/stack: update stats on failed full compaction
+ reftable/stack: test compaction with already-locked tables
+ reftable/stack: extract function to setup stack with N tables
+ reftable/stack: refactor function to gather table sizes

The code paths to compact multiple reftable files have been updated to correctly deal with multiple compaction triggering at the same time.

Will merge to 'master'.
source: <[email protected]>

* rh/http-proxy-path (2024-08-02) 1 commit
(merged to 'next' on 2024-08-05 at d6f1fb194a)
+ http: do not ignore proxy path

The value of http.proxy can have "path" at the end for a socks proxy that listens to a unix-domain socket, but we started to discard it when we taught proxy auth code path to use the credential helpers, which has been corrected.

Will merge to 'master'.
source: <[email protected]>

* jc/refs-symref-referent (2024-08-09) 3 commits (merged to 'next' on 2024-08-09 at 3183f3d05b)
+ ref-filter: populate symref from iterator
+ refs: add referent to each_ref_fn
+ refs: keep track of unresolved reference value in iterators

The refs API has been taught to give symref target information to the users of ref iterators, allowing for-each-ref and friends to avoid an extra ref_resolve_* API call per a symbolic ref.

Will merge to 'master'.
source: <[email protected]>

* jk/osxkeychain-username-is-nul-terminated (2024-08-01) 1 commit (merged to 'next' on 2024-08-05 at 34a238e047)
+ credential/osxkeychain: respect NUL terminator in username

The credential helper to talk to OSX keychain sometimes sent garbage bytes after the username, which has been corrected.

Will merge to 'master'.
source: <[email protected]>

* tb/config-fixed-value-with-valueless-true (2024-08-01) 1 commit (merged to 'next' on 2024-08-06 at 0476e5ba76)
+ config.c: avoid segfault with --fixed-value and valueless config

"git config --value=foo --fixed-value section.key newvalue" barfed when the existing value in the configuration file used the valueless true syntax, which has been corrected.

Will merge to 'master'.
source: <c78bacfa8fb274fbb48f259b13f4f30253932f69.1722532013.git.me@ttaylorr.com>

* jc/jl-git-no-advice-fix (2024-08-01) 1 commit
(merged to 'next' on 2024-08-06 at 468bfce24b)
+ t0018: remove leftover debugging cruft

Remove leftover debugging cruft from a test script.

Will merge to 'master'.
source: <[email protected]>

* cp/unit-test-reftable-pq (2024-08-01) 7 commits
(merged to 'next' on 2024-08-05 at 05e47f7097)
+ 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 unnecessary curly braces in reftable/pq.c

The tests for "pq" part of reftable library got rewritten to use the unit test framework.

Will merge to 'master'.
cf. <Zqt02XmevPRB3idt@tanuki>
source: <[email protected]>

* tb/incremental-midx-part-1 (2024-08-06) 19 commits (merged to 'next' on 2024-08-12 at 92ec55fd49)
+ 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.

Will merge to 'master'.
source: <[email protected]>

* ja/doc-synopsis-markup (2024-08-12) 3 commits
- doc: apply synopsis simplification on git-clone and git-init
- doc: update the guidelines to reflect the current formatting rules
- doc: introduce a synopsis custom paragraph attribute

The way AsciiDoc is used for SYNOPSIS part of the manual pages has been revamped. The sources, at least for the simple cases, got vastly pleasant to work with.

Comments?
source: <[email protected]>

* tc/fetch-bundle-uri (2024-07-24) 3 commits
- fetch: use bundle URIs when having creationToken heuristic
- transport: introduce transport_has_remote_bundle_uri()
- clone: remove double bundle list clear code

Allow "git fetch" take advantage of bundleURI feature.

Expecting a reroll or retraction.
source: <ZqObobw8FsDMkllm@tanuki>

* jc/leakfix-hashfile (2024-07-26) 1 commit
(merged to 'next' on 2024-08-06 at 7793a7fc56)
+ csum-file: introduce discard_hashfile()

Leakfix.

Will merge to 'master'.
source: <[email protected]>

* jc/leakfix-mailmap (2024-07-26) 1 commit (merged to 'next' on 2024-08-06 at 22f73301fd)
+ mailmap: plug memory leak in read_mailmap_blob()

Leakfix.

Will merge to 'master'.
source: <[email protected]>

* jr/ls-files-expand-literal-doc (2024-07-26) 1 commit (merged to 'next' on 2024-08-06 at 0e7c8858ef)
+ doc: fix hex code escapes in git-ls-files

Docfix.

Will merge to 'master'.
source: <CACStHN-Gs2Sxej+md6zWr3V1dFo+pp=B4yEPm9=uPambDR2NaQ@mail.gmail.com>

* ps/leakfixes-part-3 (2024-08-01) 24 commits
(merged to 'next' on 2024-08-05 at e3d94036ff)
+ commit-reach: fix trivial memory leak when computing reachability
+ convert: fix leaking config strings
+ entry: fix leaking pathnames during delayed checkout
+ object-name: fix leaking commit list items
+ t/test-repository: fix leaking repository
+ builtin/credential-cache: fix trivial leaks
+ builtin/worktree: fix leaking derived branch names
+ builtin/shortlog: fix various trivial memory leaks
+ builtin/rerere: fix various trivial memory leaks
+ builtin/credential-store: fix leaking credential
+ builtin/show-branch: fix several memory leaks
+ builtin/rev-parse: fix memory leak with --parseopt
+ builtin/stash: fix various trivial memory leaks
+ builtin/remote: fix various trivial memory leaks
+ builtin/remote: fix leaking strings in branch_list
+ builtin/ls-remote: fix leaking pattern strings
+ builtin/submodule--helper: fix leaking buffer in is_tip_reachable
+ builtin/submodule--helper: fix leaking clone depth parameter
+ builtin/name-rev: fix various trivial memory leaks
+ builtin/describe: fix trivial memory leak when describing blob
+ builtin/describe: fix leaking array when running diff-index
+ builtin/describe: fix memory leak with --contains=
+ builtin/log: fix leaking branch name when creating cover letters
+ builtin/replay: plug leaking advance_name variable (this branch is used by ps/leakfixes-part-4.)

More leakfixes.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* ag/git-svn-global-ignores (2024-07-18) 2 commits (merged to 'next' on 2024-08-08 at 3ba5e164a6)
+ git-svn: use svn:global-ignores to create .gitignore
+ git-svn: add public property svn:global-ignores

"git svn" has been taught about svn:global-ignores property recent versions of Subversion has.

Will merge to 'master'.
source: <[email protected]>

* jc/safe-directory (2024-07-30) 4 commits
(merged to 'next' on 2024-08-05 at 77aa0f1d08)
+ safe.directory: setting safe.directory="." allows the "current" directory
+ safe.directory: normalize the configured path
+ safe.directory: normalize the checked path
+ safe.directory: preliminary clean-up

Follow-up on 2.45.1 regression fix.

Will merge to 'master'.
source: <[email protected]>

* cp/unit-test-reftable-tree (2024-08-04) 5 commits (merged to 'next' on 2024-08-06 at e32c456e45)
+ 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.

Will merge to 'master'.
cf. <Zqt1WTT_eJKEuO1z@tanuki>
cf. <ZrCx0NWRbFOOReki@tanuki>
source: <[email protected]>

* ew/cat-file-optim (2024-07-15) 10 commits
- cat-file: use writev(2) if available
- cat-file: batch_write: use size_t for length
- cat-file: batch-command uses content_limit
- object_info: content_limit only applies to blobs
- packfile: packed_object_info avoids packed_to_object_type
- cat-file: use delta_base_cache entries directly
- packfile: inline cache_or_unpack_entry
- packfile: fix off-by-one in content_limit comparison
- packfile: allow content-limit for cat-file
- packfile: move sizep computation

"git cat-file --batch" has been optimized.

Expecting a reroll.
cf. <ZqC82sDnj7Se_aVB@tanuki>
source: <[email protected]>

* jc/document-use-of-local (2024-07-15) 1 commit (merged to 'next' on 2024-08-07 at 3321b54659)
+ doc: note that AT&T ksh does not work with our test suite

Doc update.

Will merge to 'master'.
source: <[email protected]>

* jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit (merged to 'next' on 2024-08-06 at 1e59eac417)
+ Revert "reflog expire: don't use lookup_commit_reference_gently()"

"git reflog expire" failed to honor annotated tags when computing reachable commits.

Will merge to 'master'.
source: <[email protected]>

* es/doc-platform-support-policy (2024-08-02) 1 commit (merged to 'next' on 2024-08-09 at 110c94ea82)
+ Documentation: add platform support policy

A policy document that describes platform support levels and expectation on platform stakeholders has been introduced.

Will merge to 'master'.
source: <[email protected]>

* gt/unit-test-hashmap (2024-08-06) 1 commit (merged to 'next' on 2024-08-09 at e62febfb4e)
+ t: port helper/test-hashmap.c to unit-tests/t-hashmap.c

An existing test of hashmap API has been rewritten with the unit-test framework.

Will merge to 'master'.
cf. <CAP8UFD04uQbWhY0QDp+nC8VyBvpUs=tBDm=w4CzKK2GcwFZdGQ@mail.gmail.com>
source: <[email protected]>

* rs/unit-tests-test-run (2024-07-30) 6 commits (merged to 'next' on 2024-08-12 at 9df4336877)
+ t-strvec: use if_test
+ t-reftable-basics: use if_test
+ t-ctype: use if_test
+ unit-tests: add if_test
+ unit-tests: show location of checks outside of tests
+ t0080: use here-doc test body

Unit-test framework has learned a simple control structure to allow embedding test statements in-line instead of having to create a new function to contain them.

Will merge to 'master'.
source: <[email protected]>

* jc/patch-id (2024-07-29) 5 commits
(merged to 'next' on 2024-08-06 at 9ad078b49c)
+ patch-id: tighten code to detect the patch header
+ patch-id: rewrite code that detects the beginning of a patch
+ patch-id: make get_one_patchid() more extensible
+ patch-id: call flush_current_id() only when needed
+ t4204: patch-id supports various input format

The patch parser in "git patch-id" has been tightened to avoid getting confused by lines that look like a patch header in the log message.

Will merge to 'master'.
cf. <Zqh2T_2RLt0SeKF7@tanuki>
source: <[email protected]>