What's cooking (2023/03 #04)

1 files changed, 364 insertions, 280 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index f1e99feafc..9dcd95529e 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 (Mar 2023, #03; Mon, 13)
-X-master-at: 73876f4861cd3d187a4682290ab75c9dccadbc56
-X-next-at: 60544f874fd51e4f7a5848f94bc42e74e5323d6a
+Subject: What's cooking in git.git (Mar 2023, #04; Fri, 17)
+X-master-at: 950264636c68591989456e3ba0a5442f93152c1a
+X-next-at: d9ab777d41f92a8c1684c91cfb02053d7dd1046b
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Mar 2023, #03; Mon, 13)
+What's cooking in git.git (Mar 2023, #04; Fri, 17)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -16,11 +16,9 @@ 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.
 
-Git 2.40 (final) has been tagged and pushed out and we have about
-two dozens of topics in 'next'.  Let's spend this week to look for
-regression reports and fix them, and to decide which ones to eject
-out of 'next' as necessary.  I'll start moving stalled topics into
-to-be-discarded bin and discard them.
+The first batch of topics are in 'master' for the next feature
+release, and the tip of 'maint' now points at Git 2.40.0 to start
+another maintenance track.
 
 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
@@ -51,111 +49,267 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
-  (merged to 'next' on 2023-03-08 at bd9eff2779)
- + sequencer.c: fix overflow & segfault in parse_strategy_opts()
+* en/dir-api-cleanup (2023-02-27) 13 commits
+  (merged to 'next' on 2023-02-27 at 434ac6b592)
+ + unpack-trees: add usage notices around df_conflict_entry
+ + unpack-trees: special case read-tree debugging as internal usage
+ + unpack-trees: rewrap a few overlong lines from previous patch
+ + unpack-trees: mark fields only used internally as internal
+ + unpack_trees: start splitting internal fields from public API
+ + sparse-checkout: avoid using internal API of unpack-trees, take 2
+ + sparse-checkout: avoid using internal API of unpack-trees
+ + unpack-trees: clean up some flow control
+ + dir: mark output only fields of dir_struct as such
+ + dir: add a usage note to exclude_per_dir
+ + dir: separate public from internal portion of dir_struct
+ + unpack-trees: heed requests to overwrite ignored files
+ + t2021: fix platform-specific leftover cruft
 
- The code to parse "git rebase -X<opt>" was not prepared to see an
- unparsable option string, which has been corrected.
+ Code clean-up to clarify directory traversal API.
+ source: <pull.1149.v3.git.1677511700.gitgitgadget@gmail.com>
 
- Will cook in 'next'.
- source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
 
+* en/header-cleanup (2023-02-23) 17 commits
+  (merged to 'next' on 2023-02-27 at f4a3707530)
+ + diff.h: remove unnecessary include of object.h
+ + Remove unnecessary includes of builtin.h
+ + treewide: replace cache.h with more direct headers, where possible
+ + replace-object.h: move read_replace_refs declaration from cache.h to here
+ + object-store.h: move struct object_info from cache.h
+ + dir.h: refactor to no longer need to include cache.h
+ + object.h: stop depending on cache.h; make cache.h depend on object.h
+ + ident.h: move ident-related declarations out of cache.h
+ + pretty.h: move has_non_ascii() declaration from commit.h
+ + cache.h: remove dependence on hex.h; make other files include it explicitly
+ + hex.h: move some hex-related declarations from cache.h
+ + hash.h: move some oid-related declarations from cache.h
+ + alloc.h: move ALLOC_GROW() functions from cache.h
+ + treewide: remove unnecessary cache.h includes in source files
+ + treewide: remove unnecessary cache.h includes
+ + treewide: remove unnecessary git-compat-util.h includes in headers
+ + treewide: ensure one of the appropriate headers is sourced first
 
-* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
-  (merged to 'next' on 2023-03-09 at 283e2159c8)
- + fetch: pass --no-write-fetch-head to subprocesses
+ Code clean-up to clarify the rule that "git-compat-util.h" must be
+ the first to be included.
+ source: <pull.1485.v2.git.1677197376.gitgitgadget@gmail.com>
 
- Will cook in 'next'.
- source: <20230308222205.M679514@dcvr>
 
+* ew/fetch-hiderefs (2023-02-27) 1 commit
+  (merged to 'next' on 2023-03-01 at 6a7eece733)
+ + fetch: support hideRefs to speed up connectivity checks
 
-* fc/advice-diverged-history (2023-03-08) 1 commit
-  (merged to 'next' on 2023-03-08 at 30e7016218)
- + advice: add diverging advice for novices
+ A new "fetch.hideRefs" option can be used to exclude specified refs
+ from "rev-list --objects --stdin --not --all" traversal for
+ checking object connectivity, most useful when there are many
+ unrelated histories in a single repository.
+ source: <20230212090426.M558990@dcvr>
 
- After "git pull" that is configured with pull.rebase=false
- merge.ff=only fails due to our end having our own development, give
- advice messages to get out of the "Not possible to fast-forward"
- state.
 
- Will cook in 'next'.
- source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
+* fz/rebase-msg-update (2023-02-27) 1 commit
+  (merged to 'next' on 2023-03-01 at f28c0df111)
+ + rebase: fix capitalisation autoSquash in i18n string
 
+ Message update.
+ source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
 
-* jk/add-p-unmerged-fix (2023-03-09) 1 commit
-  (merged to 'next' on 2023-03-09 at a46443480c)
- + add-patch: handle "* Unmerged path" lines
 
- "git add -p" while the index is unmerged sometimes failed to parse
- the diff output it internally produces and died, which has been
- corrected.
+* jc/gpg-lazy-init (2023-02-27) 2 commits
+  (merged to 'next' on 2023-02-27 at e3f81cfdbc)
+ + drop pure pass-through config callbacks
+ + gpg-interface: lazily initialize and read the configuration
 
- Will cook in 'next'.
- source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
+ Instead of forcing each command to choose to honor GPG related
+ configuration variables, make the subsystem lazily initialize
+ itself.
+ source: <xmqqpmaimvtd.fsf_-_@gitster.g>
 
 
-* jk/format-patch-ignore-noprefix (2023-03-09) 5 commits
-  (merged to 'next' on 2023-03-12 at 621d71c151)
- + format-patch: add format.noprefix option
- + format-patch: do not respect diff.noprefix
- + diff: add --default-prefix option
- + t4013: add tests for diff prefix options
- + diff: factor out src/dst prefix setup
+* jk/fsck-indices-in-worktrees (2023-02-27) 4 commits
+  (merged to 'next' on 2023-02-27 at 6eb92abb6b)
+ + fsck: check even zero-entry index files
+  (merged to 'next' on 2023-02-24 at 38c0793286)
+ + fsck: mention file path for index errors
+ + fsck: check index files in all worktrees
+ + fsck: factor out index fsck
 
- "git format-patch" honors the src/dst prefixes set to nonstandard
- values with configuration variables like "diff.noprefix", causing
- receiving end of the patch that expects the standard -p1 format to
- break.  Teach "format-patch" to ignore end-user configuration and
- always use the standard prefixes.
+ "git fsck" learned to check the index files in other worktrees,
+ just like "git gc" honors them as anchoring points.
+ source: <Y/hv0MXAyBY3HEo9@coredump.intra.peff.net>
 
- This is a backward compatibility breaking change.
 
- Will merge to 'master'.
- source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
+* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
+  (merged to 'next' on 2023-02-27 at f0ec2a81b3)
+ + help: mark unused parameter in git_unknown_cmd_config()
+ + run_processes_parallel: mark unused callback parameters
+ + userformat_want_item(): mark unused parameter
+ + for_each_commit_graft(): mark unused callback parameter
+ + rewrite_parents(): mark unused callback parameter
+ + fetch-pack: mark unused parameter in callback function
+ + notes: mark unused callback parameters
+ + prio-queue: mark unused parameters in comparison functions
+ + for_each_object: mark unused callback parameters
+ + list-objects: mark unused callback parameters
+ + mark unused parameters in signal handlers
+ + run-command: mark error routine parameters as unused
+ + mark "pointless" data pointers in callbacks
+ + ref-filter: mark unused callback parameters
+ + http-backend: mark unused parameters in virtual functions
+ + http-backend: mark argc/argv unused
+ + object-name: mark unused parameters in disambiguate callbacks
+ + serve: mark unused parameters in virtual functions
+ + serve: use repository pointer to get config
+ + ls-refs: drop config caching
+ + ref-filter: drop unused atom parameter from get_worktree_path()
 
+ More work towards -Wunused.
+ source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
 
-* sl/diff-files-sparse (2023-03-09) 2 commits
- - diff-files: integrate with sparse index
- - t1092: add tests for `git diff-files`
 
- Teach "diff-files" not to expand sparse-index unless needed.
+* mc/credential-helper-www-authenticate (2023-02-27) 3 commits
+  (merged to 'next' on 2023-02-27 at 89c9bd4b8f)
+ + credential: add WWW-Authenticate header to cred requests
+ + http: read HTTP WWW-Authenticate response headers
+ + t5563: add tests for basic and anoymous HTTP access
 
- Expecting hopefully a final and minor reroll?
- source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
+ Allow information carried on the WWW-AUthenticate header to be
+ passed to the credential helpers.
+ source: <pull.1352.v11.git.1677518420.gitgitgadget@gmail.com>
 
+--------------------------------------------------
+[New Topics]
 
-* aj/ls-files-format-fix (2023-03-10) 1 commit
- - ls-files: fix "--format" output of relative paths
+* ar/test-cleanup-unused-file-creation (2023-03-13) 7 commits
+ - t1507: assert output of rev-parse
+ - t1404: don't create unused file
+ - t1400: assert output of update-ref
+ - t1302: don't create unused file
+ - t1010: assert empty output of mktree
+ - t1006: assert error output of cat-file
+ - t1005: assert output of ls-files
 
- Fix for a "ls-files --format="%(path)" that produced nonsense
- output, which was a bug in 2.38.
+ Test clean-up.
 
- Will merge to 'next'.
- source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
+ Needs Review.
+ source: <20230312201520.370234-1-rybak.a.v@gmail.com>
 
 
-* fc/test-aggregation-clean-up (2023-03-09) 2 commits
- - test: don't print aggregate-results command
- - test: simplify counts aggregation
+* nw/for-each-ref-signature (2023-03-13) 1 commit
+ . ref-filter: add new "signature" atom
 
- Code clean-up for test framework.
+ "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
+ placeholder and friends.
+
+ Breaks CI.
+ cf. <xmqqpm9bosjw.fsf@gitster.g>
+ source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
+
+
+* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
+ - credential: new attribute oauth_refresh_token
+
+ The credential subsystem learns to help OAuth framework.
+
+ Needs Review.
+ source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
+
+
+* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
+ - credential/libsecret: support password_expiry_utc
+
+ The libsecret credential helper learns to handle the password
+ expiry time information.
+
+ Needs Review.
+ source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
+
+
+* ps/fetch-ref-update-reporting (2023-03-15) 8 commits
+ - fetch: centralize printing of reference updates
+ - fetch: fix inconsistent summary width for pruned and updated refs
+ - fetch: deduplicate logic to print remote URL
+ - fetch: deduplicate handling of per-reference format
+ - fetch: pass the full local reference name to `format_display`
+ - fetch: move output format into `display_state`
+ - fetch: move reference width calculation into `display_state`
+ - fetch: rename `display` buffer to avoid name conflict
+
+ Clean-up of the code path that reports what "git fetch" did to each
+ ref.
+
+ Will merge to 'next'??
+ source: <cover.1678878623.git.ps@pks.im>
+
+
+* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits
+ - rebase: remove a couple of redundant strategy tests
+ - rebase -m: fix serialization of strategy options
+ - rebase -m: cleanup --strategy-option handling
+ - rebase: stop reading and writing unnecessary strategy state
+ - Merge branch 'ab/fix-strategy-opts-parsing'
+ (this branch uses ab/fix-strategy-opts-parsing.)
+
+ Clean-up of the code path that deals with merge strategy option
+ handling in "git rebase".
+
+ Needs review.
+ source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
+
+
+* ab/remove-implicit-use-of-the-repository (2023-03-17) 17 commits
+ - libs: use "struct repository *" argument, not "the_repository"
+ - post-cocci: adjust comments for recent repo_* migration
+ - cocci: apply the "revision.h" part of "the_repository.pending"
+ - cocci: apply the "rerere.h" part of "the_repository.pending"
+ - cocci: apply the "refs.h" part of "the_repository.pending"
+ - cocci: apply the "promisor-remote.h" part of "the_repository.pending"
+ - cocci: apply the "packfile.h" part of "the_repository.pending"
+ - cocci: apply the "pretty.h" part of "the_repository.pending"
+ - cocci: apply the "object-store.h" part of "the_repository.pending"
+ - cocci: apply the "diff.h" part of "the_repository.pending"
+ - cocci: apply the "commit.h" part of "the_repository.pending"
+ - cocci: apply the "commit-reach.h" part of "the_repository.pending"
+ - cocci: apply the "cache.h" part of "the_repository.pending"
+ - cocci: add missing "the_repository" macros to "pending"
+ - cocci: sort "the_repository" rules by header
+ - cocci: fix incorrect & verbose "the_repository" rules
+ - cocci: remove dead rule from "the_repository.pending.cocci"
+
+ Code clean-up around the use of the_repository.
+
+ Needs review.
+ source: <cover-00.17-00000000000-20230317T152724Z-avarab@gmail.com>
+
+
+* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
+ - completion: prompt: use generic colors
+
+ Lift the limitation that colored prompts can only be used with
+ PROMPT_COMMAND mode.
 
  Will merge to 'next'.
- source: <20230309173032.959968-1-felipe.contreras@gmail.com>
+ < source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
 
 
-* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
- - receive-pack: fix stale packfile locks when dying
+* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
+ - object-name: fix quiet @{u} parsing
 
- "git receive-pack" that responds to "git push" requests failed to
- clean a stale lockfile when killed in the middle, which has been
- corrected.
+ "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
+ parsed with GET_OID_QUIETLY option, did not quietly fail, which has
+ been corrected.
 
  Will merge to 'next'.
- source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
+ source: <20230316171514.23741-1-felipe.contreras@gmail.com>
+
+
+* jk/unused-post-2.40 (2023-03-17) 4 commits
+ - transport: mark unused parameters in fetch_refs_from_bundle()
+ - http: mark unused parameter in fill_active_slot() callbacks
+ - http: drop unused parameter from start_object_request()
+ - mailmap: drop debugging code
+
+ source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
 
 --------------------------------------------------
 [Stalled]
@@ -251,17 +405,130 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
+* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
+  (merged to 'next' on 2023-03-08 at bd9eff2779)
+ + sequencer.c: fix overflow & segfault in parse_strategy_opts()
+ (this branch is used by pw/rebase-cleanup-merge-strategy-option-handling.)
+
+ The code to parse "git rebase -X<opt>" was not prepared to see an
+ unparsable option string, which has been corrected.
+
+ Will merge to 'master'.
+ source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
+
+
+* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
+  (merged to 'next' on 2023-03-09 at 283e2159c8)
+ + fetch: pass --no-write-fetch-head to subprocesses
+
+ Will merge to 'master'.
+ source: <20230308222205.M679514@dcvr>
+
+
+* fc/advice-diverged-history (2023-03-08) 1 commit
+  (merged to 'next' on 2023-03-08 at 30e7016218)
+ + advice: add diverging advice for novices
+
+ After "git pull" that is configured with pull.rebase=false
+ merge.ff=only fails due to our end having our own development, give
+ advice messages to get out of the "Not possible to fast-forward"
+ state.
+
+ Will merge to 'master'.
+ source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
+
+
+* jk/add-p-unmerged-fix (2023-03-09) 1 commit
+  (merged to 'next' on 2023-03-09 at a46443480c)
+ + add-patch: handle "* Unmerged path" lines
+
+ "git add -p" while the index is unmerged sometimes failed to parse
+ the diff output it internally produces and died, which has been
+ corrected.
+
+ Will merge to 'master'.
+ source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
+
+
+* jk/format-patch-ignore-noprefix (2023-03-13) 6 commits
+  (merged to 'next' on 2023-03-13 at 4b28e389f5)
+ + rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
+  (merged to 'next' on 2023-03-12 at 621d71c151)
+ + format-patch: add format.noprefix option
+ + format-patch: do not respect diff.noprefix
+ + diff: add --default-prefix option
+ + t4013: add tests for diff prefix options
+ + diff: factor out src/dst prefix setup
+
+ "git format-patch" honors the src/dst prefixes set to nonstandard
+ values with configuration variables like "diff.noprefix", causing
+ receiving end of the patch that expects the standard -p1 format to
+ break.  Teach "format-patch" to ignore end-user configuration and
+ always use the standard prefixes.
+
+ This is a backward compatibility breaking change.
+
+ Will merge to 'master'.
+ source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
+
+
+* sl/diff-files-sparse (2023-03-09) 2 commits
+ - diff-files: integrate with sparse index
+ - t1092: add tests for `git diff-files`
+
+ Teach "diff-files" not to expand sparse-index unless needed.
+
+ Expecting hopefully a final and minor reroll?
+ source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
+
+
+* aj/ls-files-format-fix (2023-03-10) 1 commit
+  (merged to 'next' on 2023-03-13 at 27f876afa4)
+ + ls-files: fix "--format" output of relative paths
+
+ Fix for a "ls-files --format="%(path)" that produced nonsense
+ output, which was a bug in 2.38.
+
+ Will merge to 'master'.
+ source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
+
+
+* fc/test-aggregation-clean-up (2023-03-09) 2 commits
+  (merged to 'next' on 2023-03-13 at f938b09366)
+ + test: don't print aggregate-results command
+ + test: simplify counts aggregation
+
+ Code clean-up for test framework.
+
+ Will merge to 'master'.
+ source: <20230309173032.959968-1-felipe.contreras@gmail.com>
+
+
+* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
+  (merged to 'next' on 2023-03-13 at 8d099dffcc)
+ + receive-pack: fix stale packfile locks when dying
+
+ "git receive-pack" that responds to "git push" requests failed to
+ clean a stale lockfile when killed in the middle, which has been
+ corrected.
+
+ Will merge to 'master'.
+ source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
+
+
 * as/doc-markup-fix (2023-03-06) 1 commit
   (merged to 'next' on 2023-03-07 at 8c7289659a)
  + git-merge-tree.txt: replace spurious HTML entity
 
  Fix for a mis-mark-up in doc made in Git 2.39 days.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <87y1oco3i9.fsf@igel.home>
 
 
-* ds/ahead-behind (2023-03-10) 7 commits
+* ds/ahead-behind (2023-03-15) 9 commits
+ - SQUASH??? leak fix (spotted by Peff)
+ - commit-reach: add tips_reachable_from_bases()
  - for-each-ref: add ahead-behind format atom
  - commit-reach: implement ahead_behind() logic
  - commit-graph: introduce `ensure_generations_valid()`
@@ -275,21 +542,23 @@ Release tarballs are available at:
  of commits in bulk.
 
  Will merge to 'next'?
- source: <pull.1489.v2.git.1678468863.gitgitgadget@gmail.com>
+ source: <pull.1489.v3.git.1678902343.gitgitgadget@gmail.com>
 
 
-* gc/config-parsing-cleanup (2023-03-03) 6 commits
+* gc/config-parsing-cleanup (2023-03-15) 8 commits
+ - config.c: rename "struct config_source cf"
+ - config: report cached filenames in die_bad_number()
  - config.c: remove current_parsing_scope
  - config.c: remove current_config_kvi
  - config.c: plumb the_reader through callbacks
  - config.c: create config_reader and the_reader
- - config.c: don't assign to "cf" directly
+ - config.c: don't assign to "cf_global" directly
  - config.c: plumb config_source through static fns
 
  Config API clean-up to reduce its dependence on static variables
 
  Comments?
- source: <pull.1463.git.git.1677631097.gitgitgadget@gmail.com>
+ source: <pull.1463.v2.git.git.1678925506.gitgitgadget@gmail.com>
 
 
 * jk/bundle-progress (2023-03-06) 1 commit
@@ -298,7 +567,7 @@ Release tarballs are available at:
 
  Simplify UI to control progress meter given by "git bundle" command.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
 
 
@@ -315,7 +584,7 @@ Release tarballs are available at:
  standard output.  It used to work only for output and only from the
  root level of the working tree.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
 
 
@@ -326,7 +595,7 @@ Release tarballs are available at:
  "git format-patch" learned to write a log-message only output file
  for empty commits.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <20230303160301.3659328-1-john@keeping.me.uk>
 
 
@@ -339,7 +608,7 @@ Release tarballs are available at:
  update the list of packfiles during runtime to update this list as
  well.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
 
 
@@ -353,23 +622,10 @@ Release tarballs are available at:
  marked to be incompatible when both "--staged" and "--worktree" are
  in effect.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <20230226184354.221-1-andy.koppe@gmail.com>
 
 
-* ew/fetch-hiderefs (2023-02-27) 1 commit
-  (merged to 'next' on 2023-03-01 at 6a7eece733)
- + fetch: support hideRefs to speed up connectivity checks
-
- A new "fetch.hideRefs" option can be used to exclude specified refs
- from "rev-list --objects --stdin --not --all" traversal for
- checking object connectivity, most useful when there are many
- unrelated histories in a single repository.
-
- Will cook in 'next'.
- source: <20230212090426.M558990@dcvr>
-
-
 * zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
   (merged to 'next' on 2023-03-06 at f08def5949)
  + push: allow delete single-level ref
@@ -380,20 +636,10 @@ Release tarballs are available at:
  mistake.  In general, we don't encourage use of such a ref, and
  creation or update to such a ref is rejected as before.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
 
 
-* fz/rebase-msg-update (2023-02-27) 1 commit
-  (merged to 'next' on 2023-03-01 at f28c0df111)
- + rebase: fix capitalisation autoSquash in i18n string
-
- Message update.
-
- Will cook in 'next'.
- source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
-
-
 * my/wildmatch-cleanups (2023-02-27) 5 commits
  - wildmatch: more cleanups after killing uchar
  - wildmatch: use char instead of uchar
@@ -422,7 +668,7 @@ Release tarballs are available at:
  source: <20230228185253.2356546-1-calvinwan@google.com>
 
 
-* ah/rebase-merges-config (2023-03-06) 3 commits
+* ah/rebase-merges-config (2023-03-13) 3 commits
  - rebase: add a config option for --rebase-merges
  - rebase: deprecate --rebase-merges=""
  - rebase: add documentation and test for --no-rebase-merges
@@ -431,102 +677,7 @@ Release tarballs are available at:
  introduce rebase.merges configuration variable.
 
  On hold.
- cf. <b4be9cb3-c24b-4377-bab3-5d53035efdf8@gmx.de>
- source: <20230305050709.68736-1-alexhenrie24@gmail.com>
-
-
-* en/dir-api-cleanup (2023-02-27) 13 commits
-  (merged to 'next' on 2023-02-27 at 434ac6b592)
- + unpack-trees: add usage notices around df_conflict_entry
- + unpack-trees: special case read-tree debugging as internal usage
- + unpack-trees: rewrap a few overlong lines from previous patch
- + unpack-trees: mark fields only used internally as internal
- + unpack_trees: start splitting internal fields from public API
- + sparse-checkout: avoid using internal API of unpack-trees, take 2
- + sparse-checkout: avoid using internal API of unpack-trees
- + unpack-trees: clean up some flow control
- + dir: mark output only fields of dir_struct as such
- + dir: add a usage note to exclude_per_dir
- + dir: separate public from internal portion of dir_struct
- + unpack-trees: heed requests to overwrite ignored files
- + t2021: fix platform-specific leftover cruft
-
- Code clean-up to clarify directory traversal API.
-
- Will cook in 'next'.
- source: <pull.1149.v3.git.1677511700.gitgitgadget@gmail.com>
-
-
-* en/header-cleanup (2023-02-23) 17 commits
-  (merged to 'next' on 2023-02-27 at f4a3707530)
- + diff.h: remove unnecessary include of object.h
- + Remove unnecessary includes of builtin.h
- + treewide: replace cache.h with more direct headers, where possible
- + replace-object.h: move read_replace_refs declaration from cache.h to here
- + object-store.h: move struct object_info from cache.h
- + dir.h: refactor to no longer need to include cache.h
- + object.h: stop depending on cache.h; make cache.h depend on object.h
- + ident.h: move ident-related declarations out of cache.h
- + pretty.h: move has_non_ascii() declaration from commit.h
- + cache.h: remove dependence on hex.h; make other files include it explicitly
- + hex.h: move some hex-related declarations from cache.h
- + hash.h: move some oid-related declarations from cache.h
- + alloc.h: move ALLOC_GROW() functions from cache.h
- + treewide: remove unnecessary cache.h includes in source files
- + treewide: remove unnecessary cache.h includes
- + treewide: remove unnecessary git-compat-util.h includes in headers
- + treewide: ensure one of the appropriate headers is sourced first
-
- Code clean-up to clarify the rule that "git-compat-util.h" must be
- the first to be included.
-
- Will cook in 'next'.
- source: <pull.1485.v2.git.1677197376.gitgitgadget@gmail.com>
-
-
-* jk/fsck-indices-in-worktrees (2023-02-27) 4 commits
-  (merged to 'next' on 2023-02-27 at 6eb92abb6b)
- + fsck: check even zero-entry index files
-  (merged to 'next' on 2023-02-24 at 38c0793286)
- + fsck: mention file path for index errors
- + fsck: check index files in all worktrees
- + fsck: factor out index fsck
-
- "git fsck" learned to check the index files in other worktrees,
- just like "git gc" honors them as anchoring points.
-
- Will cook in 'next'.
- source: <Y/hv0MXAyBY3HEo9@coredump.intra.peff.net>
-
-
-* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
-  (merged to 'next' on 2023-02-27 at f0ec2a81b3)
- + help: mark unused parameter in git_unknown_cmd_config()
- + run_processes_parallel: mark unused callback parameters
- + userformat_want_item(): mark unused parameter
- + for_each_commit_graft(): mark unused callback parameter
- + rewrite_parents(): mark unused callback parameter
- + fetch-pack: mark unused parameter in callback function
- + notes: mark unused callback parameters
- + prio-queue: mark unused parameters in comparison functions
- + for_each_object: mark unused callback parameters
- + list-objects: mark unused callback parameters
- + mark unused parameters in signal handlers
- + run-command: mark error routine parameters as unused
- + mark "pointless" data pointers in callbacks
- + ref-filter: mark unused callback parameters
- + http-backend: mark unused parameters in virtual functions
- + http-backend: mark argc/argv unused
- + object-name: mark unused parameters in disambiguate callbacks
- + serve: mark unused parameters in virtual functions
- + serve: use repository pointer to get config
- + ls-refs: drop config caching
- + ref-filter: drop unused atom parameter from get_worktree_path()
-
- More work towards -Wunused.
-
- Will cook in 'next'.
- source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
+ source: <20230312210456.92364-1-alexhenrie24@gmail.com>
 
 
 * ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
@@ -536,7 +687,7 @@ Release tarballs are available at:
  Fix a segfaulting loop.  The function and its caller may need
  further clean-up.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
  source: <20230211111526.2028178-1-e@80x24.org>
 
@@ -555,32 +706,6 @@ Release tarballs are available at:
  source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
 
 
-* jc/gpg-lazy-init (2023-02-27) 2 commits
-  (merged to 'next' on 2023-02-27 at e3f81cfdbc)
- + drop pure pass-through config callbacks
- + gpg-interface: lazily initialize and read the configuration
-
- Instead of forcing each command to choose to honor GPG related
- configuration variables, make the subsystem lazily initialize
- itself.
-
- Will cook in 'next'.
- source: <xmqqpmaimvtd.fsf_-_@gitster.g>
-
-
-* mc/credential-helper-www-authenticate (2023-02-27) 3 commits
-  (merged to 'next' on 2023-02-27 at 89c9bd4b8f)
- + credential: add WWW-Authenticate header to cred requests
- + http: read HTTP WWW-Authenticate response headers
- + t5563: add tests for basic and anoymous HTTP access
-
- Allow information carried on the WWW-AUthenticate header to be
- passed to the credential helpers.
-
- Will cook in 'next'.
- source: <pull.1352.v11.git.1677518420.gitgitgadget@gmail.com>
-
-
 * ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
   (merged to 'next' on 2023-03-06 at 60d7d0d493)
  + tests: don't lose misc "git" exit codes
@@ -592,7 +717,7 @@ Release tarballs are available at:
 
  Test clean-up.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
 
 
@@ -667,7 +792,7 @@ Release tarballs are available at:
  branch that is being used in another worktree linked to the same
  repository.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
 
 
@@ -679,7 +804,7 @@ Release tarballs are available at:
  branch is already checked out in a different worktree linked to the
  same repository.
 
- Will cook in 'next'.
+ Will merge to 'master'.
  source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
 
 
@@ -721,44 +846,3 @@ Release tarballs are available at:
 
  Comments?
  source: <20230302215237.1473444-1-calvinwan@google.com>
-
---------------------------------------------------
-[Discarded]
-
-* mc/switch-advice (2022-11-09) 1 commit
- . po: use `switch` over `checkout` in error message
-
- Use 'switch' instead of 'checkout' in an error message.
-
- Will discard.
- Getting tired of waiting for review response.
-
-
-* js/range-diff-mbox (2022-11-23) 1 commit
- . range-diff: support reading mbox files
-
- 'git range-diff' gained support for reading either side from an .mbox
- file instead of a revision range.
-
- Will discard.
- Getting tired of waiting for review response.
- cf. <xmqqr0xupmnf.fsf@gitster.g>
- source: <pull.1420.v3.git.1669108102092.gitgitgadget@gmail.com>
-
-
-* jc/test-prereq-symlink-update (2023-02-09) 1 commit
- . test: make SYMLINKS prerequisite more robust
-
- For some reason, "ln -s x y && test -h y" started passing on
- Windows, even though we do not have working readlink(3) there.
- Tighten the check to enable SYMLINKS prerequisite in our tests.
-
- It turns out that this was caused by using a faulty build of the
- Windows dev environment, which was fixed.
- source: <xmqqwn4sq73f.fsf@gitster.g>
-
-
-* jc/t5559-workaround (2023-02-09) 1 commit
- . t5559: skip a known-to-be-broken test
-
- source: <xmqq357ems2h.fsf@gitster.g>