What's cooking (2024/01 #02)
Junio C Hamano committed
Jan 5, 2024 at 15:53 UTC
7b5e74870199a7603fa66227ed95d0c9eb682360
1 file changed
+122
-113
whats-cooking.txt
+122
-113
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2024, #01; Tue, 2)
2
+Subject: What's cooking in git.git (Jan 2024, #02; Fri, 5)
3
X-master-at: a26002b62827b89a19b1084bd75d9371d565d03c
4
-X-next-at: 074686ec740dcf9adf7983090d00482a0390dc8a
4
+X-next-at: b435a96ce80ec65acd71d7318b1fc27d53dfa924
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2024, #01; Tue, 2)
7
+What's cooking in git.git (Jan 2024, #02; Fri, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,12 +17,6 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-As the past couple of weeks have been slow, topics that have been
21
-merged to 'next' (and to a lessor extent, to 'master') this season
22
-may have seen less scrutinizing eyes than they deserve, which might
23
-lead bugs and regressions caused by them discovered later, but that
24
-is a regular part of life. Let's see what happens.
25
-
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
22
repositories have only a subset of branches.
@@ -52,80 +46,90 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
55
-[Graduated to 'master']
49
+[New Topics]
50
+
51
+* ms/rebase-insnformat-doc-fix (2024-01-03) 1 commit
52
+ (merged to 'next' on 2024-01-04 at d68f2be39b)
53
+ + Documentation: fix statement about rebase.instructionFormat
54
57
-* jc/orphan-unborn (2023-11-24) 2 commits
58
- (merged to 'next' on 2023-12-21 at 030300487a)
59
- + orphan/unborn: fix use of 'orphan' in end-user facing messages
60
- + orphan/unborn: add to the glossary and use them consistently
55
+ Docfix.
56
62
- Doc updates to clarify what an "unborn branch" means.
63
- source: <xmqq4jhb977x.fsf@gitster.g>
57
+ Will merge to 'master'.
58
+ source: <pull.1629.git.git.1704305663254.gitgitgadget@gmail.com>
59
60
66
-* jc/retire-cas-opt-name-constant (2023-12-19) 1 commit
67
- (merged to 'next' on 2023-12-21 at 39ef057c8b)
68
- + remote.h: retire CAS_OPT_NAME
61
+* cp/git-flush-is-an-env-bool (2024-01-04) 1 commit
62
+ (merged to 'next' on 2024-01-04 at b435a96ce8)
63
+ + write-or-die: make GIT_FLUSH a Boolean environment variable
64
70
- Code clean-up.
71
- source: <xmqq5y0uc7tq.fsf@gitster.g>
65
+ Unlike other environment variables that took the usual
66
+ true/false/yes/no as well as 0/1, GIT_FLUSH only understood 0/1,
67
+ which has been corrected.
68
69
+ Will merge to 'master'.
70
+ source: <pull.1628.v3.git.1704363617842.gitgitgadget@gmail.com>
71
74
-* la/trailer-cleanups (2023-12-20) 3 commits
75
- (merged to 'next' on 2023-12-21 at e26ede5f55)
76
- + trailer: use offsets for trailer_start/trailer_end
77
- + trailer: find the end of the log message
78
- + commit: ignore_non_trailer computes number of bytes to ignore
72
80
- Code clean-up.
81
- source: <pull.1563.v5.git.1697828495.gitgitgadget@gmail.com>
73
+* sd/negotiate-trace-fix (2024-01-03) 1 commit
74
+ - push: region_leave trace for negotiate_using_fetch
75
76
+ Tracing fix.
77
84
-* ps/pseudo-refs (2023-12-14) 4 commits
85
- (merged to 'next' on 2023-12-21 at 3460e3d667)
86
- + bisect: consistently write BISECT_EXPECTED_REV via the refdb
87
- + refs: complete list of special refs
88
- + refs: propagate errno when reading special refs fails
89
- + wt-status: read HEAD and ORIG_HEAD via the refdb
78
+ Waiting for a review response.
79
+ cf. <xmqqbka27zu9.fsf@gitster.g>
80
+ source: <20240103224054.1940209-1-delmerico@google.com>
81
91
- Assorted changes around pseudoref handling.
92
- source: <cover.1702560829.git.ps@pks.im>
82
83
+* sk/mingw-owner-check-error-message-improvement (2024-01-04) 1 commit
84
+ - mingw: give more details about unsafe directory's ownership
85
95
-* rj/status-bisect-while-rebase (2023-10-16) 1 commit
96
- (merged to 'next' on 2023-12-21 at 929a027fb7)
97
- + status: fix branch shown when not only bisecting
86
+ In addition to (rather cryptic) Security Identifiers, show username
87
+ and domain in the error message when we barf on mismatch between
88
+ the Git directory and the current user.
89
99
- "git status" is taught to show both the branch being bisected and
100
- being rebased when both are in effect at the same time.
101
- cf. <xmqqil76kyov.fsf@gitster.g>
102
- source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@gmail.com>
90
+ Waiting for a review by the area maintainer.
91
+ cf. <xmqqbka07te6.fsf@gitster.g>
92
+ source: <20240104192202.2124-2-soekkle@freenet.de>
93
94
105
-* rs/rebase-use-strvec-pushf (2023-12-20) 1 commit
106
- (merged to 'next' on 2023-12-20 at ecb190973c)
107
- + rebase: use strvec_pushf() for format-patch revisions
95
+* ib/rebase-reschedule-doc (2024-01-05) 1 commit
96
+ - rebase: clarify --reschedule-failed-exec default
97
+
98
+ Doc update.
99
+
100
+ Will merge to 'next'.
101
+ source: <20240105011424.1443732-2-illia.bobyr@gmail.com>
102
109
- Code clean-up.
110
- source: <4ab7431c-6c1b-448c-b4d2-e8b9be0e4eef@web.de>
103
104
+* jk/commit-graph-slab-clear-fix (2024-01-05) 1 commit
105
+ - commit-graph: retain commit slab when closing NULL commit_graph
106
113
-* sh/completion-with-reftable (2023-12-19) 2 commits
114
- (merged to 'next' on 2023-12-20 at 7957d4aa5b)
115
- + completion: support pseudoref existence checks for reftables
116
- + completion: refactor existence checks for pseudorefs
107
+ Clearing in-core repository (happens during e.g., "git fetch
108
+ --recurse-submodules" with commit graph enabled) made in-core
109
+ commit object in an inconsistent state by discarding the necessary
110
+ data from commit-graph too early, which has been corrected.
111
118
- Command line completion script (in contrib/) learned to work better
119
- with the reftable backend.
120
- source: <cover.1703022850.git.stanhu@gmail.com>
112
+ Will merge to 'next'.
113
+ source: <20240105054142.GA2035092@coredump.intra.peff.net>
114
+
115
+
116
+* jk/index-pack-lsan-false-positive-fix (2024-01-05) 1 commit
117
+ - index-pack: spawn threads atomically
118
+
119
+ Fix false positive reported by leak sanitizer.
120
+
121
+ Will merge to 'next'.
122
+ source: <20240105085034.GA3078476@coredump.intra.peff.net>
123
124
--------------------------------------------------
123
-[New Topics]
125
+[Cooking]
126
127
* cp/sideband-array-index-comment-fix (2023-12-28) 1 commit
128
- sideband.c: remove redundant 'NEEDSWORK' tag
129
130
In-code comment fix.
131
+
132
+ Will merge to 'next'.
133
source: <pull.1625.v4.git.1703750460527.gitgitgadget@gmail.com>
134
135
@@ -145,8 +149,6 @@ Release tarballs are available at:
149
cf. <xmqqedf6gpt8.fsf@gitster.g>
150
source: <cover.1703754513.git.ps@pks.im>
151
148
---------------------------------------------------
149
-[Cooking]
152
153
* ml/doc-merge-updates (2023-12-20) 2 commits
154
(merged to 'next' on 2023-12-28 at 7a6329a219)
@@ -185,7 +187,9 @@ Release tarballs are available at:
187
source: <xmqqmsu3mnix.fsf@gitster.g>
188
189
188
-* jk/t1006-cat-file-objectsize-disk (2023-12-21) 1 commit
190
+* jk/t1006-cat-file-objectsize-disk (2024-01-03) 2 commits
191
+ (merged to 'next' on 2024-01-03 at a492c6355c)
192
+ + t1006: prefer shell loop to awk for packed object sizes
193
(merged to 'next' on 2023-12-28 at d82812e636)
194
+ t1006: add tests for %(objectsize:disk)
195
@@ -193,6 +197,7 @@ Release tarballs are available at:
197
198
Will merge to 'master'.
199
source: <20231221094722.GA570888@coredump.intra.peff.net>
200
+ source: <20240103090152.GB1866508@coredump.intra.peff.net>
201
202
203
* js/contributor-docs-updates (2023-12-27) 9 commits
@@ -213,11 +218,13 @@ Release tarballs are available at:
218
source: <pull.1623.v3.git.1703739324.gitgitgadget@gmail.com>
219
220
216
-* al/unit-test-ctype (2024-01-02) 1 commit
221
+* al/unit-test-ctype (2024-01-05) 1 commit
222
- unit-tests: rewrite t/helper/test-ctype.c as a unit test
223
224
Move test-ctype helper to the unit-test framework.
220
- source: <20240101104017.9452-2-ach.lumap@gmail.com>
225
+
226
+ Will merge to 'next'.
227
+ source: <20240105161413.10422-1-ach.lumap@gmail.com>
228
229
230
* bk/bisect-doc-fix (2023-12-27) 1 commit
@@ -302,11 +309,11 @@ Release tarballs are available at:
309
Introduce a new extension "refstorage" so that we can mark a
310
repository that uses a non-default ref backend, like reftable.
311
305
- Will merge to 'next'?
312
+ Will merge to 'next'.
313
source: <cover.1703833818.git.ps@pks.im>
314
315
309
-* ps/reftable-fixes-and-optims (2023-12-28) 9 commits
316
+* ps/reftable-fixes-and-optims (2024-01-03) 9 commits
317
- reftable/merged: transfer ownership of records when iterating
318
- reftable/merged: really reuse buffers to compute record keys
319
- reftable/record: store "val2" hashes as static arrays
@@ -319,44 +326,44 @@ Release tarballs are available at:
326
327
More fixes and optimizations to the reftable backend.
328
322
- Expecting a (hopefully minor and final) reroll.
323
- cf. <xmqqtto2gswa.fsf@gitster.g>
324
- source: <cover.1703743174.git.ps@pks.im>
329
+ Will merge to 'next'.
330
+ source: <cover.1704262787.git.ps@pks.im>
331
332
333
* tb/multi-pack-verbatim-reuse (2023-12-14) 26 commits
328
- - t/perf: add performance tests for multi-pack reuse
329
- - pack-bitmap: enable reuse from all bitmapped packs
330
- - pack-objects: allow setting `pack.allowPackReuse` to "single"
331
- - t/test-lib-functions.sh: implement `test_trace2_data` helper
332
- - pack-objects: add tracing for various packfile metrics
333
- - pack-bitmap: prepare to mark objects from multiple packs for reuse
334
- - pack-revindex: implement `midx_pair_to_pack_pos()`
335
- - pack-revindex: factor out `midx_key_to_pack_pos()` helper
336
- - midx: implement `midx_preferred_pack()`
337
- - git-compat-util.h: implement checked size_t to uint32_t conversion
338
- - pack-objects: include number of packs reused in output
339
- - pack-objects: prepare `write_reused_pack_verbatim()` for multi-pack reuse
340
- - pack-objects: prepare `write_reused_pack()` for multi-pack reuse
341
- - pack-objects: pass `bitmapped_pack`'s to pack-reuse functions
342
- - pack-objects: keep track of `pack_start` for each reuse pack
343
- - pack-objects: parameterize pack-reuse routines over a single pack
344
- - pack-bitmap: return multiple packs via `reuse_partial_packfile_from_bitmap()`
345
- - pack-bitmap: simplify `reuse_partial_packfile_from_bitmap()` signature
346
- - ewah: implement `bitmap_is_empty()`
347
- - pack-bitmap: pass `bitmapped_pack` struct to pack-reuse functions
348
- - midx: implement `midx_locate_pack()`
349
- - midx: implement `BTMP` chunk
350
- - midx: factor out `fill_pack_info()`
351
- - pack-bitmap: plug leak in find_objects()
352
- - pack-bitmap-write: deep-clear the `bb_commit` slab
353
- - pack-objects: free packing_data in more places
334
+ (merged to 'next' on 2024-01-04 at 891ac0fa2c)
335
+ + t/perf: add performance tests for multi-pack reuse
336
+ + pack-bitmap: enable reuse from all bitmapped packs
337
+ + pack-objects: allow setting `pack.allowPackReuse` to "single"
338
+ + t/test-lib-functions.sh: implement `test_trace2_data` helper
339
+ + pack-objects: add tracing for various packfile metrics
340
+ + pack-bitmap: prepare to mark objects from multiple packs for reuse
341
+ + pack-revindex: implement `midx_pair_to_pack_pos()`
342
+ + pack-revindex: factor out `midx_key_to_pack_pos()` helper
343
+ + midx: implement `midx_preferred_pack()`
344
+ + git-compat-util.h: implement checked size_t to uint32_t conversion
345
+ + pack-objects: include number of packs reused in output
346
+ + pack-objects: prepare `write_reused_pack_verbatim()` for multi-pack reuse
347
+ + pack-objects: prepare `write_reused_pack()` for multi-pack reuse
348
+ + pack-objects: pass `bitmapped_pack`'s to pack-reuse functions
349
+ + pack-objects: keep track of `pack_start` for each reuse pack
350
+ + pack-objects: parameterize pack-reuse routines over a single pack
351
+ + pack-bitmap: return multiple packs via `reuse_partial_packfile_from_bitmap()`
352
+ + pack-bitmap: simplify `reuse_partial_packfile_from_bitmap()` signature
353
+ + ewah: implement `bitmap_is_empty()`
354
+ + pack-bitmap: pass `bitmapped_pack` struct to pack-reuse functions
355
+ + midx: implement `midx_locate_pack()`
356
+ + midx: implement `BTMP` chunk
357
+ + midx: factor out `fill_pack_info()`
358
+ + pack-bitmap: plug leak in find_objects()
359
+ + pack-bitmap-write: deep-clear the `bb_commit` slab
360
+ + pack-objects: free packing_data in more places
361
362
Streaming spans of packfile data used to be done only from a
363
single, primary, pack in a repository with multiple packfiles. It
364
has been extended to allow reuse from other packfiles, too.
365
359
- Will merge to 'next'?
366
+ Will merge to 'master'.
367
cf. <ZXurD1NTZ4TAs7WZ@nand.local>
368
source: <cover.1702592603.git.me@ttaylorr.com>
369
@@ -405,21 +412,6 @@ Release tarballs are available at:
412
source: <20231116054437.2343549-1-jojwang@google.com>
413
414
408
-* tb/merge-tree-write-pack (2023-10-23) 5 commits
409
- - builtin/merge-tree.c: implement support for `--write-pack`
410
- - bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
411
- - bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
412
- - bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
413
- - bulk-checkin: extract abstract `bulk_checkin_source`
414
-
415
- "git merge-tree" learned "--write-pack" to record its result
416
- without creating loose objects.
417
-
418
- Broken when an object created during a merge is needed to continue merge
419
- cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
420
- source: <cover.1698101088.git.me@ttaylorr.com>
421
-
422
-
415
* tb/pair-chunk-expect (2023-11-10) 8 commits
416
- midx: read `OOFF` chunk with `pair_chunk_expect()`
417
- midx: read `OIDL` chunk with `pair_chunk_expect()`
@@ -459,7 +451,7 @@ Release tarballs are available at:
451
on systems whose "char" is unsigned; update the implementation and
452
bump the format version to 2.
453
462
- Expecting a reroll.
454
+ Expecting a reroll?
455
cf. <20231023202212.GA5470@szeder.dev>
456
source: <cover.1697653929.git.me@ttaylorr.com>
457
@@ -531,13 +523,14 @@ Release tarballs are available at:
523
524
525
* jx/sideband-chomp-newline-fix (2023-12-18) 3 commits
534
- - pkt-line: do not chomp newlines for sideband messages
535
- - pkt-line: memorize sideband fragment in reader
536
- - test-pkt-line: add option parser for unpack-sideband
526
+ (merged to 'next' on 2024-01-04 at 1237898a22)
527
+ + pkt-line: do not chomp newlines for sideband messages
528
+ + pkt-line: memorize sideband fragment in reader
529
+ + test-pkt-line: add option parser for unpack-sideband
530
531
Sideband demultiplexer fixes.
532
540
- Will merge to 'next'?
533
+ Will merge to 'master'.
534
source: <cover.1702823801.git.zhiyou.jx@alibaba-inc.com>
535
536
@@ -567,3 +560,19 @@ Release tarballs are available at:
560
561
Superseded by the en/sparse-checkout-eoo topic.
562
source: <20231221065925.3234048-1-gitster@pobox.com>
563
+
564
+
565
+* tb/merge-tree-write-pack (2023-10-23) 5 commits
566
+ . builtin/merge-tree.c: implement support for `--write-pack`
567
+ . bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
568
+ . bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
569
+ . bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
570
+ . bulk-checkin: extract abstract `bulk_checkin_source`
571
+
572
+ "git merge-tree" learned "--write-pack" to record its result
573
+ without creating loose objects.
574
+
575
+ Broken when an object created during a merge is needed to continue merge
576
+ cf. <CABPp-BEfy9VOvimP9==ry_rZXu=metOQ8s=_-XiG_Pdx9c06Ww@mail.gmail.com>
577
+ cf. <ZZWOtnP2IHNldcy6@nand.local>
578
+ source: <cover.1698101088.git.me@ttaylorr.com>