What's cooking (2023/03 #05)

1 files changed, 451 insertions, 447 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 9dcd95529e..72ac053e77 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, #04; Fri, 17)
-X-master-at: 950264636c68591989456e3ba0a5442f93152c1a
-X-next-at: d9ab777d41f92a8c1684c91cfb02053d7dd1046b
+Subject: What's cooking in git.git (Mar 2023, #05; Wed, 22)
+X-master-at: 27d43aaaf50ef0ae014b88bba294f93658016a2e
+X-next-at: c903bb7e22f8f86da64de537e5768ab0ca886f4b
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Mar 2023, #04; Fri, 17)
+What's cooking in git.git (Mar 2023, #05; Wed, 22)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -16,7 +16,7 @@ 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.
 
-The first batch of topics are in 'master' for the next feature
+The first two batches 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.
 
@@ -51,265 +51,382 @@ Release tarballs are available at:
 --------------------------------------------------
 [Graduated to 'master']
 
-* 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.
- 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.
- source: <pull.1485.v2.git.1677197376.gitgitgadget@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.
- source: <20230212090426.M558990@dcvr>
-
-
-* 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>
-
-
-* 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.
- source: <xmqqpmaimvtd.fsf_-_@gitster.g>
-
-
-* 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.
- 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.
- source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
-
-
-* 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.
- 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
+ + tests: don't lose exit status with "test <op> $(git ...)"
+ + tests: don't lose "git" exit codes in "! ( git ... | grep )"
+ + tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
+ + t/lib-patch-mode.sh: fix ignored exit codes
+ + auto-crlf tests: don't lose exit code in loops and outside tests
+
+ Test clean-up.
+ source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
+
+
+* 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.
+ source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@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.
+ source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
+
+
+* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
+  (merged to 'next' on 2023-03-06 at 4ee341853c)
+ + restore: fault --staged --worktree with merge opts
+
+ "git restore" supports options like "--ours" that are only
+ meaningful during a conflicted merge, but these options are only
+ meaningful when updating the working tree files.  These options are
+ marked to be incompatible when both "--staged" and "--worktree" are
+ in effect.
+ source: <20230226184354.221-1-andy.koppe@gmail.com>
+
+
+* 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.
+ source: <87y1oco3i9.fsf@igel.home>
+
+
+* ds/reprepare-alternates-when-repreparing-packfiles (2023-03-09) 1 commit
+  (merged to 'next' on 2023-03-09 at 851bceed17)
+ + object-file: reprepare alternates when necessary
+
+ Once we start running, we assumed that the list of alternate object
+ databases would never change.  Hook into the machinery used to
+ update the list of packfiles during runtime to update this list as
+ well.
+ source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
+
+
+* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
+  (merged to 'next' on 2023-03-06 at 5dc1c4c0b7)
+ + commit-reach: avoid NULL dereference
+
+ Fix a segfaulting loop.  The function and its caller may need
+ further clean-up.
+ cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
+ source: <20230211111526.2028178-1-e@80x24.org>
+
+
+* 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
+
+ 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.
+ source: <20230308024834.1562386-2-felipe.contreras@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.
+ source: <20230309173032.959968-1-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.
+ source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
+
+
+* jk/bundle-progress (2023-03-06) 1 commit
+  (merged to 'next' on 2023-03-07 at 0df2b09e1b)
+ + bundle: turn on --all-progress-implied by default
+
+ Simplify UI to control progress meter given by "git bundle" command.
+ source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
+
+
+* jk/bundle-use-dash-for-stdfiles (2023-03-06) 5 commits
+  (merged to 'next' on 2023-03-07 at 8ceb58f725)
+ + parse-options: use prefix_filename_except_for_dash() helper
+ + parse-options: consistently allocate memory in fix_filename()
+ + bundle: don't blindly apply prefix_filename() to "-"
+ + bundle: document handling of "-" as stdin
+ + bundle: let "-" mean stdin for reading operations
+
+ "git bundle" learned that "-" is a common way to say that the input
+ comes from the standard input and/or the output goes to the
+ standard output.  It used to work only for output and only from the
+ root level of the working tree.
+ source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
+
+
+* jk/format-patch-change-format-for-empty-commits (2023-03-03) 1 commit
+  (merged to 'next' on 2023-03-07 at 1c421f4a9f)
+ + format-patch: output header for empty commits
+
+ "git format-patch" learned to write a log-message only output file
+ for empty commits.
+ source: <20230303160301.3659328-1-john@keeping.me.uk>
+
+
+* 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.
+ source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
+
+
+* 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.
+ source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
+
+
+* rj/avoid-switching-to-already-used-branch (2023-02-25) 4 commits
+  (merged to 'next' on 2023-03-06 at 7546231ddf)
+ + switch: reject if the branch is already checked out elsewhere (test)
+ + rebase: refuse to switch to a branch already checked out elsewhere (test)
+ + branch: fix die_if_checked_out() when ignore_current_worktree
+ + worktree: introduce is_shared_symref()
+
+ A few subcommands have been taught to stop users from working on a
+ branch that is being used in another worktree linked to the same
+ repository.
+ source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
+
+
+* rj/bisect-already-used-branch (2023-01-22) 1 commit
+  (merged to 'next' on 2023-03-06 at 3508814a41)
+ + bisect: fix "reset" when branch is checked out elsewhere
+
+ Allow "git bisect reset" to check out the original branch when the
+ branch is already checked out in a different worktree linked to the
+ same repository.
+ source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
+
+
+* 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
+ + receive-pack: fix funny ref error messsage
+
+ "git push" has been taught to allow deletion of refs with one-level
+ names to help repairing a repository who acquired such a ref by
+ mistake.  In general, we don't encourage use of such a ref, and
+ creation or update to such a ref is rejected as before.
+ source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
 
 --------------------------------------------------
 [New Topics]
 
-* 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
+* jk/fix-proto-downgrade-to-v0 (2023-03-17) 1 commit
+  (merged to 'next' on 2023-03-21 at ed9e43d3ed)
+ + git_connect(): fix corner cases in downgrading v2 to v0
 
- Test clean-up.
+ Transports that do not support protocol v2 did not correctly fall
+ back to protocol v0 under certain conditions, which has been
+ corrected.
 
- Needs Review.
- source: <20230312201520.370234-1-rybak.a.v@gmail.com>
+ Will merge to 'master'.
+ source: <ZBS6wwWXcEBwGBm/@coredump.intra.peff.net>
 
 
-* nw/for-each-ref-signature (2023-03-13) 1 commit
- . ref-filter: add new "signature" atom
+* pe/time-use-gettimeofday (2023-03-21) 1 commit
+  (merged to 'next' on 2023-03-21 at 456b65b4c2)
+ + git-compat-util: use gettimeofday(2) for time(2)
 
- "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
- placeholder and friends.
+ time(2) on glib 2.31+, especially on Linux, goes out of sync with
+ higher resolution timers used for gettimeofday(2) and by the
+ filesystem.  Replace all calls to it with a time_now() wrapper and
+ then use gettimeofday(2) in its implementation.
 
- Breaks CI.
- cf. <xmqqpm9bosjw.fsf@gitster.g>
- source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
+ Will merge to 'master'.
+ source: <20230320230507.3932018-1-gitster@pobox.com>
 
 
-* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
- - credential: new attribute oauth_refresh_token
+* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
+ - rebase -i: do not update "done" when rescheduling command
 
- The credential subsystem learns to help OAuth framework.
+ "rebase -i" moved a "rescheduled" insn in the todo file to the
+ "done" list before it completed, which has been corrected.
 
- Needs Review.
- source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
+ Expecting clarification.
+ source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
 
 
-* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
- - credential/libsecret: support password_expiry_utc
+* pw/wildmatch-fixes (2023-03-20) 3 commits
+ - wildmatch: hide internal return values
+ - wildmatch: avoid undefined behavior
+ - wildmatch: fix exponential behavior
 
- The libsecret credential helper learns to handle the password
- expiry time information.
+ The wildmatch library code unlearns exponential behaviour it
+ acquired some time ago since it was borrowed from rsync.
 
- Needs Review.
- source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
+ Needs review.
+ source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
 
 
-* 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
+* sg/parse-options-h-initializers (2023-03-20) 3 commits
+ - parse-options.h: use designated initializers in OPT_* macros
+ - parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
+ - parse-options.h: use consistent name for the callback parameters
 
- Clean-up of the code path that reports what "git fetch" did to each
- ref.
+ Code clean-up to use designated initializers in parse-options API.
 
- Will merge to 'next'??
- source: <cover.1678878623.git.ps@pks.im>
+ Will merge to 'next'.
+ source: <20230319165648.656738-1-szeder.dev@gmail.com>
 
 
-* 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.)
+* sg/parse-options-h-users (2023-03-20) 2 commits
+ - treewide: remove unnecessary inclusions of parse-options.h from headers
+ - treewide: include parse-options.h in source files
 
- Clean-up of the code path that deals with merge strategy option
- handling in "git rebase".
+ Code clean-up to include and/or uninclude parse-options.h file as
+ needed.
 
- Needs review.
- source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
+ Will merge to 'next'.
+ source: <20230319162712.654137-1-szeder.dev@gmail.com>
 
 
-* 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"
+* rs/archive-from-subdirectory-fixes (2023-03-20) 1 commit
+ . archive: improve support for running in a subdirectory
 
- Code clean-up around the use of the_repository.
+ "git archive" run from a subdirectory mishandled attributes and
+ paths outside the current directory.
+
+ Breaks CI.
+ cf. <xmqqlejpg17g.fsf@gitster.g>
+ source: <e923e844-6891-76dc-e7db-4771b2d91792@web.de>
+
+
+* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
+  (merged to 'next' on 2023-03-21 at b579e226b5)
+ + 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.
+
+ Will merge to 'master'.
+ source: <cover.1679342296.git.me@ttaylorr.com>
+
+
+* en/header-split-cleanup (2023-03-21) 16 commits
+ - csum-file.h: remove unnecessary inclusion of cache.h
+ - write-or-die.h: move declarations for write-or-die.c functions from cache.h
+ - treewide: remove cache.h inclusion due to setup.h changes
+ - setup.h: move declarations for setup.c functions from cache.h
+ - treewide: remove cache.h inclusion due to environment.h changes
+ - environment.h: move declarations for environment.c functions from cache.h
+ - treewide: remove unnecessary includes of cache.h
+ - wrapper.h: move declarations for wrapper.c functions from cache.h
+ - path.h: move function declarations for path.c functions from cache.h
+ - cache.h: remove expand_user_path()
+ - abspath.h: move absolute path functions from cache.h
+ - environment: move comment_line_char from cache.h
+ - treewide: remove unnecessary cache.h inclusion from several sources
+ - treewide: remove unnecessary inclusion of gettext.h
+ - treewide: be explicit about dependence on gettext.h
+ - treewide: remove unnecessary cache.h inclusion from a few headers
+
+ Split key function and data structure definitions out of cache.h to
+ new header files and adjust the users.
 
  Needs review.
- source: <cover-00.17-00000000000-20230317T152724Z-avarab@gmail.com>
+ source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
 
 
-* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
- - completion: prompt: use generic colors
+* fc/docbook-remove-groff-workaround (2023-03-21) 1 commit
+  (merged to 'next' on 2023-03-21 at 6c59b16205)
+ + doc: remove GNU troff workaround
 
- Lift the limitation that colored prompts can only be used with
- PROMPT_COMMAND mode.
+ Remove workaround for ancient versions of DocBook to make it work
+ correctly with groff, which has not been necessary since docbook
+ 1.76 from 2010.
 
- Will merge to 'next'.
- < source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
+ Will merge to 'master'.
+ source: <20230320190047.79836-1-felipe.contreras@gmail.com>
 
 
-* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
- - object-name: fix quiet @{u} parsing
+* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
+ - am: refer to format-patch in the documentation
 
- "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.
+ Doc update.
 
  Will merge to 'next'.
- source: <20230316171514.23741-1-felipe.contreras@gmail.com>
+ source: <xmqq1qlij9qr.fsf@gitster.g>
 
 
-* 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
+* jk/fast-export-cleanup (2023-03-22) 6 commits
+ - fast-export: drop unused parameter from anonymize_commit_message()
+ - fast-export: drop data parameter from anonymous generators
+ - fast-export: de-obfuscate --anonymize-map handling
+ - fast-export: factor out anonymized_entry creation
+ - fast-export: simplify initialization of anonymized hashmaps
+ - fast-export: drop const when storing anonymized values
 
- source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
+ Code clean-up.
+
+ Will merge to 'next'?
+ source: <20230322173636.GA5643@coredump.intra.peff.net>
+
+
+* js/split-index-fixes (2023-03-22) 4 commits
+ - unpack-trees: take care to propagate the split-index flag
+ - fsmonitor: avoid overriding `cache_changed` bits
+ - split-index; stop abusing the `base_oid` to strip the "link" extension
+ - split-index & fsmonitor: demonstrate a bug
+
+ The index files can become corrupt under certain conditions when
+ the split-index feature is in use, especially together with
+ fsmonitor, which have been corrected.
+
+ Will merge to 'next'?
+ source: <pull.1497.git.1679500859.gitgitgadget@gmail.com>
 
 --------------------------------------------------
 [Stalled]
@@ -405,135 +522,155 @@ 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.)
+* ar/test-cleanup-unused-file-creation (2023-03-20) 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: don't create unused files
+ - t1006: assert error output of cat-file
+ - t1005: assert output of ls-files
 
- The code to parse "git rebase -X<opt>" was not prepared to see an
- unparsable option string, which has been corrected.
+ Test clean-up.
 
- Will merge to 'master'.
- source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
+ Needs Review.
+ source: <20230312201520.370234-1-rybak.a.v@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
+* nw/for-each-ref-signature (2023-03-13) 1 commit
+ . ref-filter: add new "signature" atom
 
- Will merge to 'master'.
- source: <20230308222205.M679514@dcvr>
+ "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>
 
-* 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.
+* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
+ - credential: new attribute oauth_refresh_token
 
- Will merge to 'master'.
- source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
+ The credential subsystem learns to help OAuth framework.
 
+ Needs Review.
+ source: <pull.1394.git.1678776364753.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.
+* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
+ - credential/libsecret: support password_expiry_utc
 
- Will merge to 'master'.
- source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
+ The libsecret credential helper learns to handle the password
+ expiry time information.
 
+ Needs Review.
+ source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
 
-* 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.
+* ps/fetch-ref-update-reporting (2023-03-20) 6 commits
+ - fetch: centralize printing of reference updates
+ - fetch: centralize logic to print remote URL
+ - fetch: centralize 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`
 
- This is a backward compatibility breaking change.
+ Clean-up of the code path that reports what "git fetch" did to each
+ ref.
 
- Will merge to 'master'.
- source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
+ Will merge to 'next'?
+ source: <cover.1679315383.git.ps@pks.im>
 
 
-* sl/diff-files-sparse (2023-03-09) 2 commits
- - diff-files: integrate with sparse index
- - t1092: add tests for `git diff-files`
+* 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'
 
- Teach "diff-files" not to expand sparse-index unless needed.
+ Clean-up of the code path that deals with merge strategy option
+ handling in "git rebase".
 
- Expecting hopefully a final and minor reroll?
- source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
+ Needs review.
+ source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
 
 
-* 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
+* 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"
 
- Fix for a "ls-files --format="%(path)" that produced nonsense
- output, which was a bug in 2.38.
+ Code clean-up around the use of the_repository.
 
- Will merge to 'master'.
- source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
+ Needs review.
+ source: <cover-00.17-00000000000-20230317T152724Z-avarab@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
+* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
+  (merged to 'next' on 2023-03-19 at 35911c8f54)
+ + completion: prompt: use generic colors
 
- Code clean-up for test framework.
+ Lift the limitation that colored prompts can only be used with
+ PROMPT_COMMAND mode.
 
  Will merge to 'master'.
- 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
-  (merged to 'next' on 2023-03-13 at 8d099dffcc)
- + receive-pack: fix stale packfile locks when dying
+* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
+  (merged to 'next' on 2023-03-21 at 593883005f)
+ + 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 'master'.
- source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
+ source: <20230316171514.23741-1-felipe.contreras@gmail.com>
 
 
-* 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
+* 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
 
- Fix for a mis-mark-up in doc made in Git 2.39 days.
+ source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
 
- Will merge to 'master'.
- source: <87y1oco3i9.fsf@igel.home>
 
+* sl/diff-files-sparse (2023-03-20) 2 commits
+ - diff-files: integrate with sparse index
+ - t1092: add tests for `git diff-files`
 
-* ds/ahead-behind (2023-03-15) 9 commits
- - SQUASH??? leak fix (spotted by Peff)
+ Teach "diff-files" not to expand sparse-index unless needed.
+
+ Comments?
+ source: <20230320205241.105476-1-cheskaqiqi@gmail.com>
+
+
+* ds/ahead-behind (2023-03-20) 9 commits
  - 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()`
  - commit-graph: return generation from memory
- - commit-graph: combine generation computations
+ - commit-graph: simplify compute_generation_numbers()
+ - commit-graph: refactor compute_topological_levels()
  - for-each-ref: explicitly test no matches
  - for-each-ref: add --stdin option
 
@@ -541,8 +678,8 @@ Release tarballs are available at:
  distances from a single reference point in the history with bunch
  of commits in bulk.
 
- Will merge to 'next'?
- source: <pull.1489.v3.git.1678902343.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
 
 
 * gc/config-parsing-cleanup (2023-03-15) 8 commits
@@ -561,95 +698,16 @@ Release tarballs are available at:
  source: <pull.1463.v2.git.git.1678925506.gitgitgadget@gmail.com>
 
 
-* jk/bundle-progress (2023-03-06) 1 commit
-  (merged to 'next' on 2023-03-07 at 0df2b09e1b)
- + bundle: turn on --all-progress-implied by default
-
- Simplify UI to control progress meter given by "git bundle" command.
-
- Will merge to 'master'.
- source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
-
-
-* jk/bundle-use-dash-for-stdfiles (2023-03-06) 5 commits
-  (merged to 'next' on 2023-03-07 at 8ceb58f725)
- + parse-options: use prefix_filename_except_for_dash() helper
- + parse-options: consistently allocate memory in fix_filename()
- + bundle: don't blindly apply prefix_filename() to "-"
- + bundle: document handling of "-" as stdin
- + bundle: let "-" mean stdin for reading operations
-
- "git bundle" learned that "-" is a common way to say that the input
- comes from the standard input and/or the output goes to the
- standard output.  It used to work only for output and only from the
- root level of the working tree.
-
- Will merge to 'master'.
- source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
-
-
-* jk/format-patch-change-format-for-empty-commits (2023-03-03) 1 commit
-  (merged to 'next' on 2023-03-07 at 1c421f4a9f)
- + format-patch: output header for empty commits
-
- "git format-patch" learned to write a log-message only output file
- for empty commits.
-
- Will merge to 'master'.
- source: <20230303160301.3659328-1-john@keeping.me.uk>
-
-
-* ds/reprepare-alternates-when-repreparing-packfiles (2023-03-09) 1 commit
-  (merged to 'next' on 2023-03-09 at 851bceed17)
- + object-file: reprepare alternates when necessary
-
- Once we start running, we assumed that the list of alternate object
- databases would never change.  Hook into the machinery used to
- update the list of packfiles during runtime to update this list as
- well.
-
- Will merge to 'master'.
- source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
-
-
-* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
-  (merged to 'next' on 2023-03-06 at 4ee341853c)
- + restore: fault --staged --worktree with merge opts
-
- "git restore" supports options like "--ours" that are only
- meaningful during a conflicted merge, but these options are only
- meaningful when updating the working tree files.  These options are
- marked to be incompatible when both "--staged" and "--worktree" are
- in effect.
-
- Will merge to 'master'.
- source: <20230226184354.221-1-andy.koppe@gmail.com>
-
-
-* 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
- + receive-pack: fix funny ref error messsage
-
- "git push" has been taught to allow deletion of refs with one-level
- names to help repairing a repository who acquired such a ref by
- 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 merge to 'master'.
- source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
-
-
 * my/wildmatch-cleanups (2023-02-27) 5 commits
- - wildmatch: more cleanups after killing uchar
- - wildmatch: use char instead of uchar
- - wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
- - wildmatch: remove IS*() macros
- - git-compat-util: add isblank() and isgraph()
+ . wildmatch: more cleanups after killing uchar
+ . wildmatch: use char instead of uchar
+ . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
+ . wildmatch: remove IS*() macros
+ . git-compat-util: add isblank() and isgraph()
 
  Code clean-up.
 
- Comments?
+ Ejected as it conflicts with pw/wildmatch-fixes topic.
  source: <20230226115021.1681834-1-masahiroy@kernel.org>
 
 
@@ -668,7 +726,7 @@ Release tarballs are available at:
  source: <20230228185253.2356546-1-calvinwan@google.com>
 
 
-* ah/rebase-merges-config (2023-03-13) 3 commits
+* ah/rebase-merges-config (2023-03-20) 3 commits
  - rebase: add a config option for --rebase-merges
  - rebase: deprecate --rebase-merges=""
  - rebase: add documentation and test for --no-rebase-merges
@@ -676,20 +734,8 @@ Release tarballs are available at:
  Streamline --rebase-merges command line option handling and
  introduce rebase.merges configuration variable.
 
- On hold.
- source: <20230312210456.92364-1-alexhenrie24@gmail.com>
-
-
-* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
-  (merged to 'next' on 2023-03-06 at 5dc1c4c0b7)
- + commit-reach: avoid NULL dereference
-
- Fix a segfaulting loop.  The function and its caller may need
- further clean-up.
-
- Will merge to 'master'.
- cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
- source: <20230211111526.2028178-1-e@80x24.org>
+ Comments?
+ source: <20230320055955.461138-1-alexhenrie24@gmail.com>
 
 
 * tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
@@ -706,21 +752,6 @@ Release tarballs are available at:
  source: <pull.1474.git.1675614276549.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
- + tests: don't lose exit status with "test <op> $(git ...)"
- + tests: don't lose "git" exit codes in "! ( git ... | grep )"
- + tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
- + t/lib-patch-mode.sh: fix ignored exit codes
- + auto-crlf tests: don't lose exit code in loops and outside tests
-
- Test clean-up.
-
- Will merge to 'master'.
- source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
-
-
 * rj/branch-unborn-in-other-worktrees (2023-02-22) 3 commits
   (merged to 'next' on 2023-03-06 at 6ee0ec72ae)
  + branch: rename orphan branches in any worktree
@@ -781,33 +812,6 @@ Release tarballs are available at:
  source: <20230120113553.24655-1-carenas@gmail.com>
 
 
-* rj/avoid-switching-to-already-used-branch (2023-02-25) 4 commits
-  (merged to 'next' on 2023-03-06 at 7546231ddf)
- + switch: reject if the branch is already checked out elsewhere (test)
- + rebase: refuse to switch to a branch already checked out elsewhere (test)
- + branch: fix die_if_checked_out() when ignore_current_worktree
- + worktree: introduce is_shared_symref()
-
- A few subcommands have been taught to stop users from working on a
- branch that is being used in another worktree linked to the same
- repository.
-
- Will merge to 'master'.
- source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
-
-
-* rj/bisect-already-used-branch (2023-01-22) 1 commit
-  (merged to 'next' on 2023-03-06 at 3508814a41)
- + bisect: fix "reset" when branch is checked out elsewhere
-
- Allow "git bisect reset" to check out the original branch when the
- branch is already checked out in a different worktree linked to the
- same repository.
-
- Will merge to 'master'.
- source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
-
-
 * ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
  - send-email: expose header information to git-send-email's sendemail-validate hook
  - send-email: refactor header generation functions