What's cooking (2023/06 #05)

1 files changed, 418 insertions, 367 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 2d79783b07..0afd13124c 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Jun 2023, #04; Wed, 14)
-X-master-at: d7d8841f67f29e6ecbad85a11805c907d0f00d5d
-X-next-at: 91eec092e0048861e489d5248932fabb011982fc
+Subject: What's cooking in git.git (Jun 2023, #05; Tue, 20)
+X-master-at: 6640c2d06d112675426cf436f0594f0e8c614848
+X-next-at: a1a0a3961aa073b8353158c01d6552ef94ac663d
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Jun 2023, #04; Wed, 14)
+What's cooking in git.git (Jun 2023, #05; Tue, 20)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -46,134 +46,325 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* jc/notes-separator-fix (2023-06-13) 1 commit
-  (merged to 'next' on 2023-06-14 at 3321da32a9)
- + notes: do not access before the beginning of an array
- (this branch uses tl/notes-separator.)
+* jc/test-modernization (2023-05-19) 20 commits
+  (merged to 'next' on 2023-06-15 at 811ac3f7ad)
+ + t7101-reset-empty-subdirs: modernize test format
+ + t6050-replace: modernize test format
+ + t5306-pack-nobase: modernize test format
+ + t5303-pack-corruption-resilience: modernize test format
+ + t5301-sliding-window: modernize test format
+ + t5300-pack-object: modernize test format
+ + t4206-log-follow-harder-copies: modernize test format
+ + t4202-log: modernize test format
+ + t4004-diff-rename-symlink: modernize test format
+ + t4003-diff-rename-1: modernize test format
+ + t4002-diff-basic: modernize test format
+ + t3903-stash: modernize test format
+ + t3700-add: modernize test format
+ + t3500-cherry: modernize test format
+ + t1006-cat-file: modernize test format
+ + t1002-read-tree-m-u-2way: modernize test format
+ + t1001-read-tree-m-2way: modernize test format
+ + t3210-pack-refs: modernize test format
+ + t0030-stripspace: modernize test format
+ + t0000-basic: modernize test format
+ (this branch is used by jc/test-modernization-2.)
 
- Fix to tl/notes-separator topic.
+ Originally merged to 'next' on 2023-06-13
+ source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
 
- Will merge to 'master'.
- source: <cover.1682671758.git.dyroneteng@gmail.com>
 
+* jc/test-modernization-2 (2023-05-23) 10 commits
+  (merged to 'next' on 2023-06-15 at 01df673682)
+ + t9400-git-cvsserver-server: modernize test format
+ + t9200-git-cvsexportcommit: modernize test format
+ + t9104-git-svn-follow-parent: modernize test format
+ + t9100-git-svn-basic: modernize test format
+ + t7700-repack: modernize test format
+ + t7600-merge: modernize test format
+ + t7508-status: modernize test format
+ + t7201-co: modernize test format
+ + t7111-reset-table: modernize test format
+ + t7110-reset-merge: modernize test format
+ (this branch uses jc/test-modernization.)
 
-* js/doc-unit-tests (2023-06-13) 1 commit
- - unit tests: Add a project plan document
+ Originally merged to 'next' on 2023-06-13
 
- Process to add some form of low-level unit tests has started.
+ Test style updates.
+ source: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
 
- Comments?  Filling in blanks?
- source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
 
+* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits
+  (merged to 'next' on 2023-06-15 at 268459fc6a)
+ + ci: drop linux-clang job
+ + ci: run ASan/UBSan in a single job
+ + ci: use clang for ASan/UBSan checks
+
+ Originally merged to 'next' on 2023-06-12
 
-* jt/doc-use-octal-with-printf (2023-06-13) 1 commit
- - CodingGuidelines: use octal escapes, not hex
+ Clang's sanitizer implementation seems to work better than GCC's.
+ source: <20230601180220.GA4167745@coredump.intra.peff.net>
 
- Suggest to refrain from using hex literals that are non-portable
- when writing printf(1) format strings.
 
- Will merge to 'next'.
- source: <20230614001558.277755-1-jonathantanmy@google.com>
+* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits
+  (merged to 'next' on 2023-06-15 at 6848e0b8e6)
+ + diff: detect pathspec magic not supported by --follow
+ + diff: factor out --follow pathspec check
+ + pathspec: factor out magic-to-name function
+
+ Originally merged to 'next' on 2023-06-13
 
+ "git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
+ source: <20230601173724.GA4158369@coredump.intra.peff.net>
 
-* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
- - diff-lib: honor override_submodule_config flag bit
 
- Even when diff.ignoreSubmodules tells us to ignore submodule
- changes, "git commit" with an index that already records changes to
- submodules should include the submodule changes in the resulting
- commit, but it did not.
+* kh/use-default-notes-doc (2023-06-06) 2 commits
+  (merged to 'next' on 2023-06-15 at f25ced157e)
+ + notes: move the documentation to the struct
+ + notes: update documentation for `use_default_notes`
 
- Will merge to 'next'.
- source: <20230614164856.3186012-2-sokcevic@google.com>
+ Originally merged to 'next' on 2023-06-13
+
+ Doc update.
+ source: <cover.1685958731.git.code@khaugsbakk.name>
+
+
+* la/doc-interpret-trailers (2023-06-14) 9 commits
+  (merged to 'next' on 2023-06-15 at 6ff4a2b913)
+ + doc: trailer: add more examples in DESCRIPTION
+ + doc: trailer: mention 'key' in DESCRIPTION
+ + doc: trailer.<token>.command: emphasize deprecation
+ + doc: trailer: use angle brackets for <token> and <value>
+ + doc: trailer: remove redundant phrasing
+ + doc: trailer: examples: avoid the word "message" by itself
+ + doc: trailer: drop "commit message part" phrasing
+ + doc: trailer: swap verb order
+ + doc: trailer: fix grammar
+
+ Originally merged to 'next' on 2023-06-14
+
+ Doc update.
+ source: <pull.1506.v4.git.git.1686797630.gitgitgadget@gmail.com>
+
+
+* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit
+  (merged to 'next' on 2023-06-15 at 62e19d66fb)
+ + commit-reach: fix memory leak in get_reachable_subset()
+
+ Originally merged to 'next' on 2023-06-12
+
+ Plug memory leak.
+ source: <20230603002819.1122129-1-mh@glandium.org>
+
+
+* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits
+  (merged to 'next' on 2023-06-15 at ebe3216719)
+ + completion: complete AUTO_MERGE
+ + Documentation: document AUTO_MERGE
+ + git-merge.txt: modernize word choice in "True merge" section
+ + completion: complete REVERT_HEAD and BISECT_HEAD
+ + revisions.txt: document more special refs
+ + revisions.txt: use description list for special refs
+
+ Originally merged to 'next' on 2023-06-13
+
+ Document more pseudo-refs and teach the command line completion
+ machinery to complete AUTO_MERGE.
+ source: <pull.1515.v2.git.1684783741.gitgitgadget@gmail.com>
+
+
+* ps/fetch-cleanups (2023-05-17) 9 commits
+  (merged to 'next' on 2023-06-15 at 33878153a5)
+ + fetch: use `fetch_config` to store "submodule.fetchJobs" value
+ + fetch: use `fetch_config` to store "fetch.parallel" value
+ + fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
+ + fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
+ + fetch: use `fetch_config` to store "fetch.pruneTags" value
+ + fetch: use `fetch_config` to store "fetch.prune" value
+ + fetch: pass through `fetch_config` directly
+ + fetch: drop unneeded NULL-check for `remote_ref`
+ + fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
+
+ Originally merged to 'next' on 2023-06-12
+
+ Code clean-up.
+ cf. <20230519002128.GD2442034@coredump.intra.peff.net>
+ source: <cover.1684324059.git.ps@pks.im>
+
+
+* tb/submodule-null-deref-fix (2023-05-25) 1 commit
+  (merged to 'next' on 2023-06-15 at 8cb6a7710a)
+ + builtin/submodule--helper.c: handle missing submodule URLs
+
+ Originally merged to 'next' on 2023-06-13
+
+ "git submodule" code trusted the data coming from the config (and
+ the in-tree .gitmodules file) too much without validating, leading
+ to NULL dereference if the user mucks with a repository (e.g.
+ submodule.<name>.url is removed).  This has been corrected.
+ source: <ae6cf3fa461b85e346f034371dae56a2790dfa20.1684957882.git.me@ttaylorr.com>
+
+
+* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit
+  (merged to 'next' on 2023-06-15 at 4e52ad2fb3)
+ + surround %s with quotes when failed to lookup commit
+
+ Originally merged to 'next' on 2023-06-12
+
+ Error message fix.
+ source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>
+
+
+* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit
+  (merged to 'next' on 2023-06-15 at 2d2446ff97)
+ + trace2 tests: fix PTHREADS prereq
+
+ Originally merged to 'next' on 2023-06-12
+
+ Test fix.
+ source: <20230525031218.3554586-1-tmz@pobox.com>
+
+
+* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit
+  (merged to 'next' on 2023-06-15 at dd97dd32f3)
+ + t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
+
+ Originally merged to 'next' on 2023-06-12
+
+ Test fix.
+ source: <20230525031026.3554406-1-tmz@pobox.com>
+
+
+* vd/worktree-config-is-per-repository (2023-05-26) 3 commits
+  (merged to 'next' on 2023-06-15 at 6301770cd6)
+ + repository: move 'repository_format_worktree_config' to repo scope
+ + config: pass 'repo' directly to 'config_with_options()'
+ + config: use gitdir to get worktree config
+
+ Originally merged to 'next' on 2023-06-13
+
+ The value of config.worktree is per-repository, but has been kept
+ in a singleton global variable per process. This has been OK as
+ most Git operations interacted with a single repository at a time,
+ but not right for operations like recursive "grep" that want to
+ access multiple repositories from a single process without forking.
+
+ The global variable has been eliminated and made into a member in
+ the per-repository data structure.
+ cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>
+ cf. <kl6lr0qwno2q.fsf@chooglen-macbookpro.roam.corp.google.com>
+ source: <pull.1536.v2.git.1685064781.gitgitgadget@gmail.com>
 
 --------------------------------------------------
-[Graduated to 'master']
+[New Topics]
 
-* gc/doc-cocci-updates (2023-04-27) 2 commits
-  (merged to 'next' on 2023-05-20 at 3fe237c1a8)
- + cocci: codify authoring and reviewing practices
- + cocci: add headings to and reword README
+* gc/discover-not-setup (2023-06-16) 1 commit
+  (merged to 'next' on 2023-06-16 at 27d1cd2a1b)
+ + setup.c: don't setup in discover_git_directory()
 
- Update documentation regarding Coccinelle patches.
- source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
+ discover_git_directory() no longer touches the_repository.
 
+ Will merge to 'master'.
+ source: <pull.1526.git.git.1686771358484.gitgitgadget@gmail.com>
 
-* jc/diff-s-with-other-options (2023-05-05) 1 commit
-  (merged to 'next' on 2023-05-20 at dda3826a68)
- + diff: fix interaction between the "-s" option and other options
 
- The "-s" (silent, squelch) option of the "diff" family of commands
- did not interact with other options that specify the output format
- well.  This has been cleaned up so that it will clear all the
- formatting options given before.
- source: <20230505165952.335256-1-gitster@pobox.com>
+* mh/credential-erase-improvements (2023-06-15) 2 commits
+  (merged to 'next' on 2023-06-16 at 5a3ed25303)
+ + credential: erase all matching credentials
+ + credential: avoid erasing distinct password
 
+ Will merge to 'master'.
+ cf. <20230615212116.GA39325@coredump.intra.peff.net>
+ source: <pull.1525.v4.git.git.1686856773.gitgitgadget@gmail.com>
 
-* jc/pack-ref-exclude-include (2023-05-12) 3 commits
-  (merged to 'next' on 2023-05-23 at 37333a2d00)
- + pack-refs: teach pack-refs --include option
- + pack-refs: teach --exclude option to exclude refs from being packed
- + docs: clarify git-pack-refs --all will pack all refs
 
- "git pack-refs" learns "--include" and "--exclude" to tweak the ref
- hierarchy to be packed using pattern matching.
- source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
+ - gc: add `gc.repackFilterTo` config option
+ - repack: implement `--filter-to` for storing filtered out objects
+ - gc: add `gc.repackFilter` config option
+ - repack: add `--filter=<filter-spec>` option
+ - repack: refactor finishing pack-objects command
+ - repack: refactor piping an oid to a command
+ - t/helper: add 'find-pack' test-tool
+ - pack-objects: add `--print-filtered` to print omitted objects
+ - pack-objects: allow `--filter` without `--stdout`
 
+ "git repack" machinery learns to pay attention to the "--filter="
+ option.
 
-* jk/format-patch-message-id-unleak (2023-05-19) 2 commits
-  (merged to 'next' on 2023-05-23 at 44b9e1ab91)
- + format-patch: free elements of rev.ref_message_ids list
- + format-patch: free rev.message_id when exiting
+ Needs review.
+ source: <20230614192541.1599256-1-christian.couder@gmail.com>
 
- Leakfix.
- source: <20230519000239.GA1975039@coredump.intra.peff.net>
 
+* js/cmake-wo-cache-h (2023-06-15) 1 commit
+  (merged to 'next' on 2023-06-16 at b138273e7e)
+ + cmake: adapt to `cache.h` being no more
+ (this branch uses en/header-split-cache-h-part-3.)
 
-* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
-  (merged to 'next' on 2023-05-19 at fc0fe3173d)
- + tag: keep the message file in case ref transaction fails
- + t/t7004-tag: add regression test for successful tag creation
- + doc: tag: document `TAG_EDITMSG`
+ Build fix in en/header-split-cache-h-part-3 topic.
+
+ Will merge to 'master'.
+ source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
 
- "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
- command failed, so that the user can salvage what they typed.
- source: <cover.1684258780.git.code@khaugsbakk.name>
 
+* ps/revision-stdin-with-options (2023-06-15) 3 commits
+ - revision: handle pseudo-opts in `--stdin` mode
+ - revision: small readability improvement for reading from stdin
+ - revision: reorder `read_revisions_from_stdin()`
 
-* sa/doc-ls-remote (2023-05-19) 6 commits
-  (merged to 'next' on 2023-05-20 at d577bf75a0)
- + ls-remote doc: document the output format
- + ls-remote doc: explain what each example does
- + ls-remote doc: show peeled tags in examples
- + ls-remote doc: remove redundant --tags example
- + show-branch doc: say <ref>, not <reference>
- + show-ref doc: update for internal consistency
+ The set-up code for the get_revision() API now allows feeding
+ options like --all and --not in the --stdin mode.
+
+ Will merge to 'next'?
+ source: <cover.1686839572.git.ps@pks.im>
+
+
+* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit
+  (merged to 'next' on 2023-06-16 at 472c7f55c9)
+ + ls-tree: fix documentation of %x format placeholder
 
  Doc update.
- source: <pull.1471.v4.git.git.1684469874.gitgitgadget@gmail.com>
 
+ Will merge to 'master'.
+ source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>
+
+
+* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
+  (merged to 'next' on 2023-06-20 at 08e5f2a6b5)
+ + commit: pass --no-divider to interpret-trailers
 
-* sl/diff-tree-sparse (2023-05-18) 1 commit
-  (merged to 'next' on 2023-05-24 at 5d4f2dec4d)
- + diff-tree: integrate with sparse index
+ When "git commit --trailer=..." invokes the interpret-trailers
+ machinery, it knows what it feeds to interpret-trailers is a full
+ log message without any patch, but failed to express that by
+ passing the "--no-divider" option, which has been corrected.
+
+ Will merge to 'master'.
+ source: <20230617042624.GA562686@coredump.intra.peff.net>
+
+
+* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
+  (merged to 'next' on 2023-06-20 at c1247fd527)
+ + http: handle both "h2" and "h2h3" in curl info lines
+
+ Curl library recently changed how http2 traces are shown and broke
+ the code to redact sensitive info header, which has been fixed.
+
+ Will merge to 'master'.
+ source: <20230617051559.GD562686@coredump.intra.peff.net>
 
- "git diff-tree" has been taught to take advantage of the
- sparse-index feature.
- cf. <2a2b7223-bb5d-65f9-95bb-9be45d329c87@github.com>
- source: <20230518154454.475487-1-cheskaqiqi@gmail.com>
 
+* rs/strbuf-expand-step (2023-06-18) 5 commits
+ - strbuf: simplify strbuf_expand_literal_cb()
+ - replace strbuf_expand() with strbuf_expand_step()
+ - replace strbuf_expand_dict_cb() with strbuf_expand_step()
+ - strbuf: factor out strbuf_expand_step()
+ - pretty: factor out expand_separator()
 
-* zh/ls-files-format-atoms (2023-05-23) 1 commit
-  (merged to 'next' on 2023-05-24 at 116b11effb)
- + ls-files: align format atoms with ls-tree
+ Code clean-up around strbuf_expand() API.
 
- Some atoms that can be used in "--format=<format>" for "git ls-tree"
- were not supported by "git ls-files", even though they were relevant
- in the context of the latter.
- source: <pull.1533.v2.git.1684832418299.gitgitgadget@gmail.com>
+ source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
 
 --------------------------------------------------
 [Stalled]
@@ -213,21 +404,6 @@ Release tarballs are available at:
  source: <ZDSTFwMFO7vbj/du@google.com>
 
 
-* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- - pack-bitmap.c: factor out `bitmap_index_seek_commit()`
- - pack-bitmap.c: use `bitmap_index_seek()` where possible
- - pack-bitmap.c: factor out manual `map_pos` manipulation
- - pack-bitmap.c: drop unnecessary 'inline's
- - pack-bitmap.c: hide bitmap internals in `read_be32()`
- - pack-bitmap.c: hide bitmap internals in `read_u8()`
-
- Clean-up the pack-bitmap codepath.
-
- Kicked back to 'seen' out of 'next'.
- There is a BUG() on data errors that needs to be fixed.
- source: <cover.1679342296.git.me@ttaylorr.com>
-
-
 * cb/checkout-same-branch-twice (2023-03-22) 2 commits
  - SQUASH??? the test marked to expect failure passes from day one
  - checkout/switch: disallow checking out same branch in multiple worktrees
@@ -327,21 +503,56 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
+* js/doc-unit-tests (2023-06-13) 1 commit
+ - unit tests: Add a project plan document
+
+ Process to add some form of low-level unit tests has started.
+
+ Comments?  Filling in blanks?
+ source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
+
+
+* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
+  (merged to 'next' on 2023-06-16 at ebb72b9bd8)
+ + CodingGuidelines: use octal escapes, not hex
+
+ Suggest to refrain from using hex literals that are non-portable
+ when writing printf(1) format strings.
+
+ Will merge to 'master'.
+ source: <20230614213145.475607-1-jonathantanmy@google.com>
+
+
+* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
+  (merged to 'next' on 2023-06-16 at bfc01bd5e2)
+ + diff-lib: honor override_submodule_config flag bit
+
+ Even when diff.ignoreSubmodules tells us to ignore submodule
+ changes, "git commit" with an index that already records changes to
+ submodules should include the submodule changes in the resulting
+ commit, but it did not.
+
+ Will merge to 'master'.
+ source: <20230614164856.3186012-2-sokcevic@google.com>
+
+
 * as/dtype-compilation-fix (2023-06-12) 1 commit
- - statinfo.h: move DTYPE defines from dir.h
+  (merged to 'next' on 2023-06-16 at 267100947e)
+ + statinfo.h: move DTYPE defines from dir.h
 
  Compilation fix for platforms without D_TYPE in struct dirent.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <20230606205935.3183276-1-asedeno@google.com>
 
 
 * la/docs-typofixes (2023-06-12) 1 commit
- - docs: typofixes
+  (merged to 'next' on 2023-06-16 at 56ddcb16e6)
+ + docs: typofixes
 
  Typofixes.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
 
 
@@ -391,105 +602,83 @@ Release tarballs are available at:
  source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
 
 
-* rj/leakfixes (2023-06-12) 6 commits
- - branch: fix a leak in setup_tracking
- - branch: fix a leak in check_tracking_branch
- - branch: fix a leak in inherit_tracking
- - branch: fix a leak in dwim_and_setup_tracking
- - remote: fix a leak in query_matches_negative_refspec
- - config: fix a leak in git_config_copy_or_rename_section_in_file
+* rj/leakfixes (2023-06-17) 11 commits
+  (merged to 'next' on 2023-06-17 at 49e54a88e2)
+ + tests: mark as passing with SANITIZE=leak
+ + config: fix a leak in git_config_copy_or_rename_section_in_file
+ + branch: fix a leak in cmd_branch
+ + branch: fix a leak in setup_tracking
+ + rev-parse: fix a leak with --abbrev-ref
+  (merged to 'next' on 2023-06-16 at d9330ea230)
+ + branch: fix a leak in setup_tracking
+ + branch: fix a leak in check_tracking_branch
+ + branch: fix a leak in inherit_tracking
+ + branch: fix a leak in dwim_and_setup_tracking
+ + remote: fix a leak in query_matches_negative_refspec
+ + config: fix a leak in git_config_copy_or_rename_section_in_file
 
- Leakfixes (subset)
+ Leakfixes
 
- Will merge to 'next'.
+ Will merge to 'master'.
+ source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
  source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
 
 
 * rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
- - run-command: report exec error even on ENOENT
- - t1800: loosen matching of error message for bad shebang
+  (merged to 'next' on 2023-06-16 at 6bb4425334)
+ + run-command: report exec error even on ENOENT
+ + t1800: loosen matching of error message for bad shebang
 
  Simplify error message when run-command fails to start a command.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
 
 
 * sl/worktree-sparse (2023-06-12) 1 commit
- - worktree: integrate with sparse-index
+  (merged to 'next' on 2023-06-16 at ca0a7edcc5)
+ + worktree: integrate with sparse-index
 
  "git worktree" learned to work better with sparse index feature.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
 
 
 * tb/collect-pack-filenames-fix (2023-06-12) 1 commit
- - builtin/repack.c: only collect fully-formed packs
+  (merged to 'next' on 2023-06-20 at abcc6892c8)
+ + builtin/repack.c: only collect fully-formed packs
 
  Avoid breakage of "git pack-objects --cruft" due to inconsistency
  between the way the code enumerates packfiles in the repository.
 
- Will merge to 'next'?
+ Will merge to 'master'.
  source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
 
 
 * tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
- - pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
+  (merged to 'next' on 2023-06-16 at 6546fee734)
+ + pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
 
  Gracefully deal with a stale MIDX file that lists a packfile that
  no longer exists.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
 
 
 * tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
- - t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
+  (merged to 'next' on 2023-06-16 at 19770e970a)
+ + t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
 
  Test update.
 
- Will merge to 'next'.
- source: <20230606214707.55739-1-tmz@pobox.com>
-
-
-* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits
-  (merged to 'next' on 2023-06-12 at f6d4c5aac6)
- + ci: drop linux-clang job
- + ci: run ASan/UBSan in a single job
- + ci: use clang for ASan/UBSan checks
-
- Clang's sanitizer implementation seems to work better than GCC's.
-
  Will merge to 'master'.
- source: <20230601180220.GA4167745@coredump.intra.peff.net>
-
-
-* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits
-  (merged to 'next' on 2023-06-13 at 6c864e2f8a)
- + diff: detect pathspec magic not supported by --follow
- + diff: factor out --follow pathspec check
- + pathspec: factor out magic-to-name function
-
- "git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
-
- Will merge to 'master'.
- source: <20230601173724.GA4158369@coredump.intra.peff.net>
-
-
-* kh/use-default-notes-doc (2023-06-06) 2 commits
-  (merged to 'next' on 2023-06-13 at ebfbf7a376)
- + notes: move the documentation to the struct
- + notes: update documentation for `use_default_notes`
-
- Doc update.
-
- Will merge to 'master'.
- source: <cover.1685958731.git.code@khaugsbakk.name>
+ source: <20230606214707.55739-1-tmz@pobox.com>
 
 
 * ps/cat-file-null-output (2023-06-12) 5 commits
-  (merged to 'next' on 2023-06-14 at f879ffcbf0)
+  (merged to 'next' on 2023-06-15 at e841ad2be5)
  + cat-file: add option '-Z' that delimits input and output with NUL
  + cat-file: simplify reading from standard input
  + strbuf: provide CRLF-aware helper to read until a specified delimiter
@@ -503,18 +692,8 @@ Release tarballs are available at:
  source: <cover.1686028409.git.ps@pks.im>
 
 
-* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit
-  (merged to 'next' on 2023-06-12 at 68851799e5)
- + surround %s with quotes when failed to lookup commit
-
- Error message fix.
-
- Will merge to 'master'.
- source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>
-
-
 * ds/add-i-color-configuration-fix (2023-06-12) 2 commits
-  (merged to 'next' on 2023-06-14 at 91eec092e0)
+  (merged to 'next' on 2023-06-15 at 377b9f9a00)
  + add: test use of brackets when color is disabled
  + add: check color.ui for interactive add
 
@@ -535,18 +714,8 @@ Release tarballs are available at:
  source: <20230604185815.15761-1-five231003@gmail.com>
 
 
-* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit
-  (merged to 'next' on 2023-06-12 at 7c58973941)
- + commit-reach: fix memory leak in get_reachable_subset()
-
- Plug memory leak.
-
- Will merge to 'master'.
- source: <20230603002819.1122129-1-mh@glandium.org>
-
-
 * ds/disable-replace-refs (2023-06-12) 3 commits
-  (merged to 'next' on 2023-06-14 at 82ba5a6ffa)
+  (merged to 'next' on 2023-06-15 at e7baddb745)
  + repository: create read_replace_refs setting
  + replace-objects: create wrapper around setting
  + repository: create disable_replace_refs()
@@ -559,80 +728,6 @@ Release tarballs are available at:
  source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
 
 
-* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit
-  (merged to 'next' on 2023-06-12 at 82d9529f2c)
- + trace2 tests: fix PTHREADS prereq
-
- Test fix.
-
- Will merge to 'master'.
- source: <20230525031218.3554586-1-tmz@pobox.com>
-
-
-* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit
-  (merged to 'next' on 2023-06-12 at 3abad605d6)
- + t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
-
- Test fix.
-
- Will merge to 'master'.
- source: <20230525031026.3554406-1-tmz@pobox.com>
-
-
-* vd/worktree-config-is-per-repository (2023-05-26) 3 commits
-  (merged to 'next' on 2023-06-13 at 339d281663)
- + repository: move 'repository_format_worktree_config' to repo scope
- + config: pass 'repo' directly to 'config_with_options()'
- + config: use gitdir to get worktree config
-
- The value of config.worktree is per-repository, but has been kept
- in a singleton global variable per process. This has been OK as
- most Git operations interacted with a single repository at a time,
- but not right for operations like recursive "grep" that want to
- access multiple repositories from a single process without forking.
-
- The global variable has been eliminated and made into a member in
- the per-repository data structure.
-
- Will merge to 'master'.
- cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>
- cf. <kl6lr0qwno2q.fsf@chooglen-macbookpro.roam.corp.google.com>
- source: <pull.1536.v2.git.1685064781.gitgitgadget@gmail.com>
-
-
-* tb/submodule-null-deref-fix (2023-05-25) 1 commit
-  (merged to 'next' on 2023-06-13 at 5eb6a7948d)
- + builtin/submodule--helper.c: handle missing submodule URLs
-
- "git submodule" code trusted the data coming from the config (and
- the in-tree .gitmodules file) too much without validating, leading
- to NULL dereference if the user mucks with a repository (e.g.
- submodule.<name>.url is removed).  This has been corrected.
-
- Will merge to 'master'.
- source: <ae6cf3fa461b85e346f034371dae56a2790dfa20.1684957882.git.me@ttaylorr.com>
-
-
-* jc/test-modernization-2 (2023-05-23) 10 commits
-  (merged to 'next' on 2023-06-13 at e3ab8eea9a)
- + t9400-git-cvsserver-server: modernize test format
- + t9200-git-cvsexportcommit: modernize test format
- + t9104-git-svn-follow-parent: modernize test format
- + t9100-git-svn-basic: modernize test format
- + t7700-repack: modernize test format
- + t7600-merge: modernize test format
- + t7508-status: modernize test format
- + t7201-co: modernize test format
- + t7111-reset-table: modernize test format
- + t7110-reset-merge: modernize test format
- (this branch uses jc/test-modernization.)
-
- Test style updates.
-
- Will merge to 'master'.
- source: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
-
-
 * jt/path-filter-fix (2023-06-13) 4 commits
  - commit-graph: new filter ver. that fixes murmur3
  - repo-settings: introduce commitgraph.changedPathsVersion
@@ -643,7 +738,8 @@ Release tarballs are available at:
  on systems whose "char" is unsigned; update the implementation and
  bump the format version to 2.
 
- Will merge to 'next'?
+ Expecting a reroll.
+ cf. <c7b66d2c-cdc3-1f0f-60a0-a2ee21c277bf@github.com>
  source: <cover.1686677910.git.jonathantanmy@google.com>
 
 
@@ -659,7 +755,7 @@ Release tarballs are available at:
  source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
 
 
-* mh/credential-libsecret-attrs (2023-05-17) 1 commit
+* mh/credential-libsecret-attrs (2023-06-16) 1 commit
  - credential/libsecret: store new attributes
 
  The way authentication related data other than passwords (e.g.
@@ -667,58 +763,11 @@ Release tarballs are available at:
  keyrings has been rethought.
 
  Needs review.
- source: <pull.1469.v4.git.git.1684306540947.gitgitgadget@gmail.com>
-
-
-* ps/fetch-cleanups (2023-05-17) 9 commits
-  (merged to 'next' on 2023-06-12 at d15d335893)
- + fetch: use `fetch_config` to store "submodule.fetchJobs" value
- + fetch: use `fetch_config` to store "fetch.parallel" value
- + fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
- + fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
- + fetch: use `fetch_config` to store "fetch.pruneTags" value
- + fetch: use `fetch_config` to store "fetch.prune" value
- + fetch: pass through `fetch_config` directly
- + fetch: drop unneeded NULL-check for `remote_ref`
- + fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
-
- Code clean-up.
-
- Will merge to 'master'.
- cf. <20230519002128.GD2442034@coredump.intra.peff.net>
- source: <cover.1684324059.git.ps@pks.im>
-
-
-* jc/test-modernization (2023-05-19) 20 commits
-  (merged to 'next' on 2023-06-13 at a61e7b7248)
- + t7101-reset-empty-subdirs: modernize test format
- + t6050-replace: modernize test format
- + t5306-pack-nobase: modernize test format
- + t5303-pack-corruption-resilience: modernize test format
- + t5301-sliding-window: modernize test format
- + t5300-pack-object: modernize test format
- + t4206-log-follow-harder-copies: modernize test format
- + t4202-log: modernize test format
- + t4004-diff-rename-symlink: modernize test format
- + t4003-diff-rename-1: modernize test format
- + t4002-diff-basic: modernize test format
- + t3903-stash: modernize test format
- + t3700-add: modernize test format
- + t3500-cherry: modernize test format
- + t1006-cat-file: modernize test format
- + t1002-read-tree-m-u-2way: modernize test format
- + t1001-read-tree-m-2way: modernize test format
- + t3210-pack-refs: modernize test format
- + t0030-stripspace: modernize test format
- + t0000-basic: modernize test format
- (this branch is used by jc/test-modernization-2.)
-
- Will merge to 'master'.
- source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
+ source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
 
 
 * ja/worktree-orphan (2023-05-17) 8 commits
-  (merged to 'next' on 2023-06-14 at 25d508496b)
+  (merged to 'next' on 2023-06-15 at 16bb552b79)
  + worktree add: emit warn when there is a bad HEAD
  + worktree add: extend DWIM to infer --orphan
  + worktree add: introduce "try --orphan" hint
@@ -728,6 +777,8 @@ Release tarballs are available at:
  + t2400: cleanup created worktree in test
  + worktree add: include -B in usage docs
 
+ Originally merged to 'next' on 2023-06-14
+
  'git worktree add' learned how to create a worktree based on an
  orphaned branch with `--orphan`.
 
@@ -735,7 +786,7 @@ Release tarballs are available at:
  source: <20230517214711.12467-1-jacobabel@nullpo.dev>
 
 
-* tb/refs-exclusion-and-packed-refs (2023-06-12) 16 commits
+* tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits
  - ls-refs.c: avoid enumerating hidden refs where possible
  - upload-pack.c: avoid enumerating hidden refs where possible
  - builtin/receive-pack.c: avoid enumerating hidden references
@@ -755,11 +806,12 @@ Release tarballs are available at:
 
  Enumerating refs in the packed-refs file, while excluding refs that
  match certain patterns, has been optimized.
- source: <cover.1686134440.git.me@ttaylorr.com>
+
+ source: <cover.1687270849.git.me@ttaylorr.com>
 
 
 * en/header-split-cache-h-part-3 (2023-05-16) 29 commits
-  (merged to 'next' on 2023-06-13 at 56bcca52ac)
+  (merged to 'next' on 2023-06-15 at 76ebce0b7a)
  + fsmonitor-ll.h: split this header out of fsmonitor.h
  + hash-ll, hashmap: move oidhash() to hash-ll
  + object-store-ll.h: split this header out of object-store.h
@@ -789,31 +841,16 @@ Release tarballs are available at:
  + init-db: remove unnecessary global variable
  + init-db: document existing bug with core.bare in template config
  + Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
+ (this branch is used by js/cmake-wo-cache-h.)
+
+ Originally merged to 'next' on 2023-06-13
 
  Header files cleanup.
 
- Will merge to 'master'.
+ Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h
  source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
 
 
-* la/doc-interpret-trailers (2023-06-12) 9 commits
-  (merged to 'next' on 2023-06-14 at 64a59e71b3)
- + doc: trailer: add more examples in DESCRIPTION
- + doc: trailer: mention 'key' in DESCRIPTION
- + doc: trailer.<token>.command: emphasize deprecation
- + doc: trailer: use angle brackets for <token> and <value>
- + doc: trailer: remove redundant phrasing
- + doc: trailer: examples: avoid the word "message" by itself
- + doc: trailer: drop "commit message part" phrasing
- + doc: trailer: swap verb order
- + doc: trailer: fix grammar
-
- Doc update.
-
- Will merge to 'master'.
- source: <pull.1506.v3.git.git.1686017304.gitgitgadget@gmail.com>
-
-
 * cc/git-replay (2023-06-03) 15 commits
  - replay: stop assuming replayed branches do not diverge
  - replay: add --contained to rebase contained branches
@@ -835,14 +872,15 @@ Release tarballs are available at:
 
 
 * tb/gc-recent-object-hook (2023-06-12) 2 commits
- - gc: introduce `gc.recentObjectsHook`
- - reachable.c: extract `obj_is_recent()`
+  (merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
+ + gc: introduce `gc.recentObjectsHook`
+ + reachable.c: extract `obj_is_recent()`
 
  "git pack-objects" learned to invoke a new hook program that
  enumerates extra objects to be used as anchoring points to keep
  otherwise unreachable objects in cruft packs.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <cover.1686178684.git.me@ttaylorr.com>
 
 
@@ -872,19 +910,29 @@ Release tarballs are available at:
 
 
 * tl/notes-separator (2023-04-28) 6 commits
-  (merged to 'next' on 2023-05-06 at 598ed19c9b)
- + notes.c: introduce "--[no-]stripspace" option
- + notes.c: append separator instead of insert by pos
- + notes.c: introduce '--separator=<paragraph-break>' option
- + t3321: add test cases about the notes stripspace behavior
- + notes.c: use designated initializers for clarity
- + notes.c: cleanup 'strbuf_grow' call in 'append_edit'
+ - notes.c: introduce "--[no-]stripspace" option
+ - notes.c: append separator instead of insert by pos
+ - notes.c: introduce '--separator=<paragraph-break>' option
+ - t3321: add test cases about the notes stripspace behavior
+ - notes.c: use designated initializers for clarity
+ - notes.c: cleanup 'strbuf_grow' call in 'append_edit'
  (this branch is used by jc/notes-separator-fix.)
 
  'git notes append' was taught '--separator' to specify string to insert
  between paragraphs.
 
- Will merge to 'next' together with its fix-up.
+ Expecting a reroll.
+ cf. <20230615071314.GC1460739@coredump.intra.peff.net>
+ source: <cover.1682671758.git.dyroneteng@gmail.com>
+
+
+* jc/notes-separator-fix (2023-06-13) 1 commit
+ - notes: do not access before the beginning of an array
+ (this branch uses tl/notes-separator.)
+
+ Fix to tl/notes-separator topic.
+
+ Will drop once tl/notes-separator gets updated.
  source: <cover.1682671758.git.dyroneteng@gmail.com>
 
 
@@ -911,39 +959,42 @@ Release tarballs are available at:
  + object: add object_array initializer helper function
  (this branch is used by ds/disable-replace-refs.)
 
+ Originally merged to 'next' on 2023-06-15
+
  The object traversal using reachability bitmap done by
  "pack-object" has been tweaked to take advantage of the fact that
  using "boundary" commits as representative of all the uninteresting
  ones can save quite a lot of object enumeration.
 
- Will merge to 'next'.
- source: <cover.1683567065.git.me@ttaylorr.com>
-
-
-* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits
-  (merged to 'next' on 2023-06-13 at 46ca10d88d)
- + completion: complete AUTO_MERGE
- + Documentation: document AUTO_MERGE
- + git-merge.txt: modernize word choice in "True merge" section
- + completion: complete REVERT_HEAD and BISECT_HEAD
- + revisions.txt: document more special refs
- + revisions.txt: use description list for special refs
-
- Document more pseudo-refs and teach the command line completion
- machinery to complete AUTO_MERGE.
-
  Will merge to 'master'.
- source: <pull.1515.v2.git.1684783741.gitgitgadget@gmail.com>
+ source: <cover.1683567065.git.me@ttaylorr.com>
 
+--------------------------------------------------
+[Discarded]
 
 * mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
-  (merged to 'next' on 2023-05-09 at fd898e3756)
- + credential/libsecret: support password_expiry_utc
+ . credential/libsecret: support password_expiry_utc
+
+ Originally merged to 'next' on 2023-05-09
 
  The libsecret credential helper learns to handle the password
  expiry time information.
 
- On hold.
- The database gets littered with entries whose expiration dates only differ.
+ Superseded by mh/credential-libsecret-attrs.
  cf. <CAGJzqskMwOJkriH6serqdwAVYi+fftEL8ohJd-suP6v+OxB_bg@mail.gmail.com>
  source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
+
+
+* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
+ . pack-bitmap.c: factor out `bitmap_index_seek_commit()`
+ . pack-bitmap.c: use `bitmap_index_seek()` where possible
+ . pack-bitmap.c: factor out manual `map_pos` manipulation
+ . pack-bitmap.c: drop unnecessary 'inline's
+ . pack-bitmap.c: hide bitmap internals in `read_be32()`
+ . pack-bitmap.c: hide bitmap internals in `read_u8()`
+
+ Clean-up the pack-bitmap codepath.
+
+ Retracted for now.
+ cf. <ZJCI6FHtbuOKPlV1@nand.local>
+ source: <cover.1679342296.git.me@ttaylorr.com>