What's cooking (2022/12 #03)

1 files changed, 194 insertions, 123 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 4373f9d074..e94abd649f 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 (Dec 2022, #02; Tue, 6)
-X-master-at: 2e71cbbddd64695d43383c25c7a054ac4ff86882
-X-next-at: 4a64d8e25efd5e2bc70b9be34e04379e2ce12632
+Subject: What's cooking in git.git (Dec 2022, #03; Sun, 11)
+X-master-at: 694cb1b2abfda78e60c8c74f1e761de6e852f0a2
+X-next-at: 36f55fa649de7ccf398915274a1eeba1a5d9a69e
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Dec 2022, #02; Tue, 6)
+What's cooking in git.git (Dec 2022, #03; Sun, 11)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -14,8 +14,12 @@ 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.
 
-Git 2.39-rc2 has been tagged.  Hopefully from here on it will be
-smooth sailing and we'd have a good solid Git 2.39 early next week?
+I wanted not to distract the developers with CI related changes
+during the pre-release freeze, but ended up merging them to 'master'
+and also to 'maint', as deprecation and upgrade at GitHub does not
+wait for us at all.  It would be better to give us the same stable
+CI environment across four integration branches.  With l10n updates,
+what is at the tip of 'master' today would become the 2.39 final.
 
 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
@@ -46,130 +50,82 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
-  (merged to 'next' on 2022-12-05 at 2f47548cad)
- + t4023: fix ignored exit codes of git
+* ab/ci-musl-bash-fix (2022-12-08) 1 commit
+  (merged to 'next' on 2022-12-08 at d8c01829b3)
+ + CI: don't explicitly pick "bash" shell outside of Windows, fix regression
 
- Test fix.
-
- Will cook in 'next'.
- source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>
+ CI fix.
+ source: <patch-v2-1.1-c34fd06623a-20221207T120220Z-avarab@gmail.com>
 
 
-* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
-  (merged to 'next' on 2022-12-05 at da8e250c87)
- + fsmonitor: fix race seen in t7527
+* ab/ci-retire-set-output (2022-12-08) 1 commit
+  (merged to 'next' on 2022-12-08 at 422475c2c6)
+ + CI: migrate away from deprecated "set-output" syntax
 
- Make fsmonitor more robust to avoid the flakiness seen in t7527.
+ CI fix.
+ source: <patch-v2-1.1-4e7db0db3be-20221207T014848Z-avarab@gmail.com>
 
- Will cook in 'next'.
- source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>
 
+* ab/ci-use-macos-12 (2022-12-07) 1 commit
+  (merged to 'next' on 2022-12-08 at cdf78cca21)
+ + CI: upgrade to macos-12, and pin OSX version
 
-* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
-  (merged to 'next' on 2022-12-05 at e2c11342b1)
- + list-objects-filter: plug pattern_list leak
+ CI fix.
+ source: <patch-1.1-4c1dcc89e7a-20221206T195552Z-avarab@gmail.com>
 
- Leak fix.
 
- Will cook in 'next'.
- source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>
+* js/ci-use-newer-up-down-artifact (2022-12-08) 1 commit
+  (merged to 'next' on 2022-12-08 at 27a4f05bc0)
+ + ci: avoid using deprecated {up,down}load-artifacts Action
 
+ CI fix.
+ source: <c9e99b4f96fc4e513c62b1b028e45559f6410c57.1670423680.git.gitgitgadget@gmail.com>
 
-* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
-  (merged to 'next' on 2022-12-05 at 9db30340b3)
- + t4205: don't exit test script on failure
 
- Test fix.
+* od/ci-use-checkout-v3-when-applicable (2022-12-06) 1 commit
+  (merged to 'next' on 2022-12-05 at f8e139f01a)
+ + ci(main): upgrade actions/checkout to v3
 
- Will cook in 'next'.
- source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>
+ Update GitHub CI to use actions/checkout@v3; use of the older
+ checkout@v2 gets annoying deprecation notices.
+ source: <pull.1354.v2.git.git.1670234474721.gitgitgadget@gmail.com>
 
+--------------------------------------------------
+[New Topics]
 
-* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
-  (merged to 'next' on 2022-12-05 at ff99a5672f)
- + t5314: check exit code of "git"
+* js/t0021-windows-pwd (2022-12-07) 1 commit
+  (merged to 'next' on 2022-12-08 at 63bc7701e8)
+ + t0021: use Windows-friendly `pwd`
 
  Test fix.
 
  Will cook in 'next'.
- source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>
+ source: <b38b8fb5a85e10d6189d68b6633adf23fca7b65d.1670339267.git.gitgitgadget@gmail.com>
 
 
-* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
-  (merged to 'next' on 2022-12-05 at 7105bccb5e)
- + t7600: don't ignore "rev-parse" exit code in helper
+* rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit
+  (merged to 'next' on 2022-12-08 at 421b255ad1)
+ + t3920: support CR-eating grep
+ (this branch uses js/t3920-shell-and-or-fix.)
 
  Test fix.
 
  Will cook in 'next'.
- source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
-
+ source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>
 
-* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
- - fsmonitor: eliminate call to deprecated FSEventStream function
 
- Stop using deprecated macOS API in fsmonitor.
-
- Will merge to 'next'.
- source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>
-
-
-* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
-  (merged to 'next' on 2022-12-05 at ea2b21208d)
- + t3920: don't ignore errors of more than one command with `|| true`
-
- Test fix.
-
- Will cook in 'next'.
- source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
+* es/t1509-root-fixes (2022-12-09) 3 commits
+ - t1509: facilitate repeated script invocations
+ - t1509: make "setup" test more robust
+ - t1509: fix failing "root work tree" test due to owner-check
 
-
-* sx/pthread-error-check-fix (2022-12-05) 1 commit
-  (merged to 'next' on 2022-12-05 at 53ef195404)
- + maintenance: compare output of pthread functions for inequality with 0
-
- Correct pthread API usage.
-
- Will cook in 'next'.
- source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>
+ source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
 
 --------------------------------------------------
 [Stalled]
 
-* ms/sendemail-validate-headers (2022-11-11) 1 commit
- . Expose header information to git-send-email's sendemail-validate hook
-
- Expecting a reroll.
- Appears to break t9001 completely?
- source: <20221111194223.644845-2-michael.strawbridge@amd.com>
-
-
-* hl/archive-recursive (2022-10-19) 10 commits
- . fixup! archive: add tests for git archive --recurse-submodules
- . archive: add tests for git archive --recurse-submodules
- . archive: add --recurse-submodules to git-archive command
- . archive: remove global repository from archive_args
- . archive: pass repo objects to write_archive handlers
- . tree: add repository parameter to read_tree_fn_t
- . tree: handle submodule case for read_tree_at properly
- . tree: increase test coverage for tree.c
- . tree: update cases to use repo_ tree methods
- . tree: do not use the_repository for tree traversal methods.
-
- "git archive" has been taught "--recurse-submodules" option to
- create a tarball that includes contents from submodules.
-
- Expecting a reroll.
- Seems to break win+VS test(8).
- cf. https://github.com/git/git/actions/runs/3293333066 whose only
- difference from https://github.com/git/git/actions/runs/3293553109
- is the inclusion of this topic.
- source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
-
-
 * pw/test-todo (2022-10-06) 3 commits
  . test_todo: allow [verbose] test as the command
  . test_todo: allow [!] grep as the command
@@ -290,12 +246,95 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
-* od/ci-use-checkout-v3-when-applicable (2022-12-06) 1 commit
- - ci(main): upgrade actions/checkout to v3
+* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
+  (merged to 'next' on 2022-12-05 at 2f47548cad)
+ + t4023: fix ignored exit codes of git
 
- Update GitHub CI to use actions/checkout@v3; use of the older
- checkout@v2 gets annoying deprecation notices.
- source: <pull.1354.v2.git.git.1670234474721.gitgitgadget@gmail.com>
+ Test fix.
+
+ Will cook in 'next'.
+ source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>
+
+
+* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
+  (merged to 'next' on 2022-12-05 at da8e250c87)
+ + fsmonitor: fix race seen in t7527
+
+ Make fsmonitor more robust to avoid the flakiness seen in t7527.
+
+ Will cook in 'next'.
+ source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>
+
+
+* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
+  (merged to 'next' on 2022-12-05 at e2c11342b1)
+ + list-objects-filter: plug pattern_list leak
+
+ Leak fix.
+
+ Will cook in 'next'.
+ source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>
+
+
+* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
+  (merged to 'next' on 2022-12-05 at 9db30340b3)
+ + t4205: don't exit test script on failure
+
+ Test fix.
+
+ Will cook in 'next'.
+ source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>
+
+
+* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
+  (merged to 'next' on 2022-12-05 at ff99a5672f)
+ + t5314: check exit code of "git"
+
+ Test fix.
+
+ Will cook in 'next'.
+ source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>
+
+
+* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
+  (merged to 'next' on 2022-12-05 at 7105bccb5e)
+ + t7600: don't ignore "rev-parse" exit code in helper
+
+ Test fix.
+
+ Will cook in 'next'.
+ source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
+
+
+* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
+  (merged to 'next' on 2022-12-05 at 335bcafa02)
+ + fsmonitor: eliminate call to deprecated FSEventStream function
+
+ Stop using deprecated macOS API in fsmonitor.
+
+ Will cook in 'next'.
+ source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>
+
+
+* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
+  (merged to 'next' on 2022-12-05 at ea2b21208d)
+ + t3920: don't ignore errors of more than one command with `|| true`
+ (this branch is used by rs/t3920-crlf-eating-grep-fix.)
+
+ Test fix.
+
+ Will cook in 'next'.
+ source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
+
+
+* sx/pthread-error-check-fix (2022-12-05) 1 commit
+  (merged to 'next' on 2022-12-05 at 53ef195404)
+ + maintenance: compare output of pthread functions for inequality with 0
+
+ Correct pthread API usage.
+
+ Will cook in 'next'.
+ source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>
 
 
 * jk/avoid-redef-system-functions (2022-12-05) 3 commits
@@ -327,20 +366,19 @@ Release tarballs are available at:
  source: <Y4fH4rhcSztHwKvK@coredump.intra.peff.net>
 
 
-* jt/avoid-lazy-fetch-commits (2022-12-02) 4 commits
+* jt/avoid-lazy-fetch-commits (2022-12-10) 4 commits
  - commit: don't lazy-fetch commits
- - object-file: refactor replace object lookup
- - object-file: refactor corrupt object diagnosis
- - object-file: reread object with exact same args
+ - object-file: emit corruption errors when detected
+ - object-file: refactor map_loose_object_1()
+ - object-file: remove OBJECT_INFO_IGNORE_LOOSE
 
  Even in a repository with promissor remote, it is useless to
  attempt to lazily attempt fetching an object that is expected to be
  commit, because no "filter" mode omits commit objects.  Take
  advantage of this assumption to fail fast on errors.
 
- Seems to break CI (win test (7)).
- cf. https://github.com/git/git/actions/runs/3591107183/jobs/6045374690
- source: <cover.1669922792.git.jonathantanmy@google.com>
+ Will merge to 'next'?
+ source: <cover.1670622176.git.jonathantanmy@google.com>
 
 
 * rs/diff-parseopts (2022-12-02) 3 commits
@@ -472,11 +510,12 @@ Release tarballs are available at:
 
 
 * rj/branch-copy-and-rename (2022-11-17) 1 commit
- - branch: force-copy a branch to itself via @{-1} is a no-op
+  (merged to 'next' on 2022-12-05 at 730340640b)
+ + branch: force-copy a branch to itself via @{-1} is a no-op
 
  Fix a pair of bugs in 'git branch'.
 
- Will merge to 'next'.
+ Will cook in 'next'.
  source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
 
 
@@ -686,21 +725,22 @@ Release tarballs are available at:
 
 
 * ds/bundle-uri-4 (2022-12-06) 11 commits
- - clone: unbundle the advertised bundles
- - bundle-uri: download bundles from an advertised list
- - bundle-uri: allow relative URLs in bundle lists
- - strbuf: introduce strbuf_strip_file_from_path()
- - bundle-uri: serve bundle.* keys from config
- - bundle-uri client: add helper for testing server
- - transport: rename got_remote_heads
- - bundle-uri client: add boolean transfer.bundleURI setting
- - clone: request the 'bundle-uri' command when available
- - t: create test harness for 'bundle-uri' command
- - protocol v2: add server-side "bundle-uri" skeleton
+  (merged to 'next' on 2022-12-05 at 2fa7bc1763)
+ + clone: unbundle the advertised bundles
+ + bundle-uri: download bundles from an advertised list
+ + bundle-uri: allow relative URLs in bundle lists
+ + strbuf: introduce strbuf_strip_file_from_path()
+ + bundle-uri: serve bundle.* keys from config
+ + bundle-uri client: add helper for testing server
+ + transport: rename got_remote_heads
+ + bundle-uri client: add boolean transfer.bundleURI setting
+ + clone: request the 'bundle-uri' command when available
+ + t: create test harness for 'bundle-uri' command
+ + protocol v2: add server-side "bundle-uri" skeleton
 
  Bundle URIs part 4.
 
- Will merge to 'next'.
+ Will cook in 'next'.
  source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>
 
 
@@ -877,3 +917,34 @@ Release tarballs are available at:
  Revert out of 'next'.
  cf. <xmqq5yeuspam.fsf@gitster.g>
  source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>
+
+
+* ms/sendemail-validate-headers (2022-11-11) 1 commit
+ . Expose header information to git-send-email's sendemail-validate hook
+
+ Expecting a reroll.
+ Appears to break t9001 completely?
+ source: <20221111194223.644845-2-michael.strawbridge@amd.com>
+
+
+* hl/archive-recursive (2022-10-19) 10 commits
+ . fixup! archive: add tests for git archive --recurse-submodules
+ . archive: add tests for git archive --recurse-submodules
+ . archive: add --recurse-submodules to git-archive command
+ . archive: remove global repository from archive_args
+ . archive: pass repo objects to write_archive handlers
+ . tree: add repository parameter to read_tree_fn_t
+ . tree: handle submodule case for read_tree_at properly
+ . tree: increase test coverage for tree.c
+ . tree: update cases to use repo_ tree methods
+ . tree: do not use the_repository for tree traversal methods.
+
+ "git archive" has been taught "--recurse-submodules" option to
+ create a tarball that includes contents from submodules.
+
+ Expecting a reroll.
+ Seems to break win+VS test(8).
+ cf. https://github.com/git/git/actions/runs/3293333066 whose only
+ difference from https://github.com/git/git/actions/runs/3293553109
+ is the inclusion of this topic.
+ source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>