What's cooking (2024/11 #06)
Junio C Hamano committed
Nov 14, 2024 at 13:46 UTC
85bb99cbaa07f5c1f1cf0ec9d7506206865d0e22
1 file changed
+216
-120
whats-cooking.txt
+216
-120
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2024, #05; Mon, 11)
3
-X-master-at: b31fb630c0fc6869a33ed717163e8a1210460d94
4
-X-next-at: c49de5d5d93ad88a5b8f1f2a66f44d11acfc90ac
2
+Subject: What's cooking in git.git (Nov 2024, #06; Thu, 14)
3
+X-master-at: 25b0f41288718625b18495de23cc066394c09a92
4
+X-next-at: bc8a4e45283384156c5b1b511874d1a3b06e3306
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2024, #05; Mon, 11)
7
+What's cooking in git.git (Nov 2024, #06; Thu, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,9 +49,189 @@ Release tarballs are available at:
49
50
https://www.kernel.org/pub/software/scm/git/
51
52
+--------------------------------------------------
53
+[Graduated to 'master']
54
+
55
+* ak/t1016-style (2024-11-03) 1 commit
56
+ (merged to 'next' on 2024-11-05 at ee100e90d3)
57
+ + t1016: clean up style
58
+
59
+ Test modernization.
60
+ source: <20241103135111.13508-1-algonell@gmail.com>
61
+
62
+
63
+* en/shallow-exclude-takes-a-ref-fix (2024-11-04) 2 commits
64
+ (merged to 'next' on 2024-11-05 at 8c5d52930b)
65
+ + doc: correct misleading descriptions for --shallow-exclude
66
+ + upload-pack: fix ambiguous error message
67
+
68
+ The "--shallow-exclude=<ref>" option to various history transfer
69
+ commands takes a ref, not an arbitrary revision.
70
+ source: <pull.1822.git.1730746964.gitgitgadget@gmail.com>
71
+
72
+
73
+* jt/commit-graph-missing (2024-11-05) 2 commits
74
+ (merged to 'next' on 2024-11-06 at b4dd083c2a)
75
+ + fetch-pack: die if in commit graph but not obj db
76
+ + Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"
77
+
78
+ A regression where commit objects missing from a commit-graph can
79
+ cause an infinite loop when doing a fetch in a partial clone has
80
+ been fixed.
81
+ source: <cover.1730833754.git.jonathantanmy@google.com>
82
+
83
+
84
+* ps/leakfixes-part-9 (2024-11-04) 22 commits
85
+ (merged to 'next' on 2024-11-05 at 0260dbd8bd)
86
+ + list-objects-filter-options: work around reported leak on error
87
+ + builtin/merge: release output buffer after performing merge
88
+ + dir: fix leak when parsing "status.showUntrackedFiles"
89
+ + t/helper: fix leaking buffer in "dump-untracked-cache"
90
+ + t/helper: stop re-initialization of `the_repository`
91
+ + sparse-index: correctly free EWAH contents
92
+ + dir: release untracked cache data
93
+ + combine-diff: fix leaking lost lines
94
+ + builtin/tag: fix leaking key ID on failure to sign
95
+ + transport-helper: fix leaking import/export marks
96
+ + builtin/commit: fix leaking cleanup config
97
+ + trailer: fix leaking strbufs when formatting trailers
98
+ + trailer: fix leaking trailer values
99
+ + builtin/commit: fix leaking change data contents
100
+ + upload-pack: fix leaking URI protocols
101
+ + pretty: clear signature check
102
+ + diff-lib: fix leaking diffopts in `do_diff_cache()`
103
+ + revision: fix leaking bloom filters
104
+ + builtin/grep: fix leak with `--max-count=0`
105
+ + grep: fix leak in `grep_splice_or()`
106
+ + t/helper: fix leaks in "reach" test tool
107
+ + builtin/ls-remote: plug leaking server options
108
+ (this branch is used by ps/leakfixes-part-10.)
109
+
110
+ More leakfixes.
111
+ source: <cover.1730786195.git.ps@pks.im>
112
+
113
+
114
+* ps/mingw-rename (2024-11-06) 3 commits
115
+ (merged to 'next' on 2024-11-06 at 6dd2fffec7)
116
+ + compat/mingw: support POSIX semantics for atomic renames
117
+ + compat/mingw: allow deletion of most opened files
118
+ + compat/mingw: share file handles created via `CreateFileW()`
119
+
120
+ The MinGW compatibility layer has been taught to support POSIX
121
+ semantics for atomic renames when other process(es) have a file
122
+ opened at the destination path.
123
+ cf. <1483501d-d798-46d6-93f5-f5edaf915e99@kdbg.org>
124
+ source: <cover.1730042775.git.ps@pks.im>
125
+
126
--------------------------------------------------
127
[New Topics]
128
129
+* ja/git-add-doc-markup (2024-11-12) 1 commit
130
+ (merged to 'next' on 2024-11-13 at 1af6d17105)
131
+ + doc: git-add.txt: convert to new style convention
132
+
133
+ Documentation mark-up updates.
134
+
135
+ Will merge to 'master'.
136
+ source: <pull.1826.git.1731348891108.gitgitgadget@gmail.com>
137
+
138
+
139
+* ja/git-diff-doc-markup (2024-11-12) 5 commits
140
+ - doc: git-diff: apply format changes to config part
141
+ - doc: git-diff: apply format changes to diff-generate-patch
142
+ - doc: git-diff: apply format changes to diff-format
143
+ - doc: git-diff: apply format changes to diff-options
144
+ - doc: git-diff: apply new documentation guidelines
145
+
146
+ Documentation mark-up updates.
147
+ source: <pull.1769.v2.git.1731343985.gitgitgadget@gmail.com>
148
+
149
+
150
+* jk/test-malloc-debug-check (2024-11-14) 2 commits
151
+ - test-lib: move malloc-debug setup after $PATH setup
152
+ (merged to 'next' on 2024-11-13 at 9aa0331ba1)
153
+ + test-lib: check malloc debug LD_PRELOAD before using
154
+
155
+ Avoid build/test breakage on a system without working malloc debug
156
+ support dynamic library.
157
+
158
+ Will merge to 'next'.
159
+ source: <20241111070134.GA675125@coredump.intra.peff.net>
160
+ source: <20241114012729.GA1148710@coredump.intra.peff.net>
161
+
162
+
163
+* ps/clar-build-improvement (2024-11-12) 4 commits
164
+ - Makefile: let clar header targets depend on their scripts
165
+ - cmake: use verbatim arguments when invoking clar commands
166
+ - cmake: use SH_EXE to execute clar scripts
167
+ - t/unit-tests: convert "clar-generate.awk" into a shell script
168
+
169
+ Fix for clar unit tests to support CMake build.
170
+
171
+ Will merge to 'next'?
172
+ source: <20241111-pks-clar-build-improvements-v2-0-d4794d8d1b30@pks.im>
173
+
174
+
175
+* jk/fetch-prefetch-double-free-fix (2024-11-12) 3 commits
176
+ - refspec: store raw refspecs inside refspec_item
177
+ - refspec: drop separate raw_nr count
178
+ - fetch: adjust refspec->raw_nr when filtering prefetch refspecs
179
+
180
+ Double-free fix.
181
+
182
+ Will merge to 'next'.
183
+ source: <20241112083204.GA2636868@coredump.intra.peff.net>
184
+
185
+
186
+* pb/mergetool-errors (2024-11-13) 5 commits
187
+ - git-difftool--helper.sh: exit upon initialize_merge_tool errors
188
+ - git-mergetool--lib.sh: add error message for unknown tool variant
189
+ - git-mergetool--lib.sh: add error message in 'setup_user_tool'
190
+ - git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
191
+ - completion: complete '--tool-help' in 'git mergetool'
192
+
193
+ End-user experience of "git mergetool" when the command errors out
194
+ has been improved.
195
+
196
+ Will merge to next'?
197
+ source: <pull.1827.git.1731459128.gitgitgadget@gmail.com>
198
+
199
+
200
+* ps/send-pack-unhide-error-in-atomic-push (2024-11-14) 2 commits
201
+ - transport: don't ignore git-receive-pack(1) exit code on atomic push
202
+ - t5504: modernize test by moving heredocs into test bodies
203
+
204
+ "git push --atomic --porcelain" used to ignore failures from the
205
+ other side, losing the error status from the child process, which
206
+ has been corrected.
207
+
208
+ Comments?
209
+ source: <20241113-pks-push-atomic-respect-exit-code-v1-0-7965f01e7f4e@pks.im>
210
+
211
+
212
+* sm/difftool (2024-11-13) 1 commit
213
+ - builtin/difftool: intialize some hashmap variables
214
+
215
+ Use of some uninitialized variables in "git difftool" has been
216
+ corrected.
217
+
218
+ Will merge to 'next'.
219
+ source: <20241112162320.818091-1-simon.marchi@polymtl.ca>
220
+
221
+
222
+* tb/multi-pack-reuse-dupfix (2024-11-14) 2 commits
223
+ - pack-objects: only perform verbatim reuse on the preferred pack
224
+ - t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
225
+
226
+ Object reuse code based on multi-pack-index sent an unwanted copy
227
+ of object.
228
+
229
+ Will merge to 'next'.
230
+ source: <cover.1731518931.git.me@ttaylorr.com>
231
+
232
+--------------------------------------------------
233
+[Cooking]
234
+
235
* ps/ref-backend-migration-optim (2024-11-08) 10 commits
236
- reftable/block: optimize allocations by using scratch buffer
237
- reftable/block: rename `block_writer::buf` variable
@@ -70,17 +250,15 @@ Release tarballs are available at:
250
source: <20241108-pks-refs-optimize-migrations-v1-0-7fd37fa80e35@pks.im>
251
252
73
-* js/log-remerge-keep-ancestry (2024-11-11) 1 commit
253
+* js/log-remerge-keep-ancestry (2024-11-12) 1 commit
254
- log: --remerge-diff needs to keep around commit parents
255
256
"git log -p --remerge-diff --reverse" was completely broken.
257
78
- Comments?
79
- cf. <CABPp-BHauuserYU8t5ybn+ghqRb-c85qwwjLWVe-e5EC8sVVxQ@mail.gmail.com>
80
- source: <pull.1825.git.1731073435641.gitgitgadget@gmail.com>
258
+ Expecting a hopefully small and final reroll.
259
+ cf. <xmqqa5e5berx.fsf@gitster.g>
260
+ source: <pull.1825.v2.git.1731350009491.gitgitgadget@gmail.com>
261
82
---------------------------------------------------
83
-[Cooking]
262
263
* ps/reftable-iterator-reuse (2024-11-08) 9 commits
264
- refs/reftable: reuse iterators when reading refs
@@ -138,13 +316,14 @@ Release tarballs are available at:
316
source: <pull.1734.v2.git.1731073383564.gitgitgadget@gmail.com>
317
318
141
-* ps/leakfixes-part-10 (2024-11-07) 27 commits
319
+* ps/leakfixes-part-10 (2024-11-13) 28 commits
320
- t: remove TEST_PASSES_SANITIZE_LEAK annotations
321
- test-lib: unconditionally enable leak checking
322
- t: remove unneeded !SANITIZE_LEAK prerequisites
323
- t: mark some tests as leak free
324
- t5601: work around leak sanitizer issue
147
- - git-compat-util: drop `UNLEAK()` annotation
325
+ - git-compat-util: drop now-unused `UNLEAK()` macro
326
+ - global: drop `UNLEAK()` annotation
327
- t/helper: fix leaking commit graph in "read-graph" subcommand
328
- builtin/branch: fix leaking sorting options
329
- builtin/init-db: fix leaking directory paths
@@ -166,44 +345,25 @@ Release tarballs are available at:
345
- bisect: fix leaking good/bad terms when reading multipe times
346
- builtin/blame: fix leaking blame entries with `--incremental`
347
- Merge branch 'ps/leakfixes-part-9' into ps/leakfixes-part-10
169
- (this branch uses ps/leakfixes-part-9.)
348
349
Leakfixes.
350
173
- Needs review.
174
- source: <cover.1730901926.git.ps@pks.im>
175
-
176
-
177
-* ak/t1016-style (2024-11-03) 1 commit
178
- (merged to 'next' on 2024-11-05 at ee100e90d3)
179
- + t1016: clean up style
180
-
181
- Test modernization.
182
-
183
- Will merge to 'master'.
184
- source: <20241103135111.13508-1-algonell@gmail.com>
185
-
186
-
187
-* en/shallow-exclude-takes-a-ref-fix (2024-11-04) 2 commits
188
- (merged to 'next' on 2024-11-05 at 8c5d52930b)
189
- + doc: correct misleading descriptions for --shallow-exclude
190
- + upload-pack: fix ambiguous error message
191
-
192
- The "--shallow-exclude=<ref>" option to various history transfer
193
- commands takes a ref, not an arbitrary revision.
194
-
195
- Will merge to 'master'.
196
- source: <pull.1822.git.1730746964.gitgitgadget@gmail.com>
351
+ Will merge to 'next'?
352
+ source: <20241111-b4-pks-leak-fixes-pt10-v2-0-6154bf91f0b0@pks.im>
353
354
199
-* kh/sequencer-comment-char (2024-10-23) 1 commit
355
+* kh/sequencer-comment-char (2024-11-13) 3 commits
356
+ - sequencer: comment commit messages properly
357
+ - sequencer: comment `--reference` subject line properly
358
- sequencer: comment checked-out branch properly
359
360
The sequencer failed to honor core.commentString in some places.
361
204
- Expecting a reroll.
205
- cf. <c05e603f-1fd4-4ad2-ba03-21269f464ed2@gmail.com>
206
- source: <5267b9a9c8cc5cc66979117dc4c1e4d7329e2a03.1729704370.git.code@khaugsbakk.name>
362
+ Expecting a reroll to improve tests.
363
+ cf. <5ed77fab-678d-4a06-bbd0-ea25462a7562@gmail.com>
364
+ cf. <4c623fcf-01dd-4056-80c1-b3c860ab7f87@gmail.com>
365
+ cf. <711b59d7-e649-4031-8924-a16fb632b4d4@gmail.com>
366
+ source: <cover.1731406513.git.code@khaugsbakk.name>
367
368
369
* ds/full-name-hash (2024-11-04) 7 commits
@@ -224,12 +384,12 @@ Release tarballs are available at:
384
source: <pull.1823.git.1730775907.gitgitgadget@gmail.com>
385
386
227
-* jt/repack-local-promisor (2024-11-03) 5 commits
228
- - fixup! index-pack: repack local links into promisor packs
229
- - index-pack: repack local links into promisor packs
230
- - t5300: move --window clamp test next to unclamped
231
- - t0410: use from-scratch server
232
- - t0410: make test description clearer
387
+* jt/repack-local-promisor (2024-11-12) 4 commits
388
+ (merged to 'next' on 2024-11-13 at 895d633576)
389
+ + index-pack: repack local links into promisor packs
390
+ + t5300: move --window clamp test next to unclamped
391
+ + t0410: use from-scratch server
392
+ + t0410: make test description clearer
393
394
"git gc" discards any objects that are outside promisor packs that
395
are referred to by an object in a promisor pack, and we do not
@@ -237,8 +397,7 @@ Release tarballs are available at:
397
repository. Work it around by including these objects in the
398
referring promisor pack at the receiving end of the fetch.
399
240
- Will merge to 'next' when the CI breakage fixup is addressed.
241
- Breaks CI (with a known fix).
400
+ Will merge to 'master'.
401
source: <cover.1730491845.git.jonathantanmy@google.com>
402
403
@@ -309,21 +468,6 @@ Release tarballs are available at:
468
source: <20241109092739.14276-1-abhijeet.nkt@gmail.com>
469
470
312
-* ps/mingw-rename (2024-11-06) 3 commits
313
- (merged to 'next' on 2024-11-06 at 6dd2fffec7)
314
- + compat/mingw: support POSIX semantics for atomic renames
315
- + compat/mingw: allow deletion of most opened files
316
- + compat/mingw: share file handles created via `CreateFileW()`
317
-
318
- Teaches the MinGW compatibility layer to support POSIX semantics for
319
- atomic renames when other process(es) have a file opened at the
320
- destination path.
321
-
322
- Will merge to 'master'.
323
- cf. <1483501d-d798-46d6-93f5-f5edaf915e99@kdbg.org>
324
- source: <cover.1730042775.git.ps@pks.im>
325
-
326
-
471
* ps/reftable-detach (2024-11-08) 8 commits
472
- reftable/system: provide thin wrapper for lockfile subsystem
473
- reftable/stack: drop only use of `get_locked_file_path()`
@@ -352,38 +496,6 @@ Release tarballs are available at:
496
source: <20241020173216.40852-2-ken@kmatsui.me>
497
498
355
-* ps/leakfixes-part-9 (2024-11-04) 22 commits
356
- (merged to 'next' on 2024-11-05 at 0260dbd8bd)
357
- + list-objects-filter-options: work around reported leak on error
358
- + builtin/merge: release output buffer after performing merge
359
- + dir: fix leak when parsing "status.showUntrackedFiles"
360
- + t/helper: fix leaking buffer in "dump-untracked-cache"
361
- + t/helper: stop re-initialization of `the_repository`
362
- + sparse-index: correctly free EWAH contents
363
- + dir: release untracked cache data
364
- + combine-diff: fix leaking lost lines
365
- + builtin/tag: fix leaking key ID on failure to sign
366
- + transport-helper: fix leaking import/export marks
367
- + builtin/commit: fix leaking cleanup config
368
- + trailer: fix leaking strbufs when formatting trailers
369
- + trailer: fix leaking trailer values
370
- + builtin/commit: fix leaking change data contents
371
- + upload-pack: fix leaking URI protocols
372
- + pretty: clear signature check
373
- + diff-lib: fix leaking diffopts in `do_diff_cache()`
374
- + revision: fix leaking bloom filters
375
- + builtin/grep: fix leak with `--max-count=0`
376
- + grep: fix leak in `grep_splice_or()`
377
- + t/helper: fix leaks in "reach" test tool
378
- + builtin/ls-remote: plug leaking server options
379
- (this branch is used by ps/leakfixes-part-10.)
380
-
381
- More leakfixes.
382
-
383
- Will merge to 'master'.
384
- source: <cover.1730786195.git.ps@pks.im>
385
-
386
-
499
* y5/diff-pager (2024-10-21) 1 commit
500
- diff: setup pager only before diff contents truly ready
501
@@ -395,11 +507,12 @@ Release tarballs are available at:
507
508
509
* la/trailer-info (2024-10-14) 1 commit
398
- - trailer: spread usage of "trailer_block" language
510
+ (merged to 'next' on 2024-11-13 at f038e226f6)
511
+ + trailer: spread usage of "trailer_block" language
512
400
- Refactoring.
513
+ Renaming a handful of variables and structure fields.
514
402
- Needs review.
515
+ Will merge to 'master'.
516
source: <pull.1811.git.git.1728820722580.gitgitgadget@gmail.com>
517
518
@@ -452,7 +565,7 @@ Release tarballs are available at:
565
source: <20241023153736.257733-1-bence@ferdinandy.com>
566
567
455
-* ps/build (2024-10-24) 21 commits
568
+* ps/build (2024-11-13) 19 commits
569
- meson: fix conflicts with in-flight topics
570
- Introduce support for the Meson build system
571
- Documentation: add comparison of build systems
@@ -472,13 +585,11 @@ Release tarballs are available at:
585
- Makefile: consistently use PERL_PATH
586
- Makefile: consistently use @PLACEHOLDER@ to substitute
587
- Makefile: use common template for GIT-BUILD-OPTIONS
475
- - Merge branch 'ps/platform-compat-fixes' into ps/build
476
- - Merge branch 'ps/upgrade-clar' into ps/build
588
589
Build procedure update plus introduction of Mason based builds
590
591
Under discussion.
481
- source: <cover.1729771605.git.ps@pks.im>
592
+ source: <20241112-pks-meson-v6-0-648b30996827@pks.im>
593
594
595
* ej/cat-file-remote-object-info (2024-11-11) 6 commits
@@ -546,20 +657,7 @@ Release tarballs are available at:
657
source: <cover.1729032373.git.steadmon@google.com>
658
659
549
-* jt/commit-graph-missing (2024-11-05) 2 commits
550
- (merged to 'next' on 2024-11-06 at b4dd083c2a)
551
- + fetch-pack: die if in commit graph but not obj db
552
- + Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"
553
-
554
- A regression where commit objects missing from a commit-graph can
555
- cause an infinite loop when doing a fetch in a partial clone has
556
- been fixed.
557
-
558
- Will merge to 'master'.
559
- source: <cover.1730833754.git.jonathantanmy@google.com>
560
-
561
-
562
-* kn/the-repository (2024-11-08) 9 commits
660
+* kn/the-repository (2024-11-12) 9 commits
661
- midx: add repository to `multi_pack_index` struct
662
- config: make `packed_git_(limit|window_size)` non-global variables
663
- config: make `delta_base_cache_limit` a non-global variable
@@ -572,6 +670,4 @@ Release tarballs are available at:
670
671
Various implicit uses of 'the_repoository' in the packfile code
672
have been eliminated.
575
-
576
- Needs review.
577
- source: <cover.1730976185.git.karthik.188@gmail.com>
673
+ source: <cover.1731323350.git.karthik.188@gmail.com>