What's cooking (2023/05 #05)todo

1 files changed, 320 insertions, 390 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index a95e60a287..82651d3971 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 (May 2023, #04; Thu, 11)
-X-master-at: 5bc069e383539824fd3a0d897100d44bbe1f8a24
-X-next-at: 37aff9b760842c69945bb44bcc626aaca660805d
+Subject: What's cooking in git.git (May 2023, #05; Tue, 16)
+X-master-at: 0df2c180904f6b709766f9c24669a9d01543f915
+X-next-at: b87f41e99e62330abb8a140c6bb46d61a0bfd809
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (May 2023, #04; Thu, 11)
+What's cooking in git.git (May 2023, #05; Tue, 16)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -16,6 +16,12 @@ 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.41-rc0 has been tagged.  Hopefully we will merge a few more
+topics by -rc1 and then go into pre-release feature freeze.
+Starting next week, until early June, my availability may be
+sporadic, but this time I won't be completely away from the keyboard
+to require an interrim maintainer.
+
 Copies of the source code to Git live in many repositories, and the
 following is a list of the ones I push into or their mirrors.  Some
 repositories have only a subset of branches.
@@ -45,18 +51,34 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* js/rebase-count-fixes (2023-05-10) 2 commits
- - rebase -r: fix the total number shown in the progress
- - rebase --update-refs: fix loops
+* ar/config-count-tests-updates (2023-04-24) 3 commits
+  (merged to 'next' on 2023-05-06 at c585a56132)
+ + t1300: add tests for missing keys
+ + t1300: check stderr for "ignores pairs" tests
+ + t1300: drop duplicate test
 
- A few bugs in the sequencer machinery that results in miscounting
- the steps have been corrected.
+ Test updates.
+ source: <20230423134649.431783-1-rybak.a.v@gmail.com>
+
+
+* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
+  (merged to 'next' on 2023-05-09 at 7734f3d690)
+ + test: rev-parse-upstream: add missing cmp
+
+ Test fix.
+ source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
+
+
+* ds/fsck-bitmap (2023-05-02) 2 commits
+  (merged to 'next' on 2023-05-09 at c2148408a2)
+ + fsck: use local repository
+ + fsck: verify checksums of all .bitmap files
 
- Waiting for responses to reviews.
- cf. <b481d212-89c5-5c8e-c99f-6df3909523c7@gmail.com>
- source: <pull.1531.git.1683759338.gitgitgadget@gmail.com>
+ "git fsck" learned to detect bit-flip breakages in the reachability
+ bitmap files.
+ source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
 
 
 * ds/merge-tree-use-config (2023-05-10) 1 commit
@@ -65,145 +87,270 @@ Release tarballs are available at:
 
  Allow git forges to disable replace-refs feature while running "git
  merge-tree".
-
- Will merge to 'master'.
  source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
 
---------------------------------------------------
-[Graduated to 'master']
 
-* ah/doc-attributes-text (2023-05-03) 1 commit
-  (merged to 'next' on 2023-05-04 at 121c97817e)
- + docs: rewrite the documentation of the text and eol attributes
+* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
+  (merged to 'next' on 2023-05-06 at 1eda43b03f)
+ + doc-diff: drop SOURCE_DATE_EPOCH override
+ + doc: doc-diff: specify date
 
- Doc update to clarify how text and eol attributes interact to
- specify the end-of-line conversion.
- source: <20230503044656.221175-2-alexhenrie24@gmail.com>
+ An earlier change broke "doc-diff", which has been corrected.
+ source: <20230503232349.59997-1-felipe.contreras@gmail.com>
+ source: <20230505211610.GA3197168@coredump.intra.peff.net>
 
 
-* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits
-  (merged to 'next' on 2023-05-03 at 185f0ec195)
- + t2019: don't create unused files
- + t1502: don't create unused files
- + t1450: don't create unused files
- + t1300: don't create unused files
- + t1300: fix config file syntax error descriptions
- + t0300: don't create unused file
+* gc/trace-bare-repo-setup (2023-05-01) 1 commit
+  (merged to 'next' on 2023-05-06 at 72b977d2f9)
+ + setup: trace bare repository setups
 
- Test cleanup.
- cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
- source: <20230417191044.909094-1-rybak.a.v@gmail.com>
+ The tracing mechanism learned to notice and report when
+ auto-discovered bare repositories are being used, as allowing so
+ without explicitly stating the user intends to do so (with setting
+ GIT_DIR for example) can be used with social engineering as an
+ attack vector.
+ source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
 
 
-* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
-  (merged to 'next' on 2023-05-04 at c2fd654367)
- + doc: remove custom callouts format
+* jc/dirstat-plug-leaks (2023-05-05) 2 commits
+  (merged to 'next' on 2023-05-09 at 2df7cf06e4)
+ + diff: plug leaks in dirstat
+ + diff: refactor common tail part of dirstat computation
+ (this branch is used by jc/diff-s-with-other-options.)
 
- Our custom callout formatter is no longer used in the documentation
- formatting toolchain, as the upstream default ones give better
- output these days.
- source: <20230418011828.47851-1-felipe.contreras@gmail.com>
+ "git diff --dirstat" leaked memory, which has been plugged.
+ source: <20230505211917.2746751-1-gitster@pobox.com>
 
 
-* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
-  (merged to 'next' on 2023-05-04 at d048eb1ef8)
- + doc: manpage: remove maximum title length
+* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
+  (merged to 'next' on 2023-05-06 at 7bae4db4cc)
+ + doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
 
- The titles of manual pages used to be chomped at an unreasonably
- short limit, which has been removed.
- source: <20230503171658.8996-1-felipe.contreras@gmail.com>
+ The documentation was misleading about the interaction between
+ GIT_DEFAULT_HASH and "git clone", which has been clarified to
+ stress that the variable is to be ignored by the command.
+ source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
 
 
-* hx/negotiator-non-recursive (2023-04-26) 2 commits
-  (merged to 'next' on 2023-05-02 at 64f97cc72d)
- + negotiator/skipping: fix some problems in mark_common()
- + negotiator/default: avoid stack overflow
+* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
+  (merged to 'next' on 2023-05-09 at 0db4f08e32)
+ + name-rev: make --stdin hidden
 
- The implementation of the default "negotiator", used to find common
- ancestor over the network for object tranfer, used to be recursive;
- it was updated to be iterative to conserve stackspace usage.
- cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
- source: <cover.1682513384.git.hanxin.hx@bytedance.com>
+ The "--stdin" option of "git name-rev" has been replaced with
+ the "--annotate-stdin" option more than a year ago.  We stop
+ advertising it in the "git name-rev -h" output.
+ source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
 
 
-* ma/gittutorial-fixes (2023-04-20) 2 commits
-  (merged to 'next' on 2023-05-02 at bf96011972)
- + gittutorial: wrap literal examples in backticks
- + gittutorial: drop early mention of origin
+* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
+  (merged to 'next' on 2023-05-09 at f4d7a7d671)
+ + t9800: correct misuse of 'show -s --raw' in a test
 
- Doc fixes.
- source: <cover.1681579244.git.martin.agren@gmail.com>
+ A test fix.
+ source: <xmqqild5rvvw.fsf@gitster.g>
 
 
-* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
-  (merged to 'next' on 2023-05-04 at 9ade4aa024)
- + credential: new attribute oauth_refresh_token
+* jk/test-verbose-no-more (2023-05-08) 3 commits
+  (merged to 'next' on 2023-05-09 at 897bfd0a6b)
+ + t: drop "verbose" helper function
+ + t7001: use "ls-files --format" instead of "cut"
+ + t7001: avoid git on upstream of pipe
 
- The credential subsystem learns to help OAuth framework.
- source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
+ Retire "verbose" helper function from the test framework.
+ source: <20230508185953.GA2108869@coredump.intra.peff.net>
 
 
-* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
-  (merged to 'next' on 2023-05-06 at 51aae61f60)
- + credential/wincred: store password_expiry_utc
+* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
+  (merged to 'next' on 2023-05-08 at adb334deec)
+ + Merge gitk changes into js/gitk-fixes-from-gfw
+ + gitk: escape file paths before piping to git log
+ + gitk: prevent overly long command lines
+
+ Gitk updates from GfW project.
+ source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
 
- Teach the recently invented "password expiry time" trait to the
- wincred credential helper.
- cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
- source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
 
+* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
+  (merged to 'next' on 2023-05-10 at 2980db981e)
+ + subtree: support long global flags
 
-* mh/use-wincred-from-system (2023-03-27) 1 commit
-  (merged to 'next' on 2023-05-06 at a545c5d4aa)
- + credential/wincred: include wincred.h
+ "git subtree" (in contrib/) update.
+ source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
 
- Code clean-up.
- cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
- cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
- source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
+
+* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
+  (merged to 'next' on 2023-05-06 at 4e9a640131)
+ + doc: interpret-trailers: fix example
+ + doc: interpret-trailers: don’t use deprecated config
+ + doc: interpret-trailers: use input redirection
+ + doc: interpret-trailers: don’t use heredoc in examples
+
+ Doc update.
+ source: <cover.1682970213.git.code@khaugsbakk.name>
+
+
+* mc/send-email-header-cmd (2023-05-01) 3 commits
+  (merged to 'next' on 2023-05-06 at 04514468b6)
+ + send-email: detect empty blank lines in command output
+ + send-email: add --header-cmd, --no-header-cmd options
+ + send-email: extract execute_cmd from recipients_cmd
+
+ "git send-email" learned "--header-cmd=<cmd>" that can inject
+ arbitrary e-mail header lines to the outgoing messages.
+ source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
+
+
+* ps/fetch-output-format (2023-05-10) 9 commits
+  (merged to 'next' on 2023-05-12 at 4126a008a5)
+ + fetch: introduce machine-parseable "porcelain" output format
+ + fetch: move option related variables into main function
+ + fetch: lift up parsing of "fetch.output" config variable
+ + fetch: introduce `display_format` enum
+ + fetch: refactor calculation of the display table width
+ + fetch: print left-hand side when fetching HEAD:foo
+ + fetch: add a test to exercise invalid output formats
+ + fetch: split out tests for output format
+ + fetch: fix `--no-recurse-submodules` with multi-remote fetches
+
+ "git fetch" learned the "--porcelain" option that emits what it did
+ in a machine-parseable format.
+ source: <cover.1683721293.git.ps@pks.im>
+
+
+* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
+  (merged to 'next' on 2023-05-06 at c61e9b0672)
+ + 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.
+ source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
 
 
-* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
-  (merged to 'next' on 2023-05-03 at ba7079bcd4)
- + send-email: expose header information to git-send-email's sendemail-validate hook
- + send-email: refactor header generation functions
+* sg/retire-unused-cocci (2023-04-20) 1 commit
+  (merged to 'next' on 2023-05-12 at 77cc27c837)
+ + cocci: remove 'unused.cocci'
+
+ Retire a rather expensive-to-run Coccinelle check patch.
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
+
+
+* sl/diff-files-sparse (2023-05-09) 2 commits
+  (merged to 'next' on 2023-05-12 at 486be95d1b)
+ + diff-files: integrate with sparse index
+ + t1092: add tests for `git diff-files`
+
+ Teach "diff-files" not to expand sparse-index unless needed.
+ cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
+ source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
+
+
+* tl/push-branches-is-an-alias-for-all (2023-05-12) 2 commits
+  (merged to 'next' on 2023-05-12 at 536aaf0bd9)
+ + t5583: fix shebang line
+  (merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
+ + push: introduce '--branches' option
+
+ "git push --all" gained an alias "git push --branches".
+ source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
+ source: <pull.1532.git.1683904156670.gitgitgadget@gmail.com>
+
+--------------------------------------------------
+[New Topics]
 
- "git send-email" learned to give the e-mail headers to the validate
- hook by passing an extra argument from the command line.
- source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
+* cg/doc-http-lowspeed-limit (2023-05-14) 1 commit
+ - doc/git-config: add unit for http.lowSpeedLimit
 
+ Doc update.
+
+ Will merge to 'next'.
+ source: <pull.1507.git.git.1683970203084.gitgitgadget@gmail.com>
 
-* rs/test-ctype-eof (2023-05-02) 1 commit
-  (merged to 'next' on 2023-05-02 at a19201a6a9)
- + test-ctype: check EOF
 
- ctype tests have been taught to test EOF, too.
- source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
+* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
+ - tag: keep the message file in case ref transaction fails
+ - t/t7004-tag: add regression test for successful tag creation
+ - doc: tag: document `TAG_EDITMSG`
 
+ "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
+ command failed, so that the user can salvage what they typed.
 
-* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
-  (merged to 'next' on 2023-05-04 at a4b1b128d6)
- + docs: clarify git rm --cached function in gitignore note
+ Will merge to 'next'.
+ source: <cover.1684258780.git.code@khaugsbakk.name>
+
+
+* sa/doc-ls-remote (2023-05-15) 6 commits
+ - ls-remote doc: document the output format
+ - ls-remote doc: explain what each example does
+ - ls-remote doc: show peeled tags in examples
+ - ls-remote doc: remove redundant --tags example
+ - show-branch doc: say <ref>, not <reference>
+ - show-ref doc: update for internal consistency
 
  Doc update.
- source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
 
+ Expecting a minor and hopefully final reroll.
+ source: <pull.1471.v3.git.git.1684152793.gitgitgadget@gmail.com>
+
+
+* tb/refs-exclusion-and-packed-refs (2023-05-15) 16 commits
+ - ls-refs.c: avoid enumerating hidden refs where possible
+ - upload-pack.c: avoid enumerating hidden refs where possible
+ - builtin/receive-pack.c: avoid enumerating hidden references
+ - refs.h: let `for_each_namespaced_ref()` take excluded patterns
+ - refs/packed-backend.c: ignore complicated hidden refs rules
+ - revision.h: store hidden refs in a `strvec`
+ - refs/packed-backend.c: add trace2 counters for jump list
+ - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
+ - refs/packed-backend.c: refactor `find_reference_location()`
+ - refs: plumb `exclude_patterns` argument throughout
+ - builtin/for-each-ref.c: add `--exclude` option
+ - ref-filter.c: parameterize match functions over patterns
+ - ref-filter: add `ref_filter_clear()`
+ - ref-filter: clear reachable list pointers after freeing
+ - ref-filter.h: provide `REF_FILTER_INIT`
+ - refs.c: rename `ref_filter`
+
+ Enumerating refs in the packed-refs file, while excluding refs that
+ match certain patterns, has been optimized.
 
-* tb/credential-long-lines (2023-05-01) 7 commits
-  (merged to 'next' on 2023-05-02 at f027002b92)
- + contrib/credential: embiggen fixed-size buffer in wincred
- + contrib/credential: avoid fixed-size buffer in libsecret
- + contrib/credential: .gitignore libsecret build artifacts
- + contrib/credential: remove 'gnome-keyring' credential helper
- + contrib/credential: avoid fixed-size buffer in osxkeychain
- + t/lib-credential.sh: ensure credential helpers handle long headers
- + credential.c: store "wwwauth[]" values in `credential_read()`
+ Will merge to 'next'?
+ source: <cover.1684178576.git.me@ttaylorr.com>
 
- The implementation of credential helpers used fgets() over fixed
- size buffers to read protocol messages, causing the remainder of
- the folded long line to trigger unexpected behaviour, which has
- been corrected.
- source: <cover.1682956419.git.me@ttaylorr.com>
+
+* zh/ls-files-format-atoms (2023-05-14) 2 commits
+ - ls-files: add %(objectsize) atom to format option
+ - ls-files: add %(objecttype) atom to format option
+
+ Some atoms that can be used in "--format=<format>" for "git ls-tree"
+ were not supported by "git ls-files", even though they were relevant
+ in the context of the latter.
+ source: <pull.1533.git.1683969100.gitgitgadget@gmail.com>
+
+
+* jc/do-not-negate-test-helpers (2023-05-16) 3 commits
+ - test: do not negate test_path_is_* to assert absense
+ - t2021: do not negate test_path_is_dir
+ - tests: do not negate test_path_exists
+
+ Small fixes.
+
+ Will merge to 'next'.
+ source: <20230516022646.648123-1-gitster@pobox.com>
+
+
+* tb/run-command-needs-alloc-h (2023-05-16) 1 commit
+  (merged to 'next' on 2023-05-16 at b87f41e99e)
+ + run-command.c: fix missing include under `NO_PTHREADS`
+
+ Fix the build problem with NO_PTHREADS defined, a fallout from
+ recent header file shuffling.
+
+ Will merge to 'master'.
+ source: <ZGP2tw0USsj9oecZ@nand.local>
 
 --------------------------------------------------
 [Stalled]
@@ -356,17 +503,6 @@ Release tarballs are available at:
  source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
 
 
-* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
- - cat-file: quote-format name in error when using -z
-
- "cat-file" in the batch mode that is fed NUL-terminated pathnames
- learned to cquote them in its error output (otherwise, a funny
- pathname with LF in it would break the lines in the output stream).
-
- Will merge to 'next'?
- source: <20230510190116.795641-2-toon@iotcl.com>
-
-
 * cw/submodule-status-in-parallel (2023-03-02) 6 commits
  - diff-lib: parallelize run_diff_files for submodules
  - diff-lib: refactor out diff_change logic
@@ -386,29 +522,34 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
-* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
-  (merged to 'next' on 2023-05-09 at f4d7a7d671)
- + t9800: correct misuse of 'show -s --raw' in a test
+* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
+ - cat-file: quote-format name in error when using -z
 
- A test fix.
+ "cat-file" in the batch mode that is fed NUL-terminated pathnames
+ learned to cquote them in its error output (otherwise, a funny
+ pathname with LF in it would break the lines in the output stream).
 
- Will merge to 'master'.
- source: <xmqqild5rvvw.fsf@gitster.g>
+ Redesign.
+ source: <20230510190116.795641-2-toon@iotcl.com>
 
 
-* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit
-  (merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
- + push: introduce '--branches' option
+* js/rebase-count-fixes (2023-05-14) 2 commits
+ - rebase -r: fix the total number shown in the progress
+ - rebase --update-refs: fix loops
 
- "git push --all" gained an alias "git push --branches".
+ A few bugs in the sequencer machinery that results in miscounting
+ the steps have been corrected.
 
- Will merge to 'master'.
- source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
+ Will merge to 'next'.
+ source: <pull.1531.v2.git.1683965487.gitgitgadget@gmail.com>
 
 
-* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
+* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
  - fsmonitor-ll.h: split this header out of fsmonitor.h
  - hash-ll, hashmap: move oidhash() to hash-ll
+ - object-store-ll.h: split this header out of object-store.h
+ - khash: name the structs that khash declares
+ - merge-ll: rename from ll-merge
  - git-compat-util.h: remove unneccessary include of wildmatch.h
  - builtin.h: remove unneccessary includes
  - list-objects-filter-options.h: remove unneccessary include
@@ -430,35 +571,12 @@ Release tarballs are available at:
  - read-cache: move shared commit and ls-files code
  - setup: adopt shared init-db & clone code
  - init-db, clone: change unnecessary global into passed parameter
- - init-db: remove unnecessary global variable & document existing bug
+ - init-db: remove unnecessary global variable
+ - init-db: document existing bug with core.bare in template config
  - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
 
  Header files cleanup.
-
- Needs review.
- source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
-
-
-* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
-  (merged to 'next' on 2023-05-10 at 2980db981e)
- + subtree: support long global flags
-
- "git subtree" (in contrib/) update.
-
- Will merge to 'master'.
- source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
-
-
-* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
-  (merged to 'next' on 2023-05-08 at adb334deec)
- + Merge gitk changes into js/gitk-fixes-from-gfw
- + gitk: escape file paths before piping to git log
- + gitk: prevent overly long command lines
-
- Gitk updates from GfW project.
-
- Will merge to 'master'.
- source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
+ source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
 
 
 * la/doc-interpret-trailers (2023-05-11) 9 commits
@@ -479,16 +597,6 @@ Release tarballs are available at:
  source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com>
 
 
-* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
-  (merged to 'next' on 2023-05-09 at 7734f3d690)
- + test: rev-parse-upstream: add missing cmp
-
- Test fix.
-
- Will merge to 'master'.
- source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
-
-
 * cc/git-replay (2023-05-09) 16 commits
  - SQUASH???
  - replay: stop assuming replayed branches do not diverge
@@ -510,46 +618,30 @@ Release tarballs are available at:
  source: <20230509175347.1714141-1-christian.couder@gmail.com>
 
 
-* jc/pack-ref-exclude-include (2023-05-11) 4 commits
+* jc/pack-ref-exclude-include (2023-05-12) 3 commits
  - pack-refs: teach pack-refs --include option
- - revision: modify ref_exclusions to handle inclusions
  - pack-refs: teach --exclude option to exclude refs from being packed
  - docs: clarify git-pack-refs --all will pack all refs
 
  "git pack-refs" learns "--include" and "--exclude" to tweak the ref
  hierarchy to be packed using pattern matching.
 
- Needs review.
- source: <pull.1501.v3.git.git.1683828635.gitgitgadget@gmail.com>
-
-
-* jk/test-verbose-no-more (2023-05-08) 3 commits
-  (merged to 'next' on 2023-05-09 at 897bfd0a6b)
- + t: drop "verbose" helper function
- + t7001: use "ls-files --format" instead of "cut"
- + t7001: avoid git on upstream of pipe
-
- Retire "verbose" helper function from the test framework.
-
- Will merge to 'master'.
- source: <20230508185953.GA2108869@coredump.intra.peff.net>
+ Will merge to 'next'?
+ source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
 
 
-* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
- - builtin/pack-objects.c: introduce `pack.extraCruftTips`
+* tb/gc-recent-object-hook (2023-05-15) 2 commits
+ - gc: introduce `gc.recentObjectsHook`
+ - reachable.c: extract `obj_is_recent()`
 
  "git pack-objects" learned to invoke a new hook program that
  enumerates extra objects to be used as anchoring points to keep
  otherwise unreachable objects in cruft packs.
-
- Under discussion
- cf. <20230505221921.GE3321533@coredump.intra.peff.net>
- source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
+ source: <cover.1684196634.git.me@ttaylorr.com>
 
 
 * jc/diff-s-with-other-options (2023-05-05) 1 commit
  - diff: fix interaction between the "-s" option and other options
- (this branch uses jc/dirstat-plug-leaks.)
 
  The "-s" (silent, squelch) option of the "diff" family of commands
  did not interact with other options that specify the output format
@@ -560,63 +652,6 @@ Release tarballs are available at:
  source: <20230505165952.335256-1-gitster@pobox.com>
 
 
-* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
- - doc: manpage: remove ancient workaround
- - doc: git-svn: use listing instead of verse
-
- Documentation toolchain lost an ancient workaround that is no
- longer needed.
-
- Needs review.
- source: <20230504035517.329765-1-felipe.contreras@gmail.com>
-
-
-* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
- - doc: revisions: add a bunch of missing quotes
- - doc: revisions: fix missing escape
-
- Doc cleanup.
-
- Needs review.
- source: <20230504163421.100400-1-felipe.contreras@gmail.com>
-
-
-* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
-  (merged to 'next' on 2023-05-06 at 1eda43b03f)
- + doc-diff: drop SOURCE_DATE_EPOCH override
- + doc: doc-diff: specify date
-
- An earlier change broke "doc-diff", which has been corrected.
-
- Will merge to 'master'.
- source: <20230503232349.59997-1-felipe.contreras@gmail.com>
- source: <20230505211610.GA3197168@coredump.intra.peff.net>
-
-
-* jc/dirstat-plug-leaks (2023-05-05) 2 commits
-  (merged to 'next' on 2023-05-09 at 2df7cf06e4)
- + diff: plug leaks in dirstat
- + diff: refactor common tail part of dirstat computation
- (this branch is used by jc/diff-s-with-other-options.)
-
- "git diff --dirstat" leaked memory, which has been plugged.
-
- Will merge to 'master'.
- source: <20230505211917.2746751-1-gitster@pobox.com>
-
-
-* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
-  (merged to 'next' on 2023-05-09 at 0db4f08e32)
- + name-rev: make --stdin hidden
-
- The "--stdin" option of "git name-rev" has been replaced with
- the "--annotate-stdin" option more than a year ago.  We stop
- advertising it in the "git name-rev -h" output.
-
- Will merge to 'master'.
- source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
-
-
 * ob/revert-of-revert (2023-05-05) 1 commit
  - sequencer: beautify subject of reverts of reverts
 
@@ -640,19 +675,6 @@ Release tarballs are available at:
  source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
 
 
-* mc/send-email-header-cmd (2023-05-01) 3 commits
-  (merged to 'next' on 2023-05-06 at 04514468b6)
- + send-email: detect empty blank lines in command output
- + send-email: add --header-cmd, --no-header-cmd options
- + send-email: extract execute_cmd from recipients_cmd
-
- "git send-email" learned "--header-cmd=<cmd>" that can inject
- arbitrary e-mail header lines to the outgoing messages.
-
- Will merge to 'master'.
- source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
-
-
 * bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
  - upload-pack: advertise capabilities when cloning empty repos
 
@@ -661,58 +683,21 @@ Release tarballs are available at:
  source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
 
 
-* ds/fsck-bitmap (2023-05-02) 2 commits
-  (merged to 'next' on 2023-05-09 at c2148408a2)
- + fsck: use local repository
- + fsck: verify checksums of all .bitmap files
-
- "git fsck" learned to detect bit-flip breakages in the reachability
- bitmap files.
-
- Will merge to 'master'.
- source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
-
-
-* gc/trace-bare-repo-setup (2023-05-01) 1 commit
-  (merged to 'next' on 2023-05-06 at 72b977d2f9)
- + setup: trace bare repository setups
-
- The tracing mechanism learned to notice and report when
- auto-discovered bare repositories are being used, as allowing so
- without explicitly stating the user intends to do so (with setting
- GIT_DIR for example) can be used with social engineering as an
- attack vector.
-
- Will merge to 'master'.
- source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
-
-
-* cw/strbuf-cleanup (2023-05-11) 7 commits
- - strbuf: remove global variable
- - strbuf: clarify dependency
- - path: move related function to path
- - object-name: move related functions to object-name
- - credential-store: move related functions to credential-store file
- - abspath: move related functions to abspath
- - strbuf: clarify API boundary
+* cw/strbuf-cleanup (2023-05-12) 7 commits
+  (merged to 'next' on 2023-05-15 at 31d08296f2)
+ + strbuf: remove global variable
+ + strbuf: clarify dependency
+ + path: move related function to path
+ + object-name: move related functions to object-name
+ + credential-store: move related functions to credential-store file
+ + abspath: move related functions to abspath
+ + strbuf: clarify API boundary
 
  Move functions that are not about pure string manipulation out of
  strbuf.[ch]
 
- Will merge to 'next'?
- source: <20230511194446.1492907-1-calvinwan@google.com>
-
-
-* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
-  (merged to 'next' on 2023-05-06 at 7bae4db4cc)
- + doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
-
- The documentation was misleading about the interaction between
- GIT_DEFAULT_HASH and "git clone", which has been clarified to
- stress that the variable is to be ignored by the command.
-
  Will merge to 'master'.
- source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
+ source: <20230512171429.2202982-1-calvinwan@google.com>
 
 
 * tl/notes-separator (2023-04-28) 6 commits
@@ -769,45 +754,6 @@ Release tarballs are available at:
  source: <cover.1683567065.git.me@ttaylorr.com>
 
 
-* ar/config-count-tests-updates (2023-04-24) 3 commits
-  (merged to 'next' on 2023-05-06 at c585a56132)
- + t1300: add tests for missing keys
- + t1300: check stderr for "ignores pairs" tests
- + t1300: drop duplicate test
-
- Test updates.
-
- Will merge to 'master'.
- source: <20230423134649.431783-1-rybak.a.v@gmail.com>
-
-
-* ps/fetch-output-format (2023-05-10) 9 commits
- - fetch: introduce machine-parseable "porcelain" output format
- - fetch: move option related variables into main function
- - fetch: lift up parsing of "fetch.output" config variable
- - fetch: introduce `display_format` enum
- - fetch: refactor calculation of the display table width
- - fetch: print left-hand side when fetching HEAD:foo
- - fetch: add a test to exercise invalid output formats
- - fetch: split out tests for output format
- - fetch: fix `--no-recurse-submodules` with multi-remote fetches
-
- "git fetch" learned the "--porcelain" option that emits what it did
- in a machine-parseable format.
-
- Will merge to 'next'?
- source: <cover.1683721293.git.ps@pks.im>
-
-
-* sg/retire-unused-cocci (2023-04-20) 1 commit
- - cocci: remove 'unused.cocci'
-
- Retire a rather expensive-to-run Coccinelle check patch.
-
- Will merge to 'next'.
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
-
-
 * gc/doc-cocci-updates (2023-04-27) 2 commits
  - cocci: codify authoring and reviewing practices
  - cocci: add headings to and reword README
@@ -818,19 +764,6 @@ Release tarballs are available at:
  source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
 
 
-* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
-  (merged to 'next' on 2023-05-06 at 4e9a640131)
- + doc: interpret-trailers: fix example
- + doc: interpret-trailers: don’t use deprecated config
- + doc: interpret-trailers: use input redirection
- + doc: interpret-trailers: don’t use heredoc in examples
-
- Doc update.
-
- Will merge to 'master'.
- source: <cover.1682970213.git.code@khaugsbakk.name>
-
-
 * pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
   (merged to 'next' on 2023-04-20 at 2728a01622)
  + completion: complete AUTO_MERGE
@@ -854,35 +787,11 @@ Release tarballs are available at:
  The libsecret credential helper learns to handle the password
  expiry time information.
 
- Will merge to 'master'.
+ On hold.
+ The database gets littered with entries whose expiration dates only differ.
+ cf. <CAGJzqskMwOJkriH6serqdwAVYi+fftEL8ohJd-suP6v+OxB_bg@mail.gmail.com>
  source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
 
-
-* sl/diff-files-sparse (2023-05-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.
-
- Will merge to 'next'.
- cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
- source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
-
-
-* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
-  (merged to 'next' on 2023-05-06 at c61e9b0672)
- + 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.
-
- Will merge to 'master'.
- source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
-
 --------------------------------------------------
 [Discarded]
 
@@ -937,3 +846,24 @@ Release tarballs are available at:
  Breaks CI.
  cf. <xmqqpm9bosjw.fsf@gitster.g>
  source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
+
+
+* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
+ . doc: manpage: remove ancient workaround
+ . doc: git-svn: use listing instead of verse
+
+ Documentation toolchain lost an ancient workaround that is no
+ longer needed.
+
+ The contributor is no longer with the project.
+ source: <20230504035517.329765-1-felipe.contreras@gmail.com>
+
+
+* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
+ . doc: revisions: add a bunch of missing quotes
+ . doc: revisions: fix missing escape
+
+ Doc cleanup.
+
+ The contributor is no longer with the project.
+ source: <20230504163421.100400-1-felipe.contreras@gmail.com>