What's cooking (2021/03 #03)
Junio C Hamano committed
Mar 10, 2021 at 18:35 UTC
e877797b602bc4f7428d59ff00c738c4e54d2edf
1 file changed
+193
-164
whats-cooking.txt
+193
-164
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2021, #02; Mon, 8)
4
-X-master-at: be7935ed8bff19f481b033d0d242c5d5f239ed50
5
-X-next-at: 510d4cfa5f76b646b8e82232cbaed56bd0170dae
3
+Subject: What's cooking in git.git (Mar 2021, #03; Wed, 10)
4
+X-master-at: 13d7ab6b5d7929825b626f050b62a11241ea4945
5
+X-next-at: 7f7177462022378fff6bd671b691b9f3771eb75b
6
7
-What's cooking in git.git (Mar 2021, #02; Mon, 8)
7
+What's cooking in git.git (Mar 2021, #03; Wed, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,7 +12,8 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
12
with '+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The second release candidate Git v2.31.0-rc2 will be tagged tomorrow.
15
+The second release candidate Git v2.31.0-rc2, together with
16
+maintenance releases for CVE-2021-21300, have been released.
17
18
Copies of the source code to Git live in many repositories, and the
19
following is a list of the ones I push into or their mirrors. Some
@@ -42,120 +43,48 @@ Release tarballs are available at:
43
44
https://www.kernel.org/pub/software/scm/git/
45
45
---------------------------------------------------
46
-[Graduated to 'master']
47
-
48
-* jk/open-returns-eintr (2021-03-01) 2 commits
49
- (merged to 'next' on 2021-03-02 at 7f0218e627)
50
- + config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
51
- + Makefile: add OPEN_RETURNS_EINTR knob
52
-
53
- Work around platforms whose open() is reported to return EINTR (it
54
- shouldn't, as we do our signals with SA_RESTART).
55
-
46
--------------------------------------------------
47
[New Topics]
48
59
-* ab/make-cocci-dedup (2021-03-05) 4 commits
60
- - Makefile/coccicheck: set SPATCH_BATCH_SIZE to 8
61
- - Makefile/coccicheck: allow for setting xargs concurrency
62
- - Makefile/coccicheck: speed up and fix bug with duplicate hunks
63
- - Makefile/coccicheck: add comment heading for all SPATCH flags
64
-
65
- An attempt to speed up the coccicheck target with incorrect
66
- results.
67
-
68
- A reroll exists to address correctness issue, but not picked up.
69
-
70
-
71
-* ab/read-tree (2021-03-08) 6 commits
72
- - tree.h API: remove "stage" parameter from read_tree_recursive()
73
- - tree.h API: remove support for starting at prefix != ""
74
- - ls-files: refactor away read_tree()
75
- - ls-files: don't needlessly pass around stage variable
76
- - tree.c API: move read_tree() into builtin/ls-files.c
77
- - ls-files tests: add meaningful --with-tree tests
78
-
79
- Code simplification by removing support for a caller that is long gone.
80
-
81
- Looked good.
82
-
83
-
84
-* ab/unexpected-object-type (2021-03-08) 7 commits
85
- - tag: don't misreport type of tagged objects in errors
86
- - object tests: add test for unexpected objects in tags
87
- - object.c: add a utility function for "expected type X, got Y"
88
- - tree.c: fix misindentation in parse_tree_gently()
89
- - oid_object_info(): return "enum object_type"
90
- - object.c: make type_from_string() return "enum object_type"
91
- - object.c: refactor type_from_string_gently()
92
-
93
- Error reporting upon object type mismatch has been improved
94
-
95
- Looked good.
96
-
97
-
98
-* ah/make-fuzz-all-doc-update (2021-03-04) 1 commit
99
- - Makefile: update 'make fuzz-all' docs to reflect modern clang
100
-
101
- Update insn in Makefile comments to run fuzz-all target.
102
-
103
- Needs review.
104
- cf. <pull.889.v3.git.1615223682911.gitgitgadget@gmail.com>
105
- cf. <defff7a3-2104-4fa1-7750-0b13ca5cdf59@ahunt.org>
106
-
49
+* ab/tests-cleanup-around-sha1 (2021-03-10) 4 commits
50
+ - tests: get rid of $_x05 from the test suite
51
+ - shortlog tests: rewrite to get rid of --abbrev=35 hardcoding
52
+ - test-lib: remove unused $_x40 and $_z40 variables
53
+ - git-bisect: remove unused SHA-1 $x40 shell variable
54
108
-* ah/plugleaks (2021-03-08) 7 commits
109
- - parse-options: don't leak alias help messages
110
- - init-db: silence template_dir leak when converting to absolute path
111
- - init: remove git_init_db_config() while fixing leaks
112
- - worktree: fix leak in dwim_branch()
113
- - clone: free or UNLEAK further pointers when finished
114
- - reset: free instead of leaking unneeded ref
115
- - symbolic-ref: don't leak shortened refname in check_symref()
116
-
117
- Plug or annotate remaining leaks that trigger while running the
118
- very basic set of tests.
119
-
120
-
121
-* bc/clone-bare-with-conflicting-config (2021-03-08) 1 commit
122
- - builtin/init-db: handle bare clones when core.bare set to false
123
-
124
- "git -c core.bare=false clone --bare ..." would have segfaulted,
125
- which has been corrected.
55
+ Remove variables that hold regexp and glob that match fixed number
56
+ of hexadecimal digits from the test suite.
57
127
- Will merge to 'next'.
58
+ Expecting a reroll.
59
+ At least the last one weakens a test; there may be similar breakage
60
+ due to not understanding what they are trying to test.
61
62
130
-* dl/cat-file-doc-cleanup (2021-03-03) 2 commits
131
- - git-cat-file.txt: remove references to "sha1"
132
- - git-cat-file.txt: monospace args, placeholders and filenames
63
+* jk/filter-branch-sha256 (2021-03-10) 3 commits
64
+ - filter-branch: drop $_x40 glob
65
+ - filter-branch: drop multiple-ancestor warning
66
+ - t7003: test ref rewriting explicitly
67
134
- Doc cleanup.
68
+ Code clean-up.
69
70
Will merge to 'next'.
71
+ In the longer term, we might want to remove filter-branch and nudge
72
+ folks to more modern tools.
73
74
139
-* jh/simple-ipc-cleanups (2021-03-04) 9 commits
140
- - SQUASH???
141
- - simple-ipc: update design documentation with more details
142
- - test-simple-ipc: add --token=<token> string option
143
- - test-simple-ipc: refactor command line option processing in helper
144
- - unix-stream-server: add st_dev and st_mode to socket stolen checks
145
- - simple-ipc: move error handling up a level
146
- - unix-stream-server: create unix-stream-server.c
147
- - unix-socket: simplify initialization of unix_stream_listen_opts
148
- - pkt-line: remove buffer arg from write_packetized_from_fd_no_flush()
149
- (this branch uses jh/simple-ipc.)
150
-
75
+* jn/mergetool-hideresolved-is-optional (2021-03-10) 1 commit
76
+ - mergetool: do not enable hideResolved by default
77
152
-* jr/doc-ignore-typofix (2021-03-03) 1 commit
153
- - doc: .gitignore documentation typofix
78
+ Disable the recent mergetool's hideresolved feature by default for
79
+ backward compatibility and safety.
80
155
- Doc cleanup.
81
+ Expecting a reroll.
82
+ We may want to give a more meaning log message to explain why it is
83
+ undesirable to turn it on by default.
84
157
- Will merge to 'next'.
85
86
+--------------------------------------------------
87
+[Graduated to 'master']
88
89
* jt/transfer-fsck-across-packs-fix (2021-03-05) 1 commit
90
(merged to 'next' on 2021-03-07 at c79f295216)
@@ -164,48 +93,7 @@ Release tarballs are available at:
93
The code to fsck objects received across multiple packs during a
94
single git fetch session has been broken when the packfile URI
95
feature was in use. A workaround has been added by disabling the
167
- codepath to avoid keeping a packfile that is too small.
168
-
169
- Will merge to 'master'.
170
-
171
-
172
-* rr/mailmap-entry-self (2021-03-08) 1 commit
173
- - Add entry for Ramkumar Ramachandra
174
-
175
- Will merge to 'next'.
176
-
177
-
178
-* rs/xcalloc-takes-nelem-first (2021-03-08) 1 commit
179
- - fix xcalloc() argument order
180
-
181
- Code cleanup.
182
-
183
- Will merge to 'next'.
184
-
185
-
186
-* sv/t9801-test-path-is-file-cleanup (2021-03-03) 1 commit
187
- - t9801: replace test -f with test_path_is_file
188
-
189
- Test cleanup.
190
-
191
- Will merge to 'next'.
192
-
193
-
194
-* tb/git-mv-icase-fix (2021-03-03) 1 commit
195
- - git mv foo FOO ; git mv foo bar gave an assert
196
-
197
- Fix a corner case bug in "git mv" on case insensitive systems,
198
- which was introduced in 2.29 timeframe.
199
-
200
- Will merge to 'next'.
201
-
202
-
203
-* tb/push-simple-uses-branch-merge-config (2021-03-08) 1 commit
204
- - Documentation/git-push.txt: correct configuration typo
205
-
206
- Doc update.
207
-
208
- cf. <YEaM7ruZCvaQQbPI@nand.local>
96
+ codepath that avoids keeping a packfile that is too small.
97
98
--------------------------------------------------
99
[Stalled]
@@ -348,6 +236,133 @@ Release tarballs are available at:
236
--------------------------------------------------
237
[Cooking]
238
239
+* ab/make-cocci-dedup (2021-03-05) 4 commits
240
+ - Makefile/coccicheck: set SPATCH_BATCH_SIZE to 8
241
+ - Makefile/coccicheck: allow for setting xargs concurrency
242
+ - Makefile/coccicheck: speed up and fix bug with duplicate hunks
243
+ - Makefile/coccicheck: add comment heading for all SPATCH flags
244
+
245
+ An attempt to speed up the coccicheck target with incorrect
246
+ results.
247
+
248
+ A reroll exists to address correctness issue, but not picked up.
249
+
250
+
251
+* ab/read-tree (2021-03-08) 6 commits
252
+ - tree.h API: remove "stage" parameter from read_tree_recursive()
253
+ - tree.h API: remove support for starting at prefix != ""
254
+ - ls-files: refactor away read_tree()
255
+ - ls-files: don't needlessly pass around stage variable
256
+ - tree.c API: move read_tree() into builtin/ls-files.c
257
+ - ls-files tests: add meaningful --with-tree tests
258
+
259
+ Code simplification by removing support for a caller that is long gone.
260
+
261
+ Looked good.
262
+
263
+
264
+* ab/unexpected-object-type (2021-03-08) 7 commits
265
+ - tag: don't misreport type of tagged objects in errors
266
+ - object tests: add test for unexpected objects in tags
267
+ - object.c: add a utility function for "expected type X, got Y"
268
+ - tree.c: fix misindentation in parse_tree_gently()
269
+ - oid_object_info(): return "enum object_type"
270
+ - object.c: make type_from_string() return "enum object_type"
271
+ - object.c: refactor type_from_string_gently()
272
+
273
+ Error reporting upon object type mismatch has been improved
274
+
275
+ Looked good.
276
+
277
+
278
+* ah/make-fuzz-all-doc-update (2021-03-08) 1 commit
279
+ - Makefile: update 'make fuzz-all' docs to reflect modern clang
280
+
281
+ Update insn in Makefile comments to run fuzz-all target.
282
+
283
+ Needs review.
284
+ cf. <pull.889.v3.git.1615223682911.gitgitgadget@gmail.com>
285
+ cf. <defff7a3-2104-4fa1-7750-0b13ca5cdf59@ahunt.org>
286
+
287
+
288
+* ah/plugleaks (2021-03-08) 7 commits
289
+ - parse-options: don't leak alias help messages
290
+ - init-db: silence template_dir leak when converting to absolute path
291
+ - init: remove git_init_db_config() while fixing leaks
292
+ - worktree: fix leak in dwim_branch()
293
+ - clone: free or UNLEAK further pointers when finished
294
+ - reset: free instead of leaking unneeded ref
295
+ - symbolic-ref: don't leak shortened refname in check_symref()
296
+
297
+ Plug or annotate remaining leaks that trigger while running the
298
+ very basic set of tests.
299
+
300
+
301
+* bc/clone-bare-with-conflicting-config (2021-03-10) 1 commit
302
+ - builtin/init-db: handle bare clones when core.bare set to false
303
+
304
+ "git -c core.bare=false clone --bare ..." would have segfaulted,
305
+ which has been corrected.
306
+
307
+ Will merge to 'next'.
308
+
309
+
310
+* dl/cat-file-doc-cleanup (2021-03-03) 2 commits
311
+ - git-cat-file.txt: remove references to "sha1"
312
+ - git-cat-file.txt: monospace args, placeholders and filenames
313
+
314
+ Doc cleanup.
315
+
316
+ Will merge to 'next'.
317
+
318
+
319
+* jr/doc-ignore-typofix (2021-03-03) 1 commit
320
+ - doc: .gitignore documentation typofix
321
+
322
+ Doc cleanup.
323
+
324
+ Will merge to 'next'.
325
+
326
+
327
+* rr/mailmap-entry-self (2021-03-08) 1 commit
328
+ - Add entry for Ramkumar Ramachandra
329
+
330
+ Will merge to 'next'.
331
+
332
+
333
+* rs/xcalloc-takes-nelem-first (2021-03-08) 1 commit
334
+ - fix xcalloc() argument order
335
+
336
+ Code cleanup.
337
+
338
+ Will merge to 'next'.
339
+
340
+
341
+* sv/t9801-test-path-is-file-cleanup (2021-03-03) 1 commit
342
+ - t9801: replace test -f with test_path_is_file
343
+
344
+ Test cleanup.
345
+
346
+ Will merge to 'next'.
347
+
348
+
349
+* tb/git-mv-icase-fix (2021-03-03) 1 commit
350
+ - git mv foo FOO ; git mv foo bar gave an assert
351
+
352
+ Fix a corner case bug in "git mv" on case insensitive systems,
353
+ which was introduced in 2.29 timeframe.
354
+
355
+ Will merge to 'next'.
356
+
357
+
358
+* tb/push-simple-uses-branch-merge-config (2021-03-08) 1 commit
359
+ - Documentation/git-push.txt: correct configuration typo
360
+
361
+ Doc update.
362
+
363
+ cf. <YEaM7ruZCvaQQbPI@nand.local>
364
+
365
+
366
* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits
367
(merged to 'next' on 2021-03-01 at a01bd0d8e4)
368
+ remote: write camel-cased *.pushRemote on rename
@@ -527,13 +542,13 @@ Release tarballs are available at:
542
cf. <20210216115801.4773-1-avarab@gmail.com>
543
544
530
-* cm/rebase-i-fixup-amend-reword (2021-03-01) 6 commits
545
+* cm/rebase-i-fixup-amend-reword (2021-03-10) 6 commits
546
- doc/git-commit: add documentation for fixup=[amend|reword] options
547
- t3437: use --fixup with options to create amend! commit
548
- t7500: add tests for --fixup=[amend|reword] options
549
- commit: add a reword suboption to --fixup
550
- commit: add amend suboption to --fixup to create amend! commit
536
- - sequencer: export subject_length()
551
+ - sequencer: export and rename subject_length()
552
(this branch uses cm/rebase-i and cm/rebase-i-updates.)
553
554
"git commit --fixup=<commit>", which was to tweak the changes made
@@ -543,7 +558,6 @@ Release tarballs are available at:
558
respectively.
559
560
Getting there.
546
- cf. <20210301084512.27170-1-charvi077@gmail.com>
561
562
563
* jk/open-dotgitx-with-nofollow (2021-02-16) 6 commits
@@ -598,26 +612,25 @@ Release tarballs are available at:
612
Will cook in 'next', together with "cm/rebase-i".
613
614
601
-* jh/simple-ipc (2021-02-17) 12 commits
602
- (merged to 'next' on 2021-03-01 at 6604451f18)
603
- + t0052: add simple-ipc tests and t/helper/test-simple-ipc tool
604
- + simple-ipc: add Unix domain socket implementation
605
- + unix-socket: create `unix_stream_server__listen_with_lock()`
606
- + unix-socket: disallow chdir() when creating unix domain sockets
607
- + unix-socket: add backlog size option to unix_stream_listen()
608
- + unix-socket: elimiate static unix_stream_socket() helper function
609
- + simple-ipc: add win32 implementation
610
- + simple-ipc: design documentation for new IPC mechanism
611
- + pkt-line: add options argument to read_packetized_to_strbuf()
612
- + pkt-line: (optionally) libify the packet readers
613
- + pkt-line: do not issue flush packets in write_packetized_*()
614
- + pkt-line: eliminate the need for static buffer in packet_write_gently()
615
- (this branch is used by jh/simple-ipc-cleanups.)
615
+* jh/simple-ipc (2021-03-09) 12 commits
616
+ - t0052: add simple-ipc tests and t/helper/test-simple-ipc tool
617
+ - simple-ipc: add Unix domain socket implementation
618
+ - unix-stream-server: create unix domain socket under lock
619
+ - unix-socket: disallow chdir() when creating unix domain sockets
620
+ - unix-socket: add backlog size option to unix_stream_listen()
621
+ - unix-socket: eliminate static unix_stream_socket() helper function
622
+ - simple-ipc: add win32 implementation
623
+ - simple-ipc: design documentation for new IPC mechanism
624
+ - pkt-line: add options argument to read_packetized_to_strbuf()
625
+ - pkt-line: add PACKET_READ_GENTLE_ON_READ_ERROR option
626
+ - pkt-line: do not issue flush packets in write_packetized_*()
627
+ - pkt-line: eliminate the need for static buffer in packet_write_gently()
628
629
A simple IPC interface gets introduced to build services like
630
fsmonitor on top.
631
620
- Will cook in 'next'.
632
+ Replaced with a new iteration.
633
+
634
635
636
* cm/rebase-i (2021-01-29) 9 commits
@@ -698,3 +711,19 @@ Release tarballs are available at:
711
712
cw/pack-config-doc supersedes this with a bit more coverage on
713
related knobs.
714
+
715
+
716
+* jh/simple-ipc-cleanups (2021-03-04) 9 commits
717
+ - SQUASH???
718
+ - simple-ipc: update design documentation with more details
719
+ - test-simple-ipc: add --token=<token> string option
720
+ - test-simple-ipc: refactor command line option processing in helper
721
+ - unix-stream-server: add st_dev and st_mode to socket stolen checks
722
+ - simple-ipc: move error handling up a level
723
+ - unix-stream-server: create unix-stream-server.c
724
+ - unix-socket: simplify initialization of unix_stream_listen_opts
725
+ - pkt-line: remove buffer arg from write_packetized_from_fd_no_flush()
726
+
727
+ After kicking jh/simple-ipc out of 'next' and rewinding
728
+ jh/simple-ipc to contain the incremental clean-up in this follow-up
729
+ topic, it is no longer needed, hence retired.