What's cooking (2022/08 #09)
Junio C Hamano committed
Aug 26, 2022 at 12:16 UTC
ff554cac35902b304f064d05bb79033c25cc82ac
1 file changed
+151
-138
whats-cooking.txt
+151
-138
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #08; Wed, 24)
3
-X-master-at: 795ea8776befc95ea2becd8020c7a284677b4161
4
-X-next-at: 1cad371f1c4a4d3e2f0d7a9bbce5708e2a9d2902
2
+Subject: What's cooking in git.git (Aug 2022, #09; Fri, 26)
3
+X-master-at: 07ee72db0e97b5c233f8ada0abb412248c2f1c6f
4
+X-next-at: 80e7f50712d6a2d04807d40616c5c20b9e37eab9
5
6
-What's cooking in git.git (Aug 2022, #08; Wed, 24)
6
+What's cooking in git.git (Aug 2022, #09; Fri, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,8 +13,9 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
13
considered "accepted" at all. A topic without enough support may be
14
discarded after a long period of no activity.
15
16
-We are in the middle of the week #7 of a 12-week cycle
17
-(cf. https://tinyurl.com/gitCal).
16
+We are at the end of week #7 in a 12-week cycle toward Git 2.38
17
+(tinyurl.com/gitCal). As we have accumulated enough material on
18
+the 'maint' branch, we may want to tag 2.37.3 early next week.
19
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
@@ -47,6 +48,94 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[New Topics]
50
51
+* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
52
+ - grep: fix multibyte regex handling under macOS
53
+
54
+ With a bit of header twiddling, use the native regexp library on
55
+ macOS instead of the compat/ one.
56
+
57
+ Needs review.
58
+ source: <20220826085815.2771102-1-dds@aueb.gr>
59
+
60
+--------------------------------------------------
61
+[Graduated to 'master']
62
+
63
+* cw/submodule-merge-messages (2022-08-04) 1 commit
64
+ (merged to 'next' on 2022-08-12 at ede0890319)
65
+ + submodule merge: update conflict error message
66
+ (this branch is used by en/submodule-merge-messages-fixes.)
67
+
68
+ Update the message given when "git merge" sees conflicts at a path
69
+ with a submodule while merging a superproject.
70
+ source: <20220804195105.1303455-1-calvinwan@google.com>
71
+
72
+
73
+* en/submodule-merge-messages-fixes (2022-08-18) 3 commits
74
+ (merged to 'next' on 2022-08-18 at eb89a1e70f)
75
+ + merge-ort: provide helpful submodule update message when possible
76
+ + merge-ort: avoid surprise with new sub_flag variable
77
+ + merge-ort: remove translator lego in new "submodule conflict suggestion"
78
+ (this branch uses cw/submodule-merge-messages.)
79
+
80
+ Further update the help messages given while merging submodules.
81
+ source: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com>
82
+
83
+
84
+* jk/is-promisor-object-keep-tree-in-use (2022-08-14) 1 commit
85
+ (merged to 'next' on 2022-08-17 at 96033ff88d)
86
+ + is_promisor_object(): fix use-after-free of tree buffer
87
+
88
+ An earlier optimization discarded a tree-object buffer that is
89
+ still in use, which has been corrected.
90
+ source: <YviWO9Bhz5PU1HaL@coredump.intra.peff.net>
91
+
92
+
93
+* jk/pipe-command-nonblock (2022-08-17) 6 commits
94
+ (merged to 'next' on 2022-08-17 at 91fe8e6354)
95
+ + pipe_command(): mark stdin descriptor as non-blocking
96
+ + pipe_command(): handle ENOSPC when writing to a pipe
97
+ + pipe_command(): avoid xwrite() for writing to pipe
98
+ + git-compat-util: make MAX_IO_SIZE define globally available
99
+ + nonblock: support Windows
100
+ + compat: add function to enable nonblocking pipes
101
+
102
+ Fix deadlocks between main Git process and subprocess spawned via
103
+ the pipe_command() API, that can kill "git add -p" that was
104
+ reimplemented in C recently.
105
+ source: <YvyE1RDFVAg4uQo1@coredump.intra.peff.net>
106
+
107
+
108
+* js/fetch-negotiation-trace (2022-08-15) 1 commit
109
+ (merged to 'next' on 2022-08-17 at 2c9e07b617)
110
+ + fetch-pack: add tracing for negotiation rounds
111
+
112
+ The common ancestor negotiation exchange during a "git fetch"
113
+ session now leaves trace log.
114
+ source: <4390677ec75d51487142adf7c2ab821cbd24a53e.1659477669.git.steadmon@google.com>
115
+
116
+
117
+* vd/scalar-generalize-diagnose (2022-08-12) 11 commits
118
+ (merged to 'next' on 2022-08-18 at bd8e574713)
119
+ + scalar: update technical doc roadmap
120
+ + scalar-diagnose: use 'git diagnose --mode=all'
121
+ + builtin/bugreport.c: create '--diagnose' option
122
+ + builtin/diagnose.c: add '--mode' option
123
+ + builtin/diagnose.c: create 'git diagnose' builtin
124
+ + diagnose.c: add option to configure archive contents
125
+ + scalar-diagnose: move functionality to common location
126
+ + scalar-diagnose: move 'get_disk_info()' to 'compat/'
127
+ + scalar-diagnose: add directory to archiver more gently
128
+ + scalar-diagnose: avoid 32-bit overflow of size_t
129
+ + scalar-diagnose: use "$GIT_UNZIP" in test
130
+
131
+ The "diagnose" feature to create a zip archive for diagnostic
132
+ material has been lifted from "scalar" and made into a feature of
133
+ "git bugreport".
134
+ source: <pull.1310.v4.git.1660335019.gitgitgadget@gmail.com>
135
+
136
+--------------------------------------------------
137
+[Cooking]
138
+
139
* ds/bundle-uri-3 (2022-08-24) 8 commits
140
- bundle-uri: fetch a list of bundles
141
- bundle-uri: limit recursion depth for bundle lists
@@ -67,13 +156,14 @@ Release tarballs are available at:
156
157
158
* en/merge-unstash-only-on-clean-merge (2022-08-24) 1 commit
70
- - merge: only apply autostash when appropriate
159
+ (merged to 'next' on 2022-08-25 at a144bdf6cb)
160
+ + merge: only apply autostash when appropriate
161
162
The auto-stashed local changes created by "git merge --autostash"
163
was mixed into a conflicted state left in the working tree, which
164
has been corrected.
165
76
- Will merge to 'next'.
166
+ Will merge to 'master'.
167
source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com>
168
169
@@ -126,23 +216,25 @@ Release tarballs are available at:
216
217
218
* en/merge-multi-strategies (2022-08-24) 2 commits
129
- - merge: small code readability improvement
130
- - merge: cleanup confusing logic for handling successful merges
219
+ (merged to 'next' on 2022-08-25 at 420e2eae66)
220
+ + merge: small code readability improvement
221
+ + merge: cleanup confusing logic for handling successful merges
222
223
The code that implements multi-strategy support in "git merge" has
224
been clean-up a bit.
225
135
- Will merge to 'next'.
226
+ Will merge to 'master'.
227
source: <pull.1331.v2.git.1661222541.gitgitgadget@gmail.com>
228
229
230
* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit
140
- - t4301: add more interesting merge-tree testcases
231
+ (merged to 'next' on 2022-08-25 at c7abf60ff4)
232
+ + t4301: add more interesting merge-tree testcases
233
234
More tests to protect the current behaviour of "merge-tree" before
235
it gets further updated.
236
145
- Will merge to 'next'.
237
+ Will merge to 'master'.
238
source: <pull.1332.git.1661237316150.gitgitgadget@gmail.com>
239
240
@@ -172,17 +264,16 @@ Release tarballs are available at:
264
source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
265
266
175
-* js/range-diff-with-pathspec (2022-08-24) 2 commits
176
- - range-diff: optionally accept a pathspec
267
+* js/range-diff-with-pathspec (2022-08-26) 3 commits
268
+ - range-diff: optionally accept pathspecs
269
+ - range-diff: consistently validate the arguments
270
- range-diff: reorder argument handling
271
272
Allow passing a pathspec to "git range-diff".
273
181
- Needs review.
182
- source: <pull.1335.git.1661258122.gitgitgadget@gmail.com>
274
+ Will merge to 'next'?
275
+ source: <pull.1335.v2.git.1661506770.gitgitgadget@gmail.com>
276
184
---------------------------------------------------
185
-[Cooking]
277
278
* en/ort-unused-code-removal (2022-08-19) 1 commit
279
(merged to 'next' on 2022-08-22 at f09dbeeca3)
@@ -258,19 +349,19 @@ Release tarballs are available at:
349
350
351
* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits
261
- - midx.c: avoid adding preferred objects twice
262
- - midx.c: include preferred pack correctly with existing MIDX
263
- - midx.c: extract `midx_fanout_add_pack_fanout()`
264
- - midx.c: extract `midx_fanout_add_midx_fanout()`
265
- - midx.c: extract `struct midx_fanout`
266
- - t/lib-bitmap.sh: avoid silencing stderr
267
- - t5326: demonstrate potential bitmap corruption
352
+ (merged to 'next' on 2022-08-26 at 305a9d3323)
353
+ + midx.c: avoid adding preferred objects twice
354
+ + midx.c: include preferred pack correctly with existing MIDX
355
+ + midx.c: extract `midx_fanout_add_pack_fanout()`
356
+ + midx.c: extract `midx_fanout_add_midx_fanout()`
357
+ + midx.c: extract `struct midx_fanout`
358
+ + t/lib-bitmap.sh: avoid silencing stderr
359
+ + t5326: demonstrate potential bitmap corruption
360
361
Multi-pack index got corrupted when preferred pack changed from one
362
pack to another in a certain way, which has been corrected.
363
272
- Will merge to 'next'?
273
- cf. <be9c7c72-ba24-3e1a-8428-58a2e2afa09a@github.com>
364
+ Will merge to 'master'.
365
source: <cover.1661197803.git.me@ttaylorr.com>
366
367
@@ -318,19 +409,6 @@ Release tarballs are available at:
409
source: <pull.1303.v3.git.1660883290.gitgitgadget@gmail.com>
410
411
321
-* en/submodule-merge-messages-fixes (2022-08-18) 3 commits
322
- (merged to 'next' on 2022-08-18 at eb89a1e70f)
323
- + merge-ort: provide helpful submodule update message when possible
324
- + merge-ort: avoid surprise with new sub_flag variable
325
- + merge-ort: remove translator lego in new "submodule conflict suggestion"
326
- (this branch uses cw/submodule-merge-messages.)
327
-
328
- Further update the help messages given while merging submodules.
329
-
330
- Will merge to 'master'.
331
- source: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com>
332
-
333
-
412
* ed/fsmonitor-on-network-disk (2022-08-24) 3 commits
413
- Check working directory and Unix domain socket file for compatability
414
- fsmonitor: macOS: allow fsmonitor to run against network-mounted repos
@@ -346,28 +424,6 @@ Release tarballs are available at:
424
source: <pull.1326.v3.git.1661280941.gitgitgadget@gmail.com>
425
426
349
-* jk/is-promisor-object-keep-tree-in-use (2022-08-14) 1 commit
350
- (merged to 'next' on 2022-08-17 at 96033ff88d)
351
- + is_promisor_object(): fix use-after-free of tree buffer
352
-
353
- An earlier optimization discarded a tree-object buffer that is
354
- still in use, which has been corrected.
355
-
356
- Will merge to 'master'.
357
- source: <YviWO9Bhz5PU1HaL@coredump.intra.peff.net>
358
-
359
-
360
-* js/fetch-negotiation-trace (2022-08-15) 1 commit
361
- (merged to 'next' on 2022-08-17 at 2c9e07b617)
362
- + fetch-pack: add tracing for negotiation rounds
363
-
364
- The common ancestor negotiation exchange during a "git fetch"
365
- session now leaves trace log.
366
-
367
- Will merge to 'master'.
368
- source: <4390677ec75d51487142adf7c2ab821cbd24a53e.1659477669.git.steadmon@google.com>
369
-
370
-
427
* pw/rebase-keep-base-fixes (2022-08-18) 5 commits
428
- rebase --keep-base: imply --no-fork-point
429
- rebase --keep-base: imply --reapply-cherry-picks
@@ -427,49 +483,11 @@ Release tarballs are available at:
483
move a path from a directory that is "in cone" to another directory
484
that is "out of cone". Handling of such a case has been improved.
485
430
- Will merge to 'master'.
486
+ An oob read access makes sanitizer build segfault.
487
+ cf.<YwdJRRuST2SP8ZT7@coredump.intra.peff.net>
488
source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
489
490
434
-* vd/scalar-generalize-diagnose (2022-08-12) 11 commits
435
- (merged to 'next' on 2022-08-18 at bd8e574713)
436
- + scalar: update technical doc roadmap
437
- + scalar-diagnose: use 'git diagnose --mode=all'
438
- + builtin/bugreport.c: create '--diagnose' option
439
- + builtin/diagnose.c: add '--mode' option
440
- + builtin/diagnose.c: create 'git diagnose' builtin
441
- + diagnose.c: add option to configure archive contents
442
- + scalar-diagnose: move functionality to common location
443
- + scalar-diagnose: move 'get_disk_info()' to 'compat/'
444
- + scalar-diagnose: add directory to archiver more gently
445
- + scalar-diagnose: avoid 32-bit overflow of size_t
446
- + scalar-diagnose: use "$GIT_UNZIP" in test
447
-
448
- The "diagnose" feature to create a zip archive for diagnostic
449
- material has been lifted from "scalar" and made into a feature of
450
- "git bugreport".
451
-
452
- Will merge to 'master'.
453
- source: <pull.1310.v4.git.1660335019.gitgitgadget@gmail.com>
454
-
455
-
456
-* jk/pipe-command-nonblock (2022-08-17) 6 commits
457
- (merged to 'next' on 2022-08-17 at 91fe8e6354)
458
- + pipe_command(): mark stdin descriptor as non-blocking
459
- + pipe_command(): handle ENOSPC when writing to a pipe
460
- + pipe_command(): avoid xwrite() for writing to pipe
461
- + git-compat-util: make MAX_IO_SIZE define globally available
462
- + nonblock: support Windows
463
- + compat: add function to enable nonblocking pipes
464
-
465
- Fix deadlocks between main Git process and subprocess spawned via
466
- the pipe_command() API, that can kill "git add -p" that was
467
- reimplemented in C recently.
468
-
469
- Will merge to 'master'.
470
- source: <YvyE1RDFVAg4uQo1@coredump.intra.peff.net>
471
-
472
-
491
* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
492
- config: let feature.experimental imply gc.cruftPacks=true
493
- gc: add tests for --cruft and friends
@@ -483,7 +501,11 @@ Release tarballs are available at:
501
source: <20220803205721.3686361-1-emilyshaffer@google.com>
502
503
486
-* sg/parse-options-subcommand (2022-08-19) 20 commits
504
+* sg/parse-options-subcommand (2022-08-25) 23 commits
505
+ (merged to 'next' on 2022-08-25 at dab6bf1439)
506
+ + remote: run "remote rm" argv through parse_options()
507
+ + maintenance: add parse-options boilerplate for subcommands
508
+ + pass subcommand "prefix" arguments to parse_options()
509
(merged to 'next' on 2022-08-22 at 09d07c2271)
510
+ builtin/worktree.c: let parse-options parse subcommands
511
+ builtin/stash.c: let parse-options parse subcommands
@@ -511,10 +533,12 @@ Release tarballs are available at:
533
534
Will merge to 'master'.
535
source: <20220819160411.1791200-1-szeder.dev@gmail.com>
536
+ source: <YwdSzrF3xaHvLsI+@coredump.intra.peff.net>
537
538
539
* ds/bundle-uri-clone (2022-08-24) 6 commits
517
- - clone: warn on failure to repo_init()
540
+ (merged to 'next' on 2022-08-25 at 14754922fa)
541
+ + clone: warn on failure to repo_init()
542
(merged to 'next' on 2022-08-18 at 5e8a3ec71e)
543
+ clone: --bundle-uri cannot be combined with --depth
544
+ bundle-uri: add support for http(s):// and file://
@@ -689,18 +713,6 @@ Release tarballs are available at:
713
source: <cover-v6-00.17-00000000000-20220821T130415Z-avarab@gmail.com>
714
715
692
-* cw/submodule-merge-messages (2022-08-04) 1 commit
693
- (merged to 'next' on 2022-08-12 at ede0890319)
694
- + submodule merge: update conflict error message
695
- (this branch is used by en/submodule-merge-messages-fixes.)
696
-
697
- Update the message given when "git merge" sees conflicts at a path
698
- with a submodule while merging a superproject.
699
-
700
- Will wait for en/submodule-merge-messages-fixes to mature.
701
- source: <20220804195105.1303455-1-calvinwan@google.com>
702
-
703
-
716
* po/glossary-around-traversal (2022-07-09) 3 commits
717
- glossary: add reachability bitmap description
718
- glossary: add commit graph description
@@ -714,34 +726,23 @@ Release tarballs are available at:
726
source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
727
728
717
-* ac/bitmap-lookup-table (2022-08-14) 6 commits
718
- - bitmap-lookup-table: add performance tests for lookup table
719
- - pack-bitmap: prepare to read lookup table extension
720
- - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
721
- - pack-bitmap-write.c: write lookup table extension
722
- - bitmap: move `get commit positions` code to `bitmap_writer_finish`
723
- - Documentation/technical: describe bitmap lookup table extension
729
+* ac/bitmap-lookup-table (2022-08-26) 6 commits
730
+ (merged to 'next' on 2022-08-26 at 7914c141eb)
731
+ + bitmap-lookup-table: add performance tests for lookup table
732
+ + pack-bitmap: prepare to read lookup table extension
733
+ + pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
734
+ + pack-bitmap-write.c: write lookup table extension
735
+ + bitmap: move `get commit positions` code to `bitmap_writer_finish`
736
+ + Documentation/technical: describe bitmap lookup table extension
737
738
The pack bitmap file gained a bitmap-lookup table to speed up
739
locating the necessary bitmap for a given commit.
740
728
- Needs review.
729
- cf. <YwOXIE8K0GJRLuDT@nand.local>
741
+ Will merge to 'next'?
742
+ cf. <Ywf01YqJKNsGfffx@nand.local>
743
source: <pull.1266.v6.git.1660496112.gitgitgadget@gmail.com>
744
745
733
-* tb/show-ref-count (2022-06-06) 2 commits
734
- - builtin/show-ref.c: limit output with `--count`
735
- - builtin/show-ref.c: rename `found_match` to `matches_nr`
736
-
737
- "git show-ref" learned to stop after emitting N refs with the new
738
- "--count=N" option.
739
-
740
- Expecting a reroll.
741
- cf. <xmqqczfl4ce1.fsf@gitster.g>
742
- source: <cover.1654552560.git.me@ttaylorr.com>
743
-
744
-
746
* js/bisect-in-c (2022-06-27) 16 commits
747
- bisect: no longer try to clean up left-over `.git/head-name` files
748
- bisect: remove Cogito-related code
@@ -794,3 +795,15 @@ Release tarballs are available at:
795
Retracted for now.
796
cf. <9p08998o-n88r-2nno-8703-s99o5qpn9o35@tzk.qr>
797
source: <pull.1327.git.1660892256.gitgitgadget@gmail.com>
798
+
799
+
800
+* tb/show-ref-count (2022-06-06) 2 commits
801
+ . builtin/show-ref.c: limit output with `--count`
802
+ . builtin/show-ref.c: rename `found_match` to `matches_nr`
803
+
804
+ "git show-ref" learned to stop after emitting N refs with the new
805
+ "--count=N" option.
806
+
807
+ Retracted for now.
808
+ cf. <Ywf1zngpKknCmGYl@nand.local>
809
+ source: <cover.1654552560.git.me@ttaylorr.com>