What's cooking (2022/12 #03)
Junio C Hamano committed
Dec 11, 2022 at 10:07 UTC
6ab7651d8669c2705114030c3a97b1f6139a60b0
1 file changed
+194
-123
whats-cooking.txt
+194
-123
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2022, #02; Tue, 6)
3
-X-master-at: 2e71cbbddd64695d43383c25c7a054ac4ff86882
4
-X-next-at: 4a64d8e25efd5e2bc70b9be34e04379e2ce12632
2
+Subject: What's cooking in git.git (Dec 2022, #03; Sun, 11)
3
+X-master-at: 694cb1b2abfda78e60c8c74f1e761de6e852f0a2
4
+X-next-at: 36f55fa649de7ccf398915274a1eeba1a5d9a69e
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2022, #02; Tue, 6)
7
+What's cooking in git.git (Dec 2022, #03; Sun, 11)
8
--------------------------------------------------
9
10
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
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
17
-Git 2.39-rc2 has been tagged. Hopefully from here on it will be
18
-smooth sailing and we'd have a good solid Git 2.39 early next week?
17
+I wanted not to distract the developers with CI related changes
18
+during the pre-release freeze, but ended up merging them to 'master'
19
+and also to 'maint', as deprecation and upgrade at GitHub does not
20
+wait for us at all. It would be better to give us the same stable
21
+CI environment across four integration branches. With l10n updates,
22
+what is at the tip of 'master' today would become the 2.39 final.
23
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
@@ -46,130 +50,82 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
49
-[New Topics]
53
+[Graduated to 'master']
54
51
-* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
52
- (merged to 'next' on 2022-12-05 at 2f47548cad)
53
- + t4023: fix ignored exit codes of git
55
+* ab/ci-musl-bash-fix (2022-12-08) 1 commit
56
+ (merged to 'next' on 2022-12-08 at d8c01829b3)
57
+ + CI: don't explicitly pick "bash" shell outside of Windows, fix regression
58
55
- Test fix.
56
-
57
- Will cook in 'next'.
58
- source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>
59
+ CI fix.
60
+ source: <patch-v2-1.1-c34fd06623a-20221207T120220Z-avarab@gmail.com>
61
62
61
-* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
62
- (merged to 'next' on 2022-12-05 at da8e250c87)
63
- + fsmonitor: fix race seen in t7527
63
+* ab/ci-retire-set-output (2022-12-08) 1 commit
64
+ (merged to 'next' on 2022-12-08 at 422475c2c6)
65
+ + CI: migrate away from deprecated "set-output" syntax
66
65
- Make fsmonitor more robust to avoid the flakiness seen in t7527.
67
+ CI fix.
68
+ source: <patch-v2-1.1-4e7db0db3be-20221207T014848Z-avarab@gmail.com>
69
67
- Will cook in 'next'.
68
- source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>
70
71
+* ab/ci-use-macos-12 (2022-12-07) 1 commit
72
+ (merged to 'next' on 2022-12-08 at cdf78cca21)
73
+ + CI: upgrade to macos-12, and pin OSX version
74
71
-* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
72
- (merged to 'next' on 2022-12-05 at e2c11342b1)
73
- + list-objects-filter: plug pattern_list leak
75
+ CI fix.
76
+ source: <patch-1.1-4c1dcc89e7a-20221206T195552Z-avarab@gmail.com>
77
75
- Leak fix.
78
77
- Will cook in 'next'.
78
- source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>
79
+* js/ci-use-newer-up-down-artifact (2022-12-08) 1 commit
80
+ (merged to 'next' on 2022-12-08 at 27a4f05bc0)
81
+ + ci: avoid using deprecated {up,down}load-artifacts Action
82
83
+ CI fix.
84
+ source: <c9e99b4f96fc4e513c62b1b028e45559f6410c57.1670423680.git.gitgitgadget@gmail.com>
85
81
-* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
82
- (merged to 'next' on 2022-12-05 at 9db30340b3)
83
- + t4205: don't exit test script on failure
86
85
- Test fix.
87
+* od/ci-use-checkout-v3-when-applicable (2022-12-06) 1 commit
88
+ (merged to 'next' on 2022-12-05 at f8e139f01a)
89
+ + ci(main): upgrade actions/checkout to v3
90
87
- Will cook in 'next'.
88
- source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>
91
+ Update GitHub CI to use actions/checkout@v3; use of the older
92
+ checkout@v2 gets annoying deprecation notices.
93
+ source: <pull.1354.v2.git.git.1670234474721.gitgitgadget@gmail.com>
94
95
+--------------------------------------------------
96
+[New Topics]
97
91
-* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
92
- (merged to 'next' on 2022-12-05 at ff99a5672f)
93
- + t5314: check exit code of "git"
98
+* js/t0021-windows-pwd (2022-12-07) 1 commit
99
+ (merged to 'next' on 2022-12-08 at 63bc7701e8)
100
+ + t0021: use Windows-friendly `pwd`
101
102
Test fix.
103
104
Will cook in 'next'.
98
- source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>
105
+ source: <b38b8fb5a85e10d6189d68b6633adf23fca7b65d.1670339267.git.gitgitgadget@gmail.com>
106
107
101
-* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
102
- (merged to 'next' on 2022-12-05 at 7105bccb5e)
103
- + t7600: don't ignore "rev-parse" exit code in helper
108
+* rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit
109
+ (merged to 'next' on 2022-12-08 at 421b255ad1)
110
+ + t3920: support CR-eating grep
111
+ (this branch uses js/t3920-shell-and-or-fix.)
112
113
Test fix.
114
115
Will cook in 'next'.
108
- source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
109
-
116
+ source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>
117
111
-* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
112
- - fsmonitor: eliminate call to deprecated FSEventStream function
118
114
- Stop using deprecated macOS API in fsmonitor.
115
-
116
- Will merge to 'next'.
117
- source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>
118
-
119
-
120
-* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
121
- (merged to 'next' on 2022-12-05 at ea2b21208d)
122
- + t3920: don't ignore errors of more than one command with `|| true`
123
-
124
- Test fix.
125
-
126
- Will cook in 'next'.
127
- source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
119
+* es/t1509-root-fixes (2022-12-09) 3 commits
120
+ - t1509: facilitate repeated script invocations
121
+ - t1509: make "setup" test more robust
122
+ - t1509: fix failing "root work tree" test due to owner-check
123
129
-
130
-* sx/pthread-error-check-fix (2022-12-05) 1 commit
131
- (merged to 'next' on 2022-12-05 at 53ef195404)
132
- + maintenance: compare output of pthread functions for inequality with 0
133
-
134
- Correct pthread API usage.
135
-
136
- Will cook in 'next'.
137
- source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>
124
+ source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
125
126
--------------------------------------------------
127
[Stalled]
128
142
-* ms/sendemail-validate-headers (2022-11-11) 1 commit
143
- . Expose header information to git-send-email's sendemail-validate hook
144
-
145
- Expecting a reroll.
146
- Appears to break t9001 completely?
147
- source: <20221111194223.644845-2-michael.strawbridge@amd.com>
148
-
149
-
150
-* hl/archive-recursive (2022-10-19) 10 commits
151
- . fixup! archive: add tests for git archive --recurse-submodules
152
- . archive: add tests for git archive --recurse-submodules
153
- . archive: add --recurse-submodules to git-archive command
154
- . archive: remove global repository from archive_args
155
- . archive: pass repo objects to write_archive handlers
156
- . tree: add repository parameter to read_tree_fn_t
157
- . tree: handle submodule case for read_tree_at properly
158
- . tree: increase test coverage for tree.c
159
- . tree: update cases to use repo_ tree methods
160
- . tree: do not use the_repository for tree traversal methods.
161
-
162
- "git archive" has been taught "--recurse-submodules" option to
163
- create a tarball that includes contents from submodules.
164
-
165
- Expecting a reroll.
166
- Seems to break win+VS test(8).
167
- cf. https://github.com/git/git/actions/runs/3293333066 whose only
168
- difference from https://github.com/git/git/actions/runs/3293553109
169
- is the inclusion of this topic.
170
- source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
171
-
172
-
129
* pw/test-todo (2022-10-06) 3 commits
130
. test_todo: allow [verbose] test as the command
131
. test_todo: allow [!] grep as the command
@@ -290,12 +246,95 @@ Release tarballs are available at:
246
--------------------------------------------------
247
[Cooking]
248
293
-* od/ci-use-checkout-v3-when-applicable (2022-12-06) 1 commit
294
- - ci(main): upgrade actions/checkout to v3
249
+* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
250
+ (merged to 'next' on 2022-12-05 at 2f47548cad)
251
+ + t4023: fix ignored exit codes of git
252
296
- Update GitHub CI to use actions/checkout@v3; use of the older
297
- checkout@v2 gets annoying deprecation notices.
298
- source: <pull.1354.v2.git.git.1670234474721.gitgitgadget@gmail.com>
253
+ Test fix.
254
+
255
+ Will cook in 'next'.
256
+ source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>
257
+
258
+
259
+* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
260
+ (merged to 'next' on 2022-12-05 at da8e250c87)
261
+ + fsmonitor: fix race seen in t7527
262
+
263
+ Make fsmonitor more robust to avoid the flakiness seen in t7527.
264
+
265
+ Will cook in 'next'.
266
+ source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>
267
+
268
+
269
+* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
270
+ (merged to 'next' on 2022-12-05 at e2c11342b1)
271
+ + list-objects-filter: plug pattern_list leak
272
+
273
+ Leak fix.
274
+
275
+ Will cook in 'next'.
276
+ source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>
277
+
278
+
279
+* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
280
+ (merged to 'next' on 2022-12-05 at 9db30340b3)
281
+ + t4205: don't exit test script on failure
282
+
283
+ Test fix.
284
+
285
+ Will cook in 'next'.
286
+ source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>
287
+
288
+
289
+* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
290
+ (merged to 'next' on 2022-12-05 at ff99a5672f)
291
+ + t5314: check exit code of "git"
292
+
293
+ Test fix.
294
+
295
+ Will cook in 'next'.
296
+ source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>
297
+
298
+
299
+* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
300
+ (merged to 'next' on 2022-12-05 at 7105bccb5e)
301
+ + t7600: don't ignore "rev-parse" exit code in helper
302
+
303
+ Test fix.
304
+
305
+ Will cook in 'next'.
306
+ source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
307
+
308
+
309
+* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
310
+ (merged to 'next' on 2022-12-05 at 335bcafa02)
311
+ + fsmonitor: eliminate call to deprecated FSEventStream function
312
+
313
+ Stop using deprecated macOS API in fsmonitor.
314
+
315
+ Will cook in 'next'.
316
+ source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>
317
+
318
+
319
+* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
320
+ (merged to 'next' on 2022-12-05 at ea2b21208d)
321
+ + t3920: don't ignore errors of more than one command with `|| true`
322
+ (this branch is used by rs/t3920-crlf-eating-grep-fix.)
323
+
324
+ Test fix.
325
+
326
+ Will cook in 'next'.
327
+ source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
328
+
329
+
330
+* sx/pthread-error-check-fix (2022-12-05) 1 commit
331
+ (merged to 'next' on 2022-12-05 at 53ef195404)
332
+ + maintenance: compare output of pthread functions for inequality with 0
333
+
334
+ Correct pthread API usage.
335
+
336
+ Will cook in 'next'.
337
+ source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>
338
339
340
* jk/avoid-redef-system-functions (2022-12-05) 3 commits
@@ -327,20 +366,19 @@ Release tarballs are available at:
366
source: <Y4fH4rhcSztHwKvK@coredump.intra.peff.net>
367
368
330
-* jt/avoid-lazy-fetch-commits (2022-12-02) 4 commits
369
+* jt/avoid-lazy-fetch-commits (2022-12-10) 4 commits
370
- commit: don't lazy-fetch commits
332
- - object-file: refactor replace object lookup
333
- - object-file: refactor corrupt object diagnosis
334
- - object-file: reread object with exact same args
371
+ - object-file: emit corruption errors when detected
372
+ - object-file: refactor map_loose_object_1()
373
+ - object-file: remove OBJECT_INFO_IGNORE_LOOSE
374
375
Even in a repository with promissor remote, it is useless to
376
attempt to lazily attempt fetching an object that is expected to be
377
commit, because no "filter" mode omits commit objects. Take
378
advantage of this assumption to fail fast on errors.
379
341
- Seems to break CI (win test (7)).
342
- cf. https://github.com/git/git/actions/runs/3591107183/jobs/6045374690
343
- source: <cover.1669922792.git.jonathantanmy@google.com>
380
+ Will merge to 'next'?
381
+ source: <cover.1670622176.git.jonathantanmy@google.com>
382
383
384
* rs/diff-parseopts (2022-12-02) 3 commits
@@ -472,11 +510,12 @@ Release tarballs are available at:
510
511
512
* rj/branch-copy-and-rename (2022-11-17) 1 commit
475
- - branch: force-copy a branch to itself via @{-1} is a no-op
513
+ (merged to 'next' on 2022-12-05 at 730340640b)
514
+ + branch: force-copy a branch to itself via @{-1} is a no-op
515
516
Fix a pair of bugs in 'git branch'.
517
479
- Will merge to 'next'.
518
+ Will cook in 'next'.
519
source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
520
521
@@ -686,21 +725,22 @@ Release tarballs are available at:
725
726
727
* ds/bundle-uri-4 (2022-12-06) 11 commits
689
- - clone: unbundle the advertised bundles
690
- - bundle-uri: download bundles from an advertised list
691
- - bundle-uri: allow relative URLs in bundle lists
692
- - strbuf: introduce strbuf_strip_file_from_path()
693
- - bundle-uri: serve bundle.* keys from config
694
- - bundle-uri client: add helper for testing server
695
- - transport: rename got_remote_heads
696
- - bundle-uri client: add boolean transfer.bundleURI setting
697
- - clone: request the 'bundle-uri' command when available
698
- - t: create test harness for 'bundle-uri' command
699
- - protocol v2: add server-side "bundle-uri" skeleton
728
+ (merged to 'next' on 2022-12-05 at 2fa7bc1763)
729
+ + clone: unbundle the advertised bundles
730
+ + bundle-uri: download bundles from an advertised list
731
+ + bundle-uri: allow relative URLs in bundle lists
732
+ + strbuf: introduce strbuf_strip_file_from_path()
733
+ + bundle-uri: serve bundle.* keys from config
734
+ + bundle-uri client: add helper for testing server
735
+ + transport: rename got_remote_heads
736
+ + bundle-uri client: add boolean transfer.bundleURI setting
737
+ + clone: request the 'bundle-uri' command when available
738
+ + t: create test harness for 'bundle-uri' command
739
+ + protocol v2: add server-side "bundle-uri" skeleton
740
741
Bundle URIs part 4.
742
703
- Will merge to 'next'.
743
+ Will cook in 'next'.
744
source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>
745
746
@@ -877,3 +917,34 @@ Release tarballs are available at:
917
Revert out of 'next'.
918
cf. <xmqq5yeuspam.fsf@gitster.g>
919
source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>
920
+
921
+
922
+* ms/sendemail-validate-headers (2022-11-11) 1 commit
923
+ . Expose header information to git-send-email's sendemail-validate hook
924
+
925
+ Expecting a reroll.
926
+ Appears to break t9001 completely?
927
+ source: <20221111194223.644845-2-michael.strawbridge@amd.com>
928
+
929
+
930
+* hl/archive-recursive (2022-10-19) 10 commits
931
+ . fixup! archive: add tests for git archive --recurse-submodules
932
+ . archive: add tests for git archive --recurse-submodules
933
+ . archive: add --recurse-submodules to git-archive command
934
+ . archive: remove global repository from archive_args
935
+ . archive: pass repo objects to write_archive handlers
936
+ . tree: add repository parameter to read_tree_fn_t
937
+ . tree: handle submodule case for read_tree_at properly
938
+ . tree: increase test coverage for tree.c
939
+ . tree: update cases to use repo_ tree methods
940
+ . tree: do not use the_repository for tree traversal methods.
941
+
942
+ "git archive" has been taught "--recurse-submodules" option to
943
+ create a tarball that includes contents from submodules.
944
+
945
+ Expecting a reroll.
946
+ Seems to break win+VS test(8).
947
+ cf. https://github.com/git/git/actions/runs/3293333066 whose only
948
+ difference from https://github.com/git/git/actions/runs/3293553109
949
+ is the inclusion of this topic.
950
+ source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>