What's cooking (2023/01 #06)

1 files changed, 443 insertions, 341 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 233fb2fff2..e594e34ad4 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 (Jan 2023, #05; Tue, 17)
-X-master-at: a7caae2729742fc80147bca1c02ae848cb55921a
-X-next-at: 3abcab475e35598790da85d8a607d719986a9436
+Subject: What's cooking in git.git (Jan 2023, #06; Sun, 22)
+X-master-at: 56c8fb1e95377900ec9d53c07886022af0a5d3c2
+X-next-at: fc5497dd1b1018e63e916d3ef950ac3f70ea090d
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Jan 2023, #05; Tue, 17)
+What's cooking in git.git (Jan 2023, #06; Sun, 22)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -14,10 +14,6 @@ release).  Commits prefixed with '-' are only in 'seen', and aren't
 considered "accepted" at all.  A topic without enough support may be
 discarded after a long period of no activity.
 
-A maintenance release Git 2.39.1 and friends to address two security
-issues are out, and today's 'master', 'next', and 'seen' all include
-the fix.
-
 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.
@@ -49,142 +45,391 @@ Release tarballs are available at:
 --------------------------------------------------
 [Graduated to 'master']
 
-* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits
-  (merged to 'next' on 2023-01-09 at e17ef56485)
- + features: feature.manyFiles implies fast index writes
- + test-lib-functions: add helper for trailing hash
- + read-cache: add index.skipHash config option
- + hashfile: allow skipping the hash function
+* ab/bisect-cleanup (2023-01-13) 6 commits
+  (merged to 'next' on 2023-01-14 at 945b631a1e)
+ + bisect: no longer try to clean up left-over `.git/head-name` files
+ + bisect: remove Cogito-related code
+ + bisect run: fix the error message
+ + bisect: verify that a bogus option won't try to start a bisection
+ + bisect--helper: make the order consistently `argc, argv`
+ + bisect--helper: simplify exit code computation
+
+ Code clean-up.
+ source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
+
+
+* ar/bisect-doc-update (2023-01-13) 2 commits
+  (merged to 'next' on 2023-01-14 at df5185519c)
+ + git-bisect-lk2009: update nist report link
+ + git-bisect-lk2009: update java code conventions link
+
+ Doc update.
+ source: <20230110093251.193552-1-rybak.a.v@gmail.com>
+
+
+* ar/test-cleanup (2023-01-13) 3 commits
+  (merged to 'next' on 2023-01-14 at 16d372b65d)
+ + t7527: use test_when_finished in 'case insensitive+preserving'
+ + t6422: drop commented out code
+ + t6003: uncomment test '--max-age=c3, --topo-order'
+
+ Test clean-up.
+ source: <20230111233242.16870-1-rybak.a.v@gmail.com>
+
+
+* es/hooks-and-local-env (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at 93acd89393)
+ + githooks: discuss Git operations in foreign repositories
+
+ Doc update for environment variables set when hooks are invoked.
+ source: <pull.1457.v2.git.1673293508399.gitgitgadget@gmail.com>
+
 
- Introduce an optional configuration to allow the trailing hash that
- protects the index file from bit flipping.
- source: <pull.1439.v5.git.1673022717.gitgitgadget@gmail.com>
+* jc/doc-diff-patch.txt (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at d25ec1f631)
+ + docs: link generating patch sections
 
-* ar/dup-words-fixes (2023-01-08) 1 commit
-  (merged to 'next' on 2023-01-09 at 2a5d4537a2)
- + *: fix typos which duplicate a word
+ Doc update.
+ source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
 
- Typofixes.
- source: <20230107135655.149892-1-rybak.a.v@gmail.com>
 
+* jk/curl-avoid-deprecated-api (2023-01-17) 3 commits
+  (merged to 'next' on 2023-01-17 at e3ead5f8a0)
+ + http: support CURLOPT_PROTOCOLS_STR
+ + http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
+ + http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
 
-* ds/bundle-uri-4 (2023-01-06) 1 commit
-  (merged to 'next' on 2023-01-08 at d5b03bdd48)
- + test-bundle-uri: drop unused variables
- (this branch is used by ds/bundle-uri-5.)
+ Deal with a few deprecation warning from cURL library.
+ source: <Y8YP+R/hyNr6sEFA@coredump.intra.peff.net>
+
+
+* jk/interop-error (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at ddca7887a5)
+ + t/interop: report which vanilla git command failed
+
+ Test helper improvement.
+ source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
+
+
+* jk/read-object-cleanup (2023-01-13) 6 commits
+  (merged to 'next' on 2023-01-13 at 8cbeef4abd)
+ + object-file: fix indent-with-space
+  (merged to 'next' on 2023-01-09 at 19cc3de33e)
+ + packfile: inline custom read_object()
+ + repo_read_object_file(): stop wrapping read_object_file_extended()
+ + read_object_file_extended(): drop lookup_replace option
+ + streaming: inline call to read_object_file_extended()
+ + object-file: inline calls to read_object()
 
  Code clean-up.
- source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
+ source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
 
 
-* es/t1509-root-fixes (2022-12-09) 3 commits
-  (merged to 'next' on 2023-01-08 at c922e34bab)
- + t1509: facilitate repeated script invocations
- + t1509: make "setup" test more robust
- + t1509: fix failing "root work tree" test due to owner-check
+* jx/t1301-updates (2022-11-30) 3 commits
+  (merged to 'next' on 2023-01-14 at d4f081b3f8)
+ + t1301: do not change $CWD in "shared=all" test case
+ + t1301: use test_when_finished for cleanup
+ + t1301: fix wrong template dir for git-init
 
- Test fixes.
- source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
+ Test updates.
+ source: <20221128130323.8914-1-worldhello.net@gmail.com>
 
 
-* jk/ext-diff-with-relative (2023-01-06) 3 commits
-  (merged to 'next' on 2023-01-08 at 5233a7d3ee)
- + diff: drop "name" parameter from prepare_temp_file()
- + diff: clean up external-diff argv setup
- + diff: use filespec path to set up tempfiles for ext-diff
+* pb/doc-orig-head (2023-01-13) 5 commits
+  (merged to 'next' on 2023-01-14 at 0583c146cb)
+ + git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
+ + revisions.txt: be explicit about commands writing 'ORIG_HEAD'
+ + git-merge.txt: mention 'ORIG_HEAD' in the Description
+ + git-reset.txt: mention 'ORIG_HEAD' in the Description
+ + git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
 
- "git diff --relative" did not mix well with "git diff --ext-diff",
- which has been corrected.
- source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
+ Document ORIG_HEAD a bit more.
+ source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
 
 
-* jk/strncmp-to-api-funcs (2023-01-08) 2 commits
-  (merged to 'next' on 2023-01-09 at 47395b7c6f)
- + convert trivial uses of strncmp() to skip_prefix()
- + convert trivial uses of strncmp() to starts_with()
+* ph/parse-date-reduced-precision (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at eb83564c3e)
+ + date.c: allow ISO 8601 reduced precision times
+
+ Loosen date parsing heuristics.
+ source: <20230111001003.10916-1-congdanhqx@gmail.com>
+
+
+* pw/rebase-exec-cleanup (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at 553d0daa62)
+ + rebase: cleanup "--exec" option handling
 
  Code clean-up.
- source: <Y7lyga5g2leSmWQd@coredump.intra.peff.net>
+ source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
 
 
-* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
-  (merged to 'next' on 2023-01-08 at 8bb55c12c7)
- + ci(github): restore "print test failures" step name
+* rs/dup-array (2023-01-09) 5 commits
+  (merged to 'next' on 2023-01-14 at 3efbd1ffe0)
+ + use DUP_ARRAY
+ + add DUP_ARRAY
+ + do full type check in BARF_UNLESS_COPYABLE
+ + factor out BARF_UNLESS_COPYABLE
+ + mingw: make argv2 in try_shell_exec() non-const
 
- (cosmetic) CI regression fix.
- source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
+ Code cleaning.
+ source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
+ source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
 
 
-* tb/ci-concurrency (2022-11-08) 1 commit
-  (merged to 'next' on 2023-01-08 at ab7cdc20b8)
- + ci: avoid unnecessary builds
+* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at f171559fae)
+ + merge: break out of all_strategy loop when strategy is found
 
- Avoid unnecessary builds in CI, with settings configured in
- ci-config.
- source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
+ Micro optimization.
+ source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
 
 
-* tr/am--no-verify (2023-01-05) 1 commit
-  (merged to 'next' on 2023-01-08 at 4585013067)
- + am: allow passing --no-verify flag
+* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
+  (merged to 'next' on 2023-01-14 at f7238037fd)
+ + t3104: remove shift code in 'test_ls_tree_format'
+ + ls-tree: cleanup the redundant SPACE
+ + ls-tree: make "line_termination" less generic
+ + ls-tree: fold "show_tree_data" into "cb" struct
+ + ls-tree: use a "struct options"
+ + ls-tree: don't use "show_tree_data" for "fast" callbacks
 
- Conditionally skip the pre-applypatch and applypatch-msg hooks when
- applying patches with 'git am'.
- source: <20221130172833.2662751-1-thierry.reding@gmail.com>
+ Code clean-up.
+ source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
 
 
-* ws/single-file-cone (2023-01-05) 1 commit
-  (merged to 'next' on 2023-01-09 at b6d4d7b905)
- + dir: check for single file cone patterns
+* yc/doc-fetch-fix (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at a3ca60840b)
+ + doc: fix non-existent config name
 
- The logic to see if we are using the "cone" mode by checking the
- sparsity patterns has been tightened to avoid mistaking a pattern
- that names a single file as specifying a cone.
- source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
+ Doc fix.
+ source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
+
+
+* yo/doc-use-more-switch-c (2023-01-13) 1 commit
+  (merged to 'next' on 2023-01-14 at 7169d5dabc)
+ + doc: add "git switch -c" as another option on detached HEAD
+
+ Doc update.
+ source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
 
 --------------------------------------------------
 [New Topics]
 
-* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
-  (merged to 'next' on 2023-01-16 at 6359f28ba7)
- + ls-tree: remove dead store and strbuf for quote_c_style()
- + ls-tree: fix expansion of repeated %(path)
+* ab/cache-api-cleanup-users (2023-01-17) 3 commits
+  (merged to 'next' on 2023-01-18 at c5a4374652)
+ + treewide: always have a valid "index_state.repo" member
+ + Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users
+ + Merge branch 'ab/cache-api-cleanup' into ab/cache-api-cleanup-users
+ (this branch uses ab/cache-api-cleanup and ds/omit-trailing-hash-in-index.)
 
- "git ls-tree --format='%(path) %(path)' $tree $path" showed the
- path three times, which has been corrected.
+ Updates the users of the cache API.
 
  Will merge to 'master'.
- source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
+ cf. <db312853-81a1-542b-db96-d816c463516c@github.com>
+ source: <patch-1.1-b4998652822-20230117T135234Z-avarab@gmail.com>
 
 
-* jc/format-patch-v-unleak (2023-01-16) 1 commit
-  (merged to 'next' on 2023-01-16 at 2155d512bc)
- + format-patch: unleak "-v <num>"
+* cb/checkout-same-branch-twice (2023-01-20) 1 commit
+ - checkout/switch: disallow checking out same branch in multiple worktrees
 
- Plug a small leak.
+ "git checkout -B $branch" failed to protect against checking out
+ a branch that is checked out elsewhere, unlike "git branch -f" did.
+
+ Expecting a (hopefully final) reroll.
+ cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>
+ source: <20230120113553.24655-1-carenas@gmail.com>
+
+
+* sa/cat-file-mailmap--batch-check (2023-01-18) 1 commit
+  (merged to 'next' on 2023-01-18 at 25ecb1dd3a)
+ + git-cat-file.txt: fix list continuations rendering literally
+
+ Docfix.
 
  Will merge to 'master'.
- source: <xmqqv8l8gr6s.fsf@gitster.g>
+ source: <20230118082749.1252459-1-martin.agren@gmail.com>
 
 
-* jk/curl-avoid-deprecated-api (2023-01-17) 3 commits
- - http: support CURLOPT_PROTOCOLS_STR
- - http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
- - http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
+* pb/branch-advice-recurse-submodules (2023-01-18) 1 commit
+  (merged to 'next' on 2023-01-19 at 13747fc72d)
+ + branch: improve advice when --recurse-submodules fails
+
+ Improve advice message given when "git branch --resurse-submodules"
+ fails.
+
+ Will merge to 'master'.
+ source: <pull.1464.git.1673890908453.gitgitgadget@gmail.com>
 
- Deal with a few deprecation warning from cURL library.
+
+* ab/sequencer-unleak (2023-01-18) 8 commits
+ - commit.c: free() revs.commit in get_fork_point()
+ - builtin/rebase.c: free() "options.strategy_opts"
+ - sequencer.c: always free() the "msgbuf" in do_pick_commit()
+ - builtin/rebase.c: fix "options.onto_name" leak
+ - builtin/revert.c: move free-ing of "revs" to replay_opts_release()
+ - rebase & sequencer API: fix get_replay_opts() leak in "rebase"
+ - sequencer.c: split up sequencer_remove_state()
+ - rebase: use "cleanup" pattern in do_interactive_rebase()
+
+ Plug leaks in sequencer subsystem and its users.
+
+ Needs review.
+ source: <cover-v3-0.8-00000000000-20230118T160600Z-avarab@gmail.com>
+
+
+* en/rebase-update-refs-needs-merge-backend (2023-01-22) 9 commits
+ - rebase: provide better error message for apply options vs. merge config
+ - rebase: put rebase_options initialization in single place
+ - rebase: fix formatting of rebase --reapply-cherry-picks option in docs
+ - rebase: clarify the OPT_CMDMODE incompatibilities
+ - rebase: add coverage of other incompatible options
+ - rebase: fix docs about incompatibilities with --root
+ - rebase: remove --allow-empty-message from incompatible opts
+ - rebase: flag --apply and --merge as incompatible
+ - rebase: mark --update-refs as requiring the merge backend
+
+ The "--update-refs" feature of "git rebase" requires the use of the
+ merge backend, while "--whitespace=fix" feature does not work with
+ the said backend.  Notice the combination and error out, instead of
+ silently ignoring one of the features requested.
+
+ Needs review.
+ source: <pull.1466.v4.git.1674367961.gitgitgadget@gmail.com>
+
+
+* jk/hash-object-literally-fd-leak (2023-01-19) 1 commit
+  (merged to 'next' on 2023-01-19 at fff9b60a36)
+ + hash-object: fix descriptor leak with --literally
+
+ Leakfix.
+
+ Will merge to 'master'.
+ source: <Y8ijpJqtkDTi792i@coredump.intra.peff.net>
+
+
+* jc/doc-branch-update-checked-out-branch (2023-01-18) 1 commit
+  (merged to 'next' on 2023-01-19 at 970900a232)
+ + branch: document `-f` and linked worktree behaviour
+
+ Document that "branch -f <branch>" disables only the safety to
+ avoid recreating an existing branch.
+
+ Will merge to 'master'.
+ source: <xmqqa62f2dj1.fsf_-_@gitster.g>
+
+
+* jc/doc-checkout-b (2023-01-19) 1 commit
+ - checkout: document -b/-B to highlight the differences from "git branch"
+
+ Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
+ different in the documentation.
 
  Will merge to 'next'.
- source: <Y8YP+R/hyNr6sEFA@coredump.intra.peff.net>
+ source: <xmqqtu0m1m9i.fsf@gitster.g>
 
 
-* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
- - t1600: fix racy index.skipHash test
+* cw/fetch-remote-group-with-duplication (2023-01-19) 1 commit
+  (merged to 'next' on 2023-01-20 at 7f00e43209)
+ + fetch: fix duplicate remote parallel fetch bug
 
- Quickfix for a topic already in 'master'.
+ "git fetch <group>", when "<group>" of remotes lists the same
+ remote twice, unnecessarily failed when parallel fetching was
+ enabled, which has been corrected.
+
+ Will merge to 'master'.
+ source: <20230119220538.1522464-1-calvinwan@google.com>
 
- Will merge to 'next' and then to 'master'.
- source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
+
+* po/pretty-format-columns-doc (2023-01-19) 5 commits
+ - doc: pretty-formats note wide char limitations, and add tests
+ - doc: pretty-formats describe use of ellipsis in truncation
+ - doc: pretty-formats document negative column alignments
+ - doc: pretty-formats: delineate `%<|(` parameter values
+ - doc: pretty-formats: separate parameters from placeholders
+
+ Clarify column-padding operators in the pretty format string.
+
+ Will merge to 'next'.
+ source: <20230119181827.1319-1-philipoakley@iee.email>
+
+
+* jk/hash-object-fsck (2023-01-19) 7 commits
+ - fsck: do not assume NUL-termination of buffers
+ - hash-object: use fsck for object checks
+ - fsck: provide a function to fsck buffer without object struct
+ - t: use hash-object --literally when created malformed objects
+ - t7030: stop using invalid tag name
+ - t1006: stop using 0-padded timestamps
+ - t1007: modernize malformed object tests
+
+ "git hash-object" now checks that the resulting object is well
+ formed with the same code as "git fsck".
+
+ Will merge to 'next'.
+ source: <Y8hX+pIZUKXsyYj5@coredump.intra.peff.net>
+ source: <Y8ifa7hyqxSbL92U@coredump.intra.peff.net>
+
+
+* rs/tree-parse-mode-overflow-check (2023-01-21) 1 commit
+ - tree-walk: disallow overflowing modes
+
+ Reject tree objects with entries whose mode bits are overly wide.
+
+ Will merge to 'next'.
+ source: <d673fde7-7eb2-6306-86b6-1c1a4c988ee8@web.de>
+
+
+* tb/t0003-invoke-dd-more-portably (2023-01-22) 1 commit
+ - t0003: call dd with portable blocksize
+
+ Test portability fix.
+
+ Will merge to 'next'.
+ source: <20230122062839.14542-1-tboegi@web.de>
+
+
+* ar/markup-em-en-dash (2023-01-22) 1 commit
+ - Documentation: render dash correctly
+
+ Doc mark-up fix.
+
+ Will merge to 'next'.
+ source: <20230122165628.1601062-1-rybak.a.v@gmail.com>
+
+
+* jc/attr-doc-fix (2023-01-22) 1 commit
+ - attr: fix instructions on how to check attrs
+
+ Comment fix.
+
+ Will merge to 'next'.
+ source: <pull.1441.git.git.1674356774172.gitgitgadget@gmail.com>
+
+
+* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits
+ - 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
+
+ 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.
+
+ Expecting a (hopefully final) reroll.
+ cf. <d61a2393-64c8-da49-fe13-00bc4a52d5e3@gmail.com>
+ source: <f7f45f54-9261-45ea-3399-8ba8dee6832b@gmail.com>
+
+
+* rj/bisect-already-used-branch (2023-01-22) 1 commit
+ - bisect: fix "reset" when branch is checked out elsewhere
+
+ Allow "git bisect reset [name]" to check out the named branch (or
+ the original one) even when the branch is already checked out in a
+ different worktree linked to the same repository.
+
+ Leaning negative. Why is it a good thing?
+ cf. <xmqqo7qqovp1.fsf@gitster.g>
+ source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
 
 --------------------------------------------------
 [Stalled]
@@ -204,16 +449,6 @@ Release tarballs are available at:
  source: <cover.1667980450.git.dyroneteng@gmail.com>
 
 
-* po/pretty-hard-trunc (2022-11-13) 1 commit
- - pretty-formats: add hard truncation, without ellipsis, options
-
- Add a new pretty format which truncates without ellipsis.
-
- Expecting a reroll.
- cf. <093e1dca-b9d4-f1f2-0845-ad6711622cf5@iee.email>
- source: <20221112143616.1429-1-philipoakley@iee.email>
-
-
 * mc/switch-advice (2022-11-09) 1 commit
  - po: use `switch` over `checkout` in error message
 
@@ -263,7 +498,7 @@ Release tarballs are available at:
 
  Assorted config API updates.
 
- Needs review.
+ Expecting a reroll.
  source: <cover-v3-0.9-00000000000-20221125T093158Z-avarab@gmail.com>
 
 
@@ -298,7 +533,7 @@ Release tarballs are available at:
  back to interpreted execution in such a case.
 
  Expecting a reroll.
- cf. <62a06c5b-9646-17f8-b4d5-39823d3cc25a@grsecurity.net>
+ cf. <f680b274-fa85-6624-096a-7753a2671c15@grsecurity.net>
  source: <20221216121557.30714-1-minipli@grsecurity.net>
 
 
@@ -327,6 +562,39 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
+* rs/ls-tree-path-expansion-fix (2023-01-14) 2 commits
+  (merged to 'next' on 2023-01-16 at 6359f28ba7)
+ + ls-tree: remove dead store and strbuf for quote_c_style()
+ + ls-tree: fix expansion of repeated %(path)
+
+ "git ls-tree --format='%(path) %(path)' $tree $path" showed the
+ path three times, which has been corrected.
+
+ Will merge to 'master'.
+ source: <55ae7333-3a13-0575-93ed-f858a1c2877e@web.de>
+
+
+* jc/format-patch-v-unleak (2023-01-16) 1 commit
+  (merged to 'next' on 2023-01-16 at 2155d512bc)
+ + format-patch: unleak "-v <num>"
+
+ Plug a small leak.
+
+ Will merge to 'master'.
+ source: <xmqqv8l8gr6s.fsf@gitster.g>
+
+
+* ds/omit-trailing-hash-in-index (2023-01-17) 1 commit
+  (merged to 'next' on 2023-01-17 at 8dde3cf2db)
+ + t1600: fix racy index.skipHash test
+ (this branch is used by ab/cache-api-cleanup-users.)
+
+ Quickfix for a topic already in 'master'.
+
+ Will merge to 'master'.
+ source: <76204710-356a-2a85-9057-302e6619b9df@github.com>
+
+
 * ab/cache-api-cleanup (2023-01-16) 5 commits
   (merged to 'next' on 2023-01-16 at a0f388b149)
  + cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
@@ -334,6 +602,7 @@ Release tarballs are available at:
  + sparse-index API: BUG() out on NULL ensure_full_index()
  + sparse-index.c: expand_to_path() can assume non-NULL "istate"
  + builtin/difftool.c: { 0 }-initialize rather than using memset()
+ (this branch is used by ab/cache-api-cleanup-users.)
 
  Code clean-up to tighten the use of in-core index in the API.
 
@@ -351,29 +620,6 @@ Release tarballs are available at:
  source: <patch-1.1-e662c570f1d-20230112T155226Z-avarab@gmail.com>
 
 
-* ar/bisect-doc-update (2023-01-13) 2 commits
-  (merged to 'next' on 2023-01-14 at df5185519c)
- + git-bisect-lk2009: update nist report link
- + git-bisect-lk2009: update java code conventions link
-
- Doc update.
-
- Will merge to 'master'.
- source: <20230110093251.193552-1-rybak.a.v@gmail.com>
-
-
-* ar/test-cleanup (2023-01-13) 3 commits
-  (merged to 'next' on 2023-01-14 at 16d372b65d)
- + t7527: use test_when_finished in 'case insensitive+preserving'
- + t6422: drop commented out code
- + t6003: uncomment test '--max-age=c3, --topo-order'
-
- Test clean-up.
-
- Will merge to 'master'.
- source: <20230111233242.16870-1-rybak.a.v@gmail.com>
-
-
 * en/ls-files-doc-update (2023-01-13) 4 commits
  - ls-files: guide folks to --exclude-standard over other --exclude* options
  - ls-files: clarify descriptions of status tags for -t
@@ -382,7 +628,7 @@ Release tarballs are available at:
 
  Doc update to ls-files.
 
- Needs review.
+ Will merge to 'next'?
  source: <pull.1463.git.1673584914.gitgitgadget@gmail.com>
 
 
@@ -396,124 +642,26 @@ Release tarballs are available at:
  source: <pull.1462.v2.git.1673722187025.gitgitgadget@gmail.com>
 
 
-* jc/doc-diff-patch.txt (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at d25ec1f631)
- + docs: link generating patch sections
-
- Doc update.
-
- Will merge to 'master'.
- source: <pull.1392.v2.git.git.1673626524221.gitgitgadget@gmail.com>
-
-
-* jk/interop-error (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at ddca7887a5)
- + t/interop: report which vanilla git command failed
-
- Test helper improvement.
-
- Will merge to 'master'.
- source: <Y8A3yGeJl0TCDNqe@coredump.intra.peff.net>
-
-
-* pw/rebase-exec-cleanup (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at 553d0daa62)
- + rebase: cleanup "--exec" option handling
-
- Code clean-up.
-
- Will merge to 'master'.
- source: <pull.1461.git.1673542201452.gitgitgadget@gmail.com>
-
-
-* sk/merge-filtering-strategies-micro-optim (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at f171559fae)
- + merge: break out of all_strategy loop when strategy is found
-
- Micro optimization.
-
- Will merge to 'master'.
- source: <pull.1429.v2.git.git.1673285669004.gitgitgadget@gmail.com>
-
-
-* yo/doc-use-more-switch-c (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at 7169d5dabc)
- + doc: add "git switch -c" as another option on detached HEAD
-
- Doc update.
-
- Will merge to 'master'.
- source: <pull.1422.v2.git.git.1673261237449.gitgitgadget@gmail.com>
-
-
 * zh/scalar-progress (2023-01-16) 1 commit
- - scalar: show progress if stderr refers to a terminal
+  (merged to 'next' on 2023-01-17 at d4c25cc71f)
+ + scalar: show progress if stderr refers to a terminal
 
  "scalar" learned to give progress bar.
 
- Will merge to 'next'.
- source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
-
-
-* ab/bisect-cleanup (2023-01-13) 6 commits
-  (merged to 'next' on 2023-01-14 at 945b631a1e)
- + bisect: no longer try to clean up left-over `.git/head-name` files
- + bisect: remove Cogito-related code
- + bisect run: fix the error message
- + bisect: verify that a bogus option won't try to start a bisection
- + bisect--helper: make the order consistently `argc, argv`
- + bisect--helper: simplify exit code computation
-
- Code clean-up.
-
  Will merge to 'master'.
- source: <cover-v2-0.6-00000000000-20230112T151651Z-avarab@gmail.com>
+ source: <pull.1441.v3.git.1673442860379.gitgitgadget@gmail.com>
 
 
-* ms/send-email-feed-header-to-validate-hook (2023-01-17) 2 commits
+* 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
 
  "git send-email" learned to give the e-mail headers to the validate
  hook by passing an extra argument from the command line.
 
- Under review.
- source: <20230117142706.230404-1-michael.strawbridge@amd.com>
-
-
-* tl/ls-tree-code-clean-up (2023-01-13) 6 commits
-  (merged to 'next' on 2023-01-14 at f7238037fd)
- + t3104: remove shift code in 'test_ls_tree_format'
- + ls-tree: cleanup the redundant SPACE
- + ls-tree: make "line_termination" less generic
- + ls-tree: fold "show_tree_data" into "cb" struct
- + ls-tree: use a "struct options"
- + ls-tree: don't use "show_tree_data" for "fast" callbacks
-
- Code clean-up.
-
- Will merge to 'master'.
- source: <20230112091135.20050-1-tenglong.tl@alibaba-inc.com>
-
-
-* yc/doc-fetch-fix (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at a3ca60840b)
- + doc: fix non-existent config name
-
- Doc fix.
-
- Will merge to 'master'.
- source: <CAEg0tHSZi22RUBREJB=Cfy6O72cicv9FTkgo_Z=gvGRdPK1acw@mail.gmail.com>
-
-
-* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
-  (merged to 'next' on 2023-01-14 at 5efb778ab0)
- + ci: do not die on deprecated-declarations warning
-
- CI build fix for overzealous -Werror.
-
- Will merge to 'master'.
- source: <xmqq7cxpkpjp.fsf@gitster.g>
+ Expecting a (hopefully final) reroll.
+ cf. <c1ba0a28-3c39-b313-2757-dceb02930334@amd.com>
+ source: <20230120012459.920932-1-michael.strawbridge@amd.com>
 
 
 * ds/bundle-uri-5 (2023-01-07) 8 commits
@@ -529,78 +677,33 @@ Release tarballs are available at:
  The bundle-URI subsystem adds support for creation-token heuristics
  to help incremental fetches.
 
- Needs review.
+ Expecting a reroll.
+ cf. <4e2ac966-0f45-8018-ff8f-3831ea0c3c2e@github.com>
  source: <pull.1454.git.1673037405.gitgitgadget@gmail.com>
 
 
-* jk/read-object-cleanup (2023-01-13) 6 commits
-  (merged to 'next' on 2023-01-13 at 8cbeef4abd)
- + object-file: fix indent-with-space
-  (merged to 'next' on 2023-01-09 at 19cc3de33e)
- + packfile: inline custom read_object()
- + repo_read_object_file(): stop wrapping read_object_file_extended()
- + read_object_file_extended(): drop lookup_replace option
- + streaming: inline call to read_object_file_extended()
- + object-file: inline calls to read_object()
-
- Code clean-up.
-
- Will merge to 'master'.
- source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
-
-
-* pb/doc-orig-head (2023-01-13) 5 commits
-  (merged to 'next' on 2023-01-14 at 0583c146cb)
- + git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
- + revisions.txt: be explicit about commands writing 'ORIG_HEAD'
- + git-merge.txt: mention 'ORIG_HEAD' in the Description
- + git-reset.txt: mention 'ORIG_HEAD' in the Description
- + git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
-
- Document ORIG_HEAD a bit more.
-
- Will merge to 'master'.
- source: <pull.1456.v2.git.1673356521.gitgitgadget@gmail.com>
-
-
 * tc/cat-file-z-use-cquote (2023-01-16) 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).
+
+ Expecting a reroll.
+ cf. <2a2a46f0-a9bc-06a6-72e1-28800518777c@dunelm.org.uk>
  source: <20230116190749.4141516-1-toon@iotcl.com>
 
 
-* cb/grep-pcre-ucp (2023-01-09) 1 commit
- - grep: correctly identify utf-8 characters with \{b,w} in -P
+* cb/grep-pcre-ucp (2023-01-18) 1 commit
+  (merged to 'next' on 2023-01-19 at 2c7e531839)
+ + grep: correctly identify utf-8 characters with \{b,w} in -P
 
  "grep -P" learned to use Unicode Character Property to grok
  character classes when processing \b and \w etc.
 
- Still skeptical.
- cf. <230109.86v8lf297g.gmgdl@evledraar.gmail.com>
- source: <20230108155217.2817-1-carenas@gmail.com>
-
-
-* es/hooks-and-local-env (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at 93acd89393)
- + githooks: discuss Git operations in foreign repositories
-
- Doc update for environment variables set when hooks are invoked.
-
  Will merge to 'master'.
- source: <pull.1457.v2.git.1673293508399.gitgitgadget@gmail.com>
-
-
-* ph/parse-date-reduced-precision (2023-01-13) 1 commit
-  (merged to 'next' on 2023-01-14 at eb83564c3e)
- + date.c: allow ISO 8601 reduced precision times
-
- Loosen date parsing heuristics.
-
- Will merge to 'master'.
- source: <20230111001003.10916-1-congdanhqx@gmail.com>
+ cf. <xmqqzgaf2zpt.fsf@gitster.g>
+ source: <20230108155217.2817-1-carenas@gmail.com>
 
 
 * rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
@@ -616,21 +719,19 @@ Release tarballs are available at:
  source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
 
 
-* cw/submodule-status-in-parallel (2023-01-05) 6 commits
- . submodule: call parallel code from serial status
- . diff-lib: parallelize run_diff_files for submodules
- . diff-lib: refactor match_stat_with_submodule
- . submodule: move status parsing into function
- . submodule: strbuf variable rename
- . run-command: add duplicate_output_fn to run_processes_parallel_opts
+* cw/submodule-status-in-parallel (2023-01-17) 6 commits
+ - submodule: call parallel code from serial status
+ - diff-lib: parallelize run_diff_files for submodules
+ - diff-lib: refactor match_stat_with_submodule
+ - submodule: move status parsing into function
+ - submodule: strbuf variable rename
+ - run-command: add duplicate_output_fn to run_processes_parallel_opts
 
  "git submodule status" learned to run the comparison in submodule
  repositories in parallel.
 
  Needs review.
- Breaks "linux-leaks" CI job.
- cf. <xmqqv8l8f8j8.fsf@gitster.g>
- source: <https://lore.kernel.org/git/20221108184200.2813458-1-calvinwan@google.com/>
+ source: <20230104215415.1083526-1-calvinwan@google.com>
 
 
 * kn/attr-from-tree (2023-01-14) 2 commits
@@ -645,14 +746,14 @@ Release tarballs are available at:
  source: <cover.1673684790.git.karthik.188@gmail.com>
 
 
-* ab/various-leak-fixes (2023-01-14) 19 commits
+* ab/various-leak-fixes (2023-01-18) 19 commits
  - push: free_refs() the "local_refs" in set_refspecs()
  - receive-pack: free() the "ref_name" in "struct command"
  - grep API: plug memory leaks by freeing "header_list"
  - grep.c: refactor free_grep_patterns()
  - object-file.c: release the "tag" in check_tag()
  - builtin/merge.c: free "&buf" on "Your local changes..." error
- - builtin/merge.c: always free "struct strbuf msg"
+ - builtin/merge.c: use fixed strings, not "strbuf", fix leak
  - show-branch: free() allocated "head" before return
  - commit-graph: fix a parse_options_concat() leak
  - http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
@@ -668,32 +769,21 @@ Release tarballs are available at:
 
  Leak fixes.
 
- Will merge to 'next'?
- source: <cover-v3-00.19-00000000000-20230110T054138Z-avarab@gmail.com>
+ Needs review.
+ source: <cover-v5-00.19-00000000000-20230118T120334Z-avarab@gmail.com>
 
 
-* rj/branch-unborn-in-other-worktrees (2023-01-01) 2 commits
+* rj/branch-unborn-in-other-worktrees (2023-01-19) 3 commits
  - branch: rename orphan branches in any worktree
  - branch: description for orphan branch errors
+ - avoid unnecessary worktrees traversing
 
  Error messages given when working on an unborn branch that is
  checked out in another worktree have been improvved.
- source: <ffd675e9-8a64-ae05-fc3b-36ae99092735@gmail.com>
-
 
-* rs/dup-array (2023-01-09) 5 commits
-  (merged to 'next' on 2023-01-14 at 3efbd1ffe0)
- + use DUP_ARRAY
- + add DUP_ARRAY
- + do full type check in BARF_UNLESS_COPYABLE
- + factor out BARF_UNLESS_COPYABLE
- + mingw: make argv2 in try_shell_exec() non-const
-
- Code cleaning.
-
- Will merge to 'master'.
- source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
- source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
+ Expecting a reroll.
+ cf. <527f7315-be7b-7ec0-04fc-d07da7d4fefa@gmail.com>
+ source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com>
 
 
 * ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
@@ -724,26 +814,15 @@ Release tarballs are available at:
  source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
 
 
-* jx/t1301-updates (2022-11-30) 3 commits
-  (merged to 'next' on 2023-01-14 at d4f081b3f8)
- + t1301: do not change $CWD in "shared=all" test case
- + t1301: use test_when_finished for cleanup
- + t1301: fix wrong template dir for git-init
-
- Test updates.
-
- Will merge to 'master'.
- source: <20221128130323.8914-1-worldhello.net@gmail.com>
-
-
 * km/send-email-with-v-reroll-count (2022-11-27) 1 commit
- - send-email: relay '-v N' to format-patch
+  (merged to 'next' on 2023-01-19 at 9b3543471c)
+ + send-email: relay '-v N' to format-patch
 
  "git send-email -v 3" used to be expanded to "git send-email
  --validate 3" when the user meant to pass them down to
  "format-patch", which has been corrected.
 
- Will merge to 'next'?
+ Will merge to 'master'.
  source: <87edtp5uws.fsf@kyleam.com>
 
 
@@ -774,18 +853,41 @@ Release tarballs are available at:
  source: <20221221040446.2860985-1-christian.couder@gmail.com>
 
 
-* mc/credential-helper-auth-headers (2022-12-13) 8 commits
- - t5556: add HTTP authentication tests
+* mc/credential-helper-auth-headers (2023-01-20) 12 commits
+ - credential: add WWW-Authenticate header to cred requests
+ - http: read HTTP WWW-Authenticate response headers
+ - http: replace unsafe size_t multiplication with st_mult
+ - test-http-server: add sending of arbitrary headers
  - test-http-server: add simple authentication
  - test-http-server: pass Git requests to http-backend
  - test-http-server: add HTTP request parsing
  - test-http-server: add HTTP error response function
  - test-http-server: add stub HTTP server test helper
- - credential: add WWW-Authenticate header to cred requests
- - http: read HTTP WWW-Authenticate response headers
+ - daemon: rename some esoteric/laboured terminology
+ - daemon: libify child process handling functions
+ - daemon: libify socket setup and option functions
 
  Extending credential helper protocol.
 
- Waiting for review responses (or a reroll).
- cf. <1dc44716-2550-47de-e666-9972b102905d@github.com>
- source: <pull.1352.v4.git.1670880984.gitgitgadget@gmail.com>
+ Needs review.
+ source: <pull.1352.v7.git.1674252530.gitgitgadget@gmail.com>
+
+--------------------------------------------------
+[Discarded]
+
+* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
+  (merged to 'next' on 2023-01-14 at 5efb778ab0)
+ + ci: do not die on deprecated-declarations warning
+
+ CI build fix for overzealous -Werror.
+
+ Reverted out of 'next'
+ Preferring jk/curl-avoid-deprecated-api that fixes the code properly.
+ source: <xmqq7cxpkpjp.fsf@gitster.g>
+
+
+* po/pretty-hard-trunc (2022-11-13) 1 commit
+ . pretty-formats: add hard truncation, without ellipsis, options
+
+ Add a new pretty format which truncates without ellipsis.
+ source: <20221112143616.1429-1-philipoakley@iee.email>