What's cooking (2023/03 #06)

1 files changed, 376 insertions, 360 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 72ac053e77..495af35984 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, #05; Wed, 22)
-X-master-at: 27d43aaaf50ef0ae014b88bba294f93658016a2e
-X-next-at: c903bb7e22f8f86da64de537e5768ab0ca886f4b
+Subject: What's cooking in git.git (Mar 2023, #06; Wed, 29)
+X-master-at: 8d90352acc5c855620042fdcc6092f23a276af6d
+X-next-at: 7aeee1b6c6ffd94d2145753860ccc6d375edb1da
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Mar 2023, #05; Wed, 22)
+What's cooking in git.git (Mar 2023, #06; Wed, 29)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -51,382 +51,275 @@ Release tarballs are available at:
 --------------------------------------------------
 [Graduated to 'master']
 
-* 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
+* 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
 
- 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>
+ Lift the limitation that colored prompts can only be used with
+ PROMPT_COMMAND mode.
+ source: <20230228145934.4182166-1-felipe.contreras@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
+* fc/docbook-remove-groff-workaround (2023-03-21) 1 commit
+  (merged to 'next' on 2023-03-21 at 6c59b16205)
+ + doc: remove GNU troff workaround
 
- 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>
+ 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.
+ source: <20230320190047.79836-1-felipe.contreras@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
+* 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
 
- source: <20230308222205.M679514@dcvr>
+ "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.
+ source: <20230316171514.23741-1-felipe.contreras@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
+* 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
 
- 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>
+ Transports that do not support protocol v2 did not correctly fall
+ back to protocol v0 under certain conditions, which has been
+ corrected.
+ source: <ZBS6wwWXcEBwGBm/@coredump.intra.peff.net>
 
 
-* 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
+* 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)
 
- Code clean-up for test framework.
- source: <20230309173032.959968-1-felipe.contreras@gmail.com>
+ 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 git_time() wrapper and
+ use gettimeofday(2) in its implementation.
+ source: <20230320230507.3932018-1-gitster@pobox.com>
 
+--------------------------------------------------
+[New Topics]
 
-* 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
+* jk/really-deprecate-pack-redundant (2023-03-23) 1 commit
+  (merged to 'next' on 2023-03-29 at 4d1bc9ac42)
+ + pack-redundant: escalate deprecation warning to an error
 
- "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>
+ "git pack-redundant" gave a warning when run, as the command has
+ outlived its usefulness long ago and is nominated for future
+ removal.  Now we escalate to give an error.
 
+ Will merge to 'master'.
+ source: <20230323204047.GA9290@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>
+* mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit
+  (merged to 'next' on 2023-03-24 at d6c402a77b)
+ + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
 
+ A recent-ish change to allow unicode character classes to be used
+ with "grep -P" triggered a JIT bug in older pcre2 libraries.
+ The problematic change in Git built with these older libraries has
+ been disabled to work around the bug.
 
-* 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
+ Will merge to 'master'.
+ source: <20230323172539.25230-1-minipli@grsecurity.net>
 
- "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>
 
+* sm/ssl-key-type-config (2023-03-23) 1 commit
+ - http: add support for different sslcert and sslkey types.
 
-* 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
+ Add a few configuration variables to tell the cURL library that
+ different types of ssl-cert and ssl-key are in use.
 
- "git format-patch" learned to write a log-message only output file
- for empty commits.
- source: <20230303160301.3659328-1-john@keeping.me.uk>
+ Will merge to 'next'.
+ source: <pull.1474.v2.git.git.1679327330032.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
+* jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit
+  (merged to 'next' on 2023-03-27 at 74beb3baf9)
+ + blame: allow --contents to work with non-HEAD commit
 
- "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 blame --contents=<file> <rev> -- <path>" used to be forbidden,
+ but now it finds the origins of lines starting at <file> contents
+ through the history that leads to <rev>.
 
- This is a backward compatibility breaking change.
- source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
+ Will merge to 'master'.
+ source: <20230324170800.331022-1-jacob.e.keller@intel.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
+* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
+ - fsmonitor: handle differences between Windows named pipe functions
 
- "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>
+ Fix fsmonitor on Windows when the filesystem path contains certain
+ characters.
 
+ Expecting a reroll.
+ cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
+ source: <pull.1503.git.1679678090412.gitgitgadget@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.
- source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
+* ob/rollback-after-commit-lock-failure (2023-03-24) 1 commit
+  (merged to 'next' on 2023-03-27 at ea237a011c)
+ + sequencer: remove pointless rollback_lock_file()
 
+ Code clean-up.
 
-* 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
+ Will merge to 'master'.
+ source: <20230323162235.995529-1-oswald.buddenhagen@gmx.de>
 
- 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>
 
+* ob/sequencer-save-head-simplify (2023-03-24) 1 commit
+  (merged to 'next' on 2023-03-27 at 388e26f1d1)
+ + sequencer: rewrite save_head() in terms of write_message()
 
-* 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
+ Code clean-up.
 
- "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>
+ Will merge to 'master'.
+ source: <20230323162235.995544-1-oswald.buddenhagen@gmx.de>
 
---------------------------------------------------
-[New Topics]
 
-* 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
+* ab/retire-scripted-add-p (2023-03-27) 1 commit
+  (merged to 'next' on 2023-03-27 at f8cbc0c604)
+ + t3701: we don't need no Perl for `add -i` anymore
 
- Transports that do not support protocol v2 did not correctly fall
- back to protocol v0 under certain conditions, which has been
- corrected.
+ Test fix.
 
  Will merge to 'master'.
- source: <ZBS6wwWXcEBwGBm/@coredump.intra.peff.net>
+ source: <pull.1504.git.1679898996492.gitgitgadget@gmail.com>
 
 
-* 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)
+* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
+ - commit-graph: fix truncated generation numbers
+ (this branch uses ds/ahead-behind.)
 
- 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.
+ Fix unnecessary truncation of generation numbers used in-core.
 
- Will merge to 'master'.
- source: <20230320230507.3932018-1-gitster@pobox.com>
+ Comments?
+ source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
 
 
-* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
- - rebase -i: do not update "done" when rescheduling command
+* rs/archive-mtime (2023-03-27) 1 commit
+  (merged to 'next' on 2023-03-27 at 672cd32edf)
+ + t5000: use check_mtime()
 
- "rebase -i" moved a "rescheduled" insn in the todo file to the
- "done" list before it completed, which has been corrected.
+ Test update.
 
- Expecting clarification.
- source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <233edbbe-35c1-9b5b-7578-4c70c6d24449@web.de>
 
 
-* pw/wildmatch-fixes (2023-03-20) 3 commits
- - wildmatch: hide internal return values
- - wildmatch: avoid undefined behavior
- - wildmatch: fix exponential behavior
+* ws/sparse-check-rules (2023-03-27) 2 commits
+ - builtin/sparse-checkout: add check-rules command
+ - builtin/sparse-checkout: remove NEED_WORK_TREE flag
 
- The wildmatch library code unlearns exponential behaviour it
- acquired some time ago since it was borrowed from rsync.
+ "git sparse-checkout" command learns a debugging aid for the sparse
+ rule definitions.
 
- Needs review.
- source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
+ Comments?
+ source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
 
 
-* 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
+* kh/commentchar-config-error-message (2023-03-27) 1 commit
+  (merged to 'next' on 2023-03-27 at 7fdda0a984)
+ + config: tell the user that we expect an ASCII character
 
- Code clean-up to use designated initializers in parse-options API.
+ Doc update.
 
- Will merge to 'next'.
- source: <20230319165648.656738-1-szeder.dev@gmail.com>
+ Will merge to 'master'.
+ source: <20230327194344.12910-1-code@khaugsbakk.name>
 
 
-* 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
+* mh/credential-password-expiry-wincred (2023-03-27) 1 commit
+ - credential/wincred: store password_expiry_utc
 
- Code clean-up to include and/or uninclude parse-options.h file as
- needed.
+ Teach the recently invented "password expiry time" trait to the
+ wincred credential helper.
 
- Will merge to 'next'.
- source: <20230319162712.654137-1-szeder.dev@gmail.com>
+ Area maintainer is fairly negative.  Perhaps drop?
+ cf. <35e1ebe6-e15b-1712-f030-70ab708740db@gmx.de>
+ source: <pull.1477.git.git.1679729956620.gitgitgadget@gmail.com>
 
 
-* rs/archive-from-subdirectory-fixes (2023-03-20) 1 commit
- . archive: improve support for running in a subdirectory
+* mh/use-wincred-from-system (2023-03-27) 1 commit
+ - credential/wincred: include wincred.h
 
- "git archive" run from a subdirectory mishandled attributes and
- paths outside the current directory.
+ Code clean-up.
 
- Breaks CI.
- cf. <xmqqlejpg17g.fsf@gitster.g>
- source: <e923e844-6891-76dc-e7db-4771b2d91792@web.de>
+ Area maintainer is fairly negative.  Perhaps drop?
+ cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
+ source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
 
 
-* 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()`
+* ds/p2000-fix-grep-sparse (2023-03-28) 1 commit
+  (merged to 'next' on 2023-03-29 at 6a59283aa3)
+ + p2000: remove stray '--sparse' flag from test
 
- Clean-up the pack-bitmap codepath.
+ Fix perf test.
 
  Will merge to 'master'.
- source: <cover.1679342296.git.me@ttaylorr.com>
+ source: <pull.1505.git.1680034162144.gitgitgadget@gmail.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
+* jk/chainlint-fixes (2023-03-28) 4 commits
+ - tests: skip test_eval_ in internal chain-lint
+ - tests: drop here-doc check from internal chain-linter
+ - tests: replace chainlint subshell with a function
+ - tests: run internal chain-linter under "make test"
 
- Split key function and data structure definitions out of cache.h to
- new header files and adjust the users.
+ Test framework fix.
 
- Needs review.
- source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
+ Comments?
+ source: <20230328202043.GA1241391@coredump.intra.peff.net>
 
 
-* fc/docbook-remove-groff-workaround (2023-03-21) 1 commit
-  (merged to 'next' on 2023-03-21 at 6c59b16205)
- + doc: remove GNU troff workaround
+* jk/document-pack-redundant-deprecation (2023-03-28) 1 commit
+  (merged to 'next' on 2023-03-29 at cb64256b97)
+ + pack-redundant: document deprecation
 
- 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.
+ Document that we have marked "pack-redundant" as deprecated.
 
  Will merge to 'master'.
- source: <20230320190047.79836-1-felipe.contreras@gmail.com>
+ source: <20230328190641.GF18558@coredump.intra.peff.net>
 
 
-* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
- - am: refer to format-patch in the documentation
+* jk/document-rev-list-object-name (2023-03-28) 1 commit
+  (merged to 'next' on 2023-03-29 at e1cd79f572)
+ + docs: document caveats of rev-list's object-name output
 
- Doc update.
+ Document what the pathname-looking strings in "rev-list --object"
+ output are for and what they mean.
 
- Will merge to 'next'.
- source: <xmqq1qlij9qr.fsf@gitster.g>
+ Will merge to 'master'.
+ source: <20230328182650.GC18558@coredump.intra.peff.net>
 
 
-* 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
+* ob/revert-of-revert (2023-03-28) 1 commit
+ - sequencer: call a revert of a revert "reapply"
 
- Code clean-up.
+ Instead of "Revert "Revert "original"", give "Replay "original""
+ as the title for a revert of a revert.
 
- Will merge to 'next'?
- source: <20230322173636.GA5643@coredump.intra.peff.net>
+ Needs more polishing: docs, tests, transitions.
+ source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
 
 
-* 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
+* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
+  (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
+ + parse-options: drop parse_opt_unknown_cb()
+ + t/helper: mark unused argv/argc arguments
+ + mark "argv" as unused when we check argc
+ + builtins: mark unused prefix parameters
+ + builtins: annotate always-empty prefix parameters
+ + builtins: always pass prefix to parse_options()
+ + fast-import: fix file access when run from subdir
 
- 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.
+ Code clean-up for "-Wunused-parameter" build.
 
- Will merge to 'next'?
- source: <pull.1497.git.1679500859.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <20230328205253.GA1753925@coredump.intra.peff.net>
 
 --------------------------------------------------
 [Stalled]
@@ -459,17 +352,19 @@ Release tarballs are available at:
  source: <20230109173227.29264-1-jacobabel@nullpo.dev>
 
 
-* tl/notes--blankline (2023-02-24) 4 commits
- - SQUASH??? leakfix
- - notes.c: introduce '--separator=<paragraph-break>' option
- - notes.c: cleanup for "designated init"
- - notes.c: cleanup 'strbuf_grow' call in 'append_edit'
+* tl/notes-separator (2023-03-28) 4 commits
+ . notes.c: don't do stripespace when parse file arg
+ . notes.c: introduce '--separator=<paragraph-break>' option
+ . notes.c: use designated initializers for clarity
+ . notes.c: cleanup 'strbuf_grow' call in 'append_edit'
 
  'git notes append' was taught '--separator' to specify string to insert
  between paragraphs.
 
  Expecting further updates on -c/-C.
- source: <cover.1677136319.git.dyroneteng@gmail.com>
+ Seems to break CI.
+ cf. <xmqqy1nf8c0f.fsf@gitster.g>
+ source: <cover.1680012650.git.dyroneteng@gmail.com>
 
 
 * ab/tag-object-type-errors (2022-11-22) 5 commits
@@ -522,18 +417,156 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
+* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
+ - rebase -i: do not update "done" when rescheduling command
+
+ "rebase -i" moved a "rescheduled" insn in the todo file to the
+ "done" list before it completed, which has been corrected.
+
+ Expecting clarification.
+ source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
+
+
+* pw/wildmatch-fixes (2023-03-27) 4 commits
+  (merged to 'next' on 2023-03-27 at 40f52ba243)
+ + t3070: make chain lint tester happy
+  (merged to 'next' on 2023-03-24 at d0d1f23565)
+ + wildmatch: hide internal return values
+ + wildmatch: avoid undefined behavior
+ + wildmatch: fix exponential behavior
+
+ The wildmatch library code unlearns exponential behaviour it
+ acquired some time ago since it was borrowed from rsync.
+
+ Will merge to 'master'.
+ source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
+
+
+* sg/parse-options-h-initializers (2023-03-20) 3 commits
+  (merged to 'next' on 2023-03-23 at f16b3ab6d7)
+ + 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
+
+ Code clean-up to use designated initializers in parse-options API.
+
+ Will merge to 'master'.
+ source: <20230319165648.656738-1-szeder.dev@gmail.com>
+
+
+* sg/parse-options-h-users (2023-03-20) 2 commits
+  (merged to 'next' on 2023-03-23 at 2ca7d1e737)
+ + treewide: remove unnecessary inclusions of parse-options.h from headers
+ + treewide: include parse-options.h in source files
+
+ Code clean-up to include and/or uninclude parse-options.h file as
+ needed.
+
+ Will merge to 'master'.
+ source: <20230319162712.654137-1-szeder.dev@gmail.com>
+
+
+* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
+ - archive: improve support for running in subdirectory
+
+ "git archive" run from a subdirectory mishandled attributes and
+ paths outside the current directory.
+ source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@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.
+
+ On hold.  There is a BUG() on data errors.
+ 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: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
+
+
+* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
+  (merged to 'next' on 2023-03-23 at 01b35c0581)
+ + am: refer to format-patch in the documentation
+
+ Doc update.
+
+ Will merge to 'master'.
+ source: <xmqq1qlij9qr.fsf@gitster.g>
+
+
+* jk/fast-export-cleanup (2023-03-22) 6 commits
+  (merged to 'next' on 2023-03-27 at 12b9a9308e)
+ + 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
+
+ Code clean-up.
+
+ Will merge to 'master'.
+ source: <20230322173636.GA5643@coredump.intra.peff.net>
+
+
+* js/split-index-fixes (2023-03-27) 4 commits
+  (merged to 'next' on 2023-03-27 at 3a7b7da0d1)
+ + 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 'master'.
+ source: <pull.1497.v2.git.1679870743.gitgitgadget@gmail.com>
+
+
 * 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
+  (merged to 'next' on 2023-03-28 at ad035b41ea)
+ + 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
 
  Test clean-up.
 
- Needs Review.
+ Will merge to 'master'.
  source: <20230312201520.370234-1-rybak.a.v@gmail.com>
 
 
@@ -557,14 +590,14 @@ Release tarballs are available at:
  source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
 
 
-* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
+* mh/credential-password-expiry-libsecret (2023-03-27) 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>
+ source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
 
 
 * ps/fetch-ref-update-reporting (2023-03-20) 6 commits
@@ -596,7 +629,7 @@ Release tarballs are available at:
  source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
 
 
-* ab/remove-implicit-use-of-the-repository (2023-03-17) 17 commits
+* ab/remove-implicit-use-of-the-repository (2023-03-28) 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"
@@ -617,31 +650,8 @@ Release tarballs are available at:
 
  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
-  (merged to 'next' on 2023-03-19 at 35911c8f54)
- + completion: prompt: use generic colors
-
- Lift the limitation that colored prompts can only be used with
- PROMPT_COMMAND mode.
-
- Will merge to 'master'.
- source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
-
-
-* 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 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: <20230316171514.23741-1-felipe.contreras@gmail.com>
+ Will merge to 'next'.
+ source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com>
 
 
 * jk/unused-post-2.40 (2023-03-17) 4 commits
@@ -650,39 +660,44 @@ Release tarballs are available at:
  - http: drop unused parameter from start_object_request()
  - mailmap: drop debugging code
 
+ More "-Wunused-parameters" code clean-up.
+
+ Will merge to 'next'.
  source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
 
 
-* sl/diff-files-sparse (2023-03-20) 2 commits
+* sl/diff-files-sparse (2023-03-22) 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.
 
  Comments?
- source: <20230320205241.105476-1-cheskaqiqi@gmail.com>
+ source: <20230322161820.3609-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: simplify compute_generation_numbers()
- - commit-graph: refactor compute_topological_levels()
- - for-each-ref: explicitly test no matches
- - for-each-ref: add --stdin option
+  (merged to 'next' on 2023-03-23 at a607895174)
+ + 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: simplify compute_generation_numbers()
+ + commit-graph: refactor compute_topological_levels()
+ + for-each-ref: explicitly test no matches
+ + for-each-ref: add --stdin option
+ (this branch is used by ps/ahead-behind-truncation-fix.)
 
  "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the
  distances from a single reference point in the history with bunch
  of commits in bulk.
 
- Will merge to 'next'.
+ Will merge to 'master' after ps/ahead-behind-truncation-fix is acked.
  source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
 
 
-* gc/config-parsing-cleanup (2023-03-15) 8 commits
+* gc/config-parsing-cleanup (2023-03-28) 8 commits
  - config.c: rename "struct config_source cf"
  - config: report cached filenames in die_bad_number()
  - config.c: remove current_parsing_scope
@@ -694,8 +709,8 @@ Release tarballs are available at:
 
  Config API clean-up to reduce its dependence on static variables
 
- Comments?
- source: <pull.1463.v2.git.git.1678925506.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com>
 
 
 * my/wildmatch-cleanups (2023-02-27) 5 commits
@@ -726,16 +741,17 @@ Release tarballs are available at:
  source: <20230228185253.2356546-1-calvinwan@google.com>
 
 
-* 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
+* ah/rebase-merges-config (2023-03-27) 3 commits
+  (merged to 'next' on 2023-03-27 at c8a894ba4b)
+ + rebase: add a config option for --rebase-merges
+ + rebase: deprecate --rebase-merges=""
+ + rebase: add documentation and test for --no-rebase-merges
 
  Streamline --rebase-merges command line option handling and
  introduce rebase.merges configuration variable.
 
- Comments?
- source: <20230320055955.461138-1-alexhenrie24@gmail.com>
+ Will merge to 'master'.
+ source: <20230326030636.2635642-1-alexhenrie24@gmail.com>
 
 
 * tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
@@ -752,18 +768,18 @@ Release tarballs are available at:
  source: <pull.1474.git.1675614276549.gitgitgadget@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
- + branch: description for orphan branch errors
- + branch: avoid unnecessary worktrees traversals
+* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
+ - branch: avoid unnecessary worktrees traversals
+ - branch: rename orphan branches in any worktree
+ - branch: description for orphan branch errors
+ - branch: use get_worktrees() in copy_or_rename_branch()
+ - branch: test for failures while renaming branches
 
  Error messages given when working on an unborn branch that is
  checked out in another worktree have been improved.
 
- Needs update.
- cf. <877b6f9d-bab6-1343-42d0-3e17e3d0a9c5@gmail.com>
- source: <139555f1-21ab-d987-a58e-c7f04ce222d3@gmail.com>
+ Kicked out of 'next' to replace with an updated version.
+ source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
 
 
 * ab/imap-send-requires-curl (2023-02-02) 6 commits
@@ -783,7 +799,7 @@ Release tarballs are available at:
  source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
 
 
-* ab/config-multi-and-nonbool (2023-03-08) 9 commits
+* ab/config-multi-and-nonbool (2023-03-28) 9 commits
  - for-each-repo: with bad config, don't conflate <path> and <cmd>
  - config API: add "string" version of *_value_multi(), fix segfaults
  - config API users: test for *_get_value_multi() segfaults
@@ -796,12 +812,12 @@ Release tarballs are available at:
 
  Assorted config API updates.
 
- Almost there.
- cf. <kl6l8rg5hhen.fsf@chooglen-macbookpro.roam.corp.google.com>
- source: <cover-v7-0.9-00000000000-20230308T090513Z-avarab@gmail.com>
+ Will merge to 'next'.
+ source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com>
 
 
-* cb/checkout-same-branch-twice (2023-01-20) 1 commit
+* 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
 
  "git checkout -B $branch" failed to protect against checking out