What's cooking (2024/09 #07)
Junio C Hamano committed
Sep 18, 2024 at 18:46 UTC
f4648afc558d1bac2e5a52e87f2feb622abcf799
1 file changed
+126
-148
whats-cooking.txt
+126
-148
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2024, #06; Mon, 16)
3
-X-master-at: 3969d78396e707c5a900dd5e15c365c54bef0283
4
-X-next-at: 625da3ddd7012469a8c79a2a1d31aeffc5154afe
2
+Subject: What's cooking in git.git (Sep 2024, #07; Wed, 18)
3
+X-master-at: 6531f31ef3bead57a3255fa08efa6e7553c5a9a7
4
+X-next-at: cf0dbffa2232233e2e6152dc28148e12ec9aa900
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2024, #06; Mon, 16)
7
+What's cooking in git.git (Sep 2024, #07; Wed, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,63 +45,85 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[New Topics]
50
+
51
+* jc/cmake-unit-test-updates (2024-09-18) 4 commits
52
+ - cmake: generalize the handling of the `UNIT_TEST_OBJS` list
53
+ - cmake: stop looking for `REFTABLE_TEST_OBJS` in the Makefile
54
+ - cmake: rename clar-related variables to avoid confusion
55
+ - Merge branch 'ps/reftable-exclude' into jc/cmake-unit-test-updates
56
+ (this branch uses ps/reftable-exclude.)
57
+
58
+ CMake adjustments for recent changes around unit tests.
59
+
60
+ Will merge to 'next'.
61
+ source: <pull.1797.git.1726687769585.gitgitgadget@gmail.com>
62
+
63
--------------------------------------------------
64
[Graduated to 'master']
65
51
-* ah/apply-3way-ours (2024-09-09) 1 commit
52
- (merged to 'next' on 2024-09-10 at 989ba9708b)
53
- + apply: support --ours, --theirs, and --union for three-way merges
66
+* es/chainlint-message-updates (2024-09-10) 3 commits
67
+ (merged to 'next' on 2024-09-11 at a3fd02a009)
68
+ + chainlint: reduce annotation noise-factor
69
+ + chainlint: make error messages self-explanatory
70
+ + chainlint: don't be fooled by "?!...?!" in test body
71
55
- "git apply --3way" learned to take "--ours" and other options.
56
-
57
- source: <20240909141109.3102-2-alexhenrie24@gmail.com>
72
+ The error messages from the test script checker have been improved.
73
+ source: <20240910041013.68948-1-ericsunshine@charter.net>
74
75
60
-* cp/unit-test-reftable-stack (2024-09-09) 6 commits
61
- (merged to 'next' on 2024-09-09 at 0dddbbb60d)
62
- + t-reftable-stack: add test for stack iterators
63
- + t-reftable-stack: add test for non-default compaction factor
64
- + t-reftable-stack: use reftable_ref_record_equal() to compare ref records
65
- + t-reftable-stack: use Git's tempfile API instead of mkstemp()
66
- + t: harmonize t-reftable-stack.c with coding guidelines
67
- + t: move reftable/stack_test.c to the unit testing framework
68
- (this branch is used by ps/reftable-alloc-failures and ps/reftable-exclude.)
76
+* jc/ci-upload-artifact-and-linux32 (2024-09-09) 1 commit
77
+ (merged to 'next' on 2024-09-11 at 62991bef5b)
78
+ + ci: remove 'Upload failed tests' directories' step from linux32 jobs
79
+ (this branch is used by jk/ci-linux32-update.)
80
70
- Another reftable test migrated to the unit-test framework.
71
-
72
- source: <20240908041632.4948-1-chandrapratap3519@gmail.com>
81
+ CI started failing completely for linux32 jobs, as the step to
82
+ upload failed test directory uses GitHub actions that is deprecated
83
+ and is now disabled. Remove the step so at least we will know if
84
+ the tests are passing.
85
+ source: <xmqqy140o2kb.fsf@gitster.g>
86
+
87
+
88
+* jk/ci-linux32-update (2024-09-13) 5 commits
89
+ (merged to 'next' on 2024-09-13 at e937339388)
90
+ + ci: add Ubuntu 16.04 job to GitLab CI
91
+ + ci: use regular action versions for linux32 job
92
+ + ci: use more recent linux32 image
93
+ + ci: unify ubuntu and ubuntu32 dependencies
94
+ + ci: drop run-docker scripts
95
+ (this branch uses jc/ci-upload-artifact-and-linux32.)
96
97
+ CI updates
98
+ source: <20240912094238.GA589050@coredump.intra.peff.net>
99
75
-* jc/range-diff-lazy-setup (2024-08-09) 2 commits
76
- (merged to 'next' on 2024-09-10 at 2e04a06b22)
77
- + remerge-diff: clean up temporary objdir at a central place
78
- + remerge-diff: lazily prepare temporary objdir on demand
100
80
- Code clean-up.
81
-
82
- source: <xmqqr0ax9vlk.fsf@gitster.g>
83
-
84
-
85
-* jk/ref-filter-trailer-fixes (2024-09-10) 10 commits
86
- (merged to 'next' on 2024-09-10 at ce7299fe2e)
87
- + ref-filter: fix leak with unterminated %(if) atoms
88
- + ref-filter: add ref_format_clear() function
89
- + ref-filter: fix leak when formatting %(push:remoteref)
90
- + ref-filter: fix leak with %(describe) arguments
91
- + ref-filter: fix leak of %(trailers) "argbuf"
92
- + ref-filter: store ref_trailer_buf data per-atom
93
- + ref-filter: drop useless cast in trailers_atom_parser()
94
- + ref-filter: strip signature when parsing tag trailers
95
- + ref-filter: avoid extra copies of payload/signature
96
- + t6300: drop newline from wrapped test title
97
-
98
- Bugfixes and leak plugging in "git for-each-ref --format=..." code
99
- paths.
100
-
101
- source: <20240909230758.GA921697@coredump.intra.peff.net>
101
+* ps/clar-unit-test (2024-09-10) 15 commits
102
+ (merged to 'next' on 2024-09-11 at ccc0289490)
103
+ + Makefile: rename clar-related variables to avoid confusion
104
+ (merged to 'next' on 2024-09-05 at 87fb0a399a)
105
+ + clar: add CMake support
106
+ + t/unit-tests: convert ctype tests to use clar
107
+ + t/unit-tests: convert strvec tests to use clar
108
+ + t/unit-tests: implement test driver
109
+ + Makefile: wire up the clar unit testing framework
110
+ + Makefile: do not use sparse on third-party sources
111
+ + Makefile: make hdr-check depend on generated headers
112
+ + Makefile: fix sparse dependency on GENERATED_H
113
+ + clar: stop including `shellapi.h` unnecessarily
114
+ + clar(win32): avoid compile error due to unused `fs_copy()`
115
+ + clar: avoid compile error with mingw-w64
116
+ + t/clar: fix compatibility with NonStop
117
+ + t: import the clar unit testing framework
118
+ + t: do not pass GIT_TEST_OPTS to unit tests with prove
119
+
120
+ Import clar unit tests framework libgit2 folks invented for our
121
+ use.
122
+ cf. <d5b1c95b-cbdc-4711-849e-c2cfc67787ee@gmail.com>
123
+ source: <cover.1725459142.git.ps@pks.im>
124
125
--------------------------------------------------
104
-[New Topics]
126
+[Cooking]
127
128
* jk/diag-unexpected-remote-helper-death (2024-09-14) 1 commit
129
(merged to 'next' on 2024-09-16 at f2aa29beac)
@@ -116,35 +138,53 @@ Release tarballs are available at:
138
139
140
* ak/typofixes (2024-09-16) 3 commits
119
- - cbtree: fix a typo
120
- - bloom: fix a typo
121
- - attr: fix a typo
141
+ (merged to 'next' on 2024-09-16 at 4bbdd5ce45)
142
+ + cbtree: fix a typo
143
+ + bloom: fix a typo
144
+ + attr: fix a typo
145
146
+ Trivial typofixes.
147
+
148
+ Will merge to 'master'.
149
source: <20240915230522.129253-1-algonell@gmail.com>
150
151
152
* jk/jump-quickfix-fixes (2024-09-16) 2 commits
127
- - git-jump: ignore deleted files in diff mode
128
- - git-jump: always specify column 1 for diff entries
153
+ (merged to 'next' on 2024-09-16 at 53aa9e5b22)
154
+ + git-jump: ignore deleted files in diff mode
155
+ + git-jump: always specify column 1 for diff entries
156
157
+ A few usability fixes to "git jump" (in contrib/).
158
+
159
+ Will merge to 'master'.
160
source: <20240915111119.GA2017770@coredump.intra.peff.net>
161
162
163
* jk/t9001-deflake (2024-09-16) 1 commit
134
- - t9001: use a more distinct fake BugID
164
+ (merged to 'next' on 2024-09-16 at 285ebc4223)
165
+ + t9001: use a more distinct fake BugID
166
167
+ Test fix.
168
+
169
+ Will merge to 'master'.
170
source: <20240915113115.GA2019070@coredump.intra.peff.net>
171
172
139
-* ps/apply-leakfix (2024-09-16) 6 commits
140
- - apply: refactor `struct image` to use a `struct strbuf`
141
- - apply: rename members that track line count and allocation length
142
- - apply: refactor code to drop `line_allocated`
143
- - apply: introduce macro and function to init images
144
- - apply: rename functions operating on `struct image`
145
- - apply: reorder functions to move image-related things together
173
+* ps/apply-leakfix (2024-09-17) 6 commits
174
+ (merged to 'next' on 2024-09-18 at 99e318345e)
175
+ + apply: refactor `struct image` to use a `struct strbuf`
176
+ + apply: rename members that track line count and allocation length
177
+ + apply: refactor code to drop `line_allocated`
178
+ + apply: introduce macro and function to init images
179
+ + apply: rename functions operating on `struct image`
180
+ + apply: reorder functions to move image-related things together
181
147
- source: <cover.1726470385.git.ps@pks.im>
182
+ "git apply" had custom buffer management code that predated before
183
+ use of strbuf got widespread, which has been updated to use strbuf,
184
+ which also plugged some memory leaks.
185
+
186
+ Will merge to 'master'.
187
+ source: <cover.1726567217.git.ps@pks.im>
188
189
190
* ps/leakfixes-part-7 (2024-09-16) 24 commits
@@ -174,6 +214,9 @@ Release tarballs are available at:
214
- Merge branch 'ps/leakfixes-part-6' into ps/leakfixes-part-7
215
(this branch uses ps/leakfixes-part-6.)
216
217
+ More leak-fixes.
218
+
219
+ Needs review.
220
source: <cover.1726484308.git.ps@pks.im>
221
222
@@ -208,10 +251,9 @@ Release tarballs are available at:
251
allocation function given to it may fail to allocate and to deal
252
with such an error.
253
254
+ Needs review.
255
source: <cover.1726489647.git.ps@pks.im>
256
213
---------------------------------------------------
214
-[Cooking]
257
258
* bb/unicode-width-table-16 (2024-09-12) 1 commit
259
(merged to 'next' on 2024-09-13 at 87dc391469)
@@ -257,35 +299,6 @@ Release tarballs are available at:
299
source: <xmqqmskbwe1a.fsf@gitster.g>
300
301
260
-* jc/ci-upload-artifact-and-linux32 (2024-09-09) 1 commit
261
- (merged to 'next' on 2024-09-11 at 62991bef5b)
262
- + ci: remove 'Upload failed tests' directories' step from linux32 jobs
263
- (this branch is used by jk/ci-linux32-update.)
264
-
265
- CI started failing completely for linux32 jobs, as the step to
266
- upload failed test directory uses GitHub actions that is deprecated
267
- and is now disabled. Remove the step so at least we will know if
268
- the tests are passing.
269
-
270
- Will merge to 'master'.
271
- source: <xmqqy140o2kb.fsf@gitster.g>
272
-
273
-
274
-* jk/ci-linux32-update (2024-09-13) 5 commits
275
- (merged to 'next' on 2024-09-13 at e937339388)
276
- + ci: add Ubuntu 16.04 job to GitLab CI
277
- + ci: use regular action versions for linux32 job
278
- + ci: use more recent linux32 image
279
- + ci: unify ubuntu and ubuntu32 dependencies
280
- + ci: drop run-docker scripts
281
- (this branch uses jc/ci-upload-artifact-and-linux32.)
282
-
283
- CI updates
284
-
285
- Will merge to 'master'.
286
- source: <20240912094238.GA589050@coredump.intra.peff.net>
287
-
288
-
302
* jk/interop-test-build-options (2024-09-12) 1 commit
303
(merged to 'next' on 2024-09-13 at 0ab66e77a1)
304
+ t/interop: allow per-version make options
@@ -352,19 +365,20 @@ Release tarballs are available at:
365
366
367
* ps/reftable-exclude (2024-09-16) 7 commits
355
- - refs/reftable: wire up support for exclude patterns
356
- - reftable/reader: make table iterator reseekable
357
- - t/unit-tests: introduce reftable library
358
- - Makefile: stop listing test library objects twice
359
- - builtin/receive-pack: fix exclude patterns when announcing refs
360
- - refs: properly apply exclude patterns to namespaced refs
361
- - Merge branch 'cp/unit-test-reftable-stack' into ps/reftable-exclude
362
- (this branch is used by ps/reftable-alloc-failures.)
368
+ (merged to 'next' on 2024-09-18 at 1f00fce314)
369
+ + refs/reftable: wire up support for exclude patterns
370
+ + reftable/reader: make table iterator reseekable
371
+ + t/unit-tests: introduce reftable library
372
+ + Makefile: stop listing test library objects twice
373
+ + builtin/receive-pack: fix exclude patterns when announcing refs
374
+ + refs: properly apply exclude patterns to namespaced refs
375
+ + Merge branch 'cp/unit-test-reftable-stack' into ps/reftable-exclude
376
+ (this branch is used by jc/cmake-unit-test-updates and ps/reftable-alloc-failures.)
377
378
The reftable backend learned to more efficiently handle exclude
379
patterns while enumerating the refs.
380
367
- Will merge to 'next'?
381
+ Will merge to 'master'.
382
source: <cover.1726476401.git.ps@pks.im>
383
384
@@ -381,16 +395,17 @@ Release tarballs are available at:
395
396
397
* jc/pass-repo-to-builtins (2024-09-13) 4 commits
384
- - add: pass in repo variable instead of global the_repository
385
- - builtin: remove USE_THE_REPOSITORY for those without the_repository
386
- - builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
387
- - builtin: add a repository parameter for builtin functions
398
+ (merged to 'next' on 2024-09-16 at 7711bb0214)
399
+ + add: pass in repo variable instead of global the_repository
400
+ + builtin: remove USE_THE_REPOSITORY for those without the_repository
401
+ + builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
402
+ + builtin: add a repository parameter for builtin functions
403
404
The convention to calling into built-in command implementation has
405
been updated to pass the repository, if known, together with the
406
prefix value.
407
393
- Will merge to 'next'?
408
+ Will merge to 'master'.
409
source: <pull.1778.v3.git.git.1726262177.gitgitgadget@gmail.com>
410
411
@@ -413,18 +428,6 @@ Release tarballs are available at:
428
source: <cover.1725651952.git.me@ttaylorr.com>
429
430
416
-* es/chainlint-message-updates (2024-09-10) 3 commits
417
- (merged to 'next' on 2024-09-11 at a3fd02a009)
418
- + chainlint: reduce annotation noise-factor
419
- + chainlint: make error messages self-explanatory
420
- + chainlint: don't be fooled by "?!...?!" in test body
421
-
422
- The error messages from the test script checker have been improved.
423
-
424
- Will merge to 'master'.
425
- source: <20240910041013.68948-1-ericsunshine@charter.net>
426
-
427
-
431
* ps/environ-wo-the-repository (2024-09-12) 21 commits
432
(merged to 'next' on 2024-09-16 at c08e3eb6b8)
433
+ environment: stop storing "core.notesRef" globally
@@ -496,7 +499,7 @@ Release tarballs are available at:
499
source: <cover.1725530720.git.ps@pks.im>
500
501
499
-* sj/ref-contents-check (2024-09-13) 5 commits
502
+* sj/ref-contents-check (2024-09-18) 5 commits
503
- ref: add symlink ref content check for files backend
504
- ref: add symref content check for files backend
505
- ref: add more strict checks for regular refs
@@ -507,6 +510,8 @@ Release tarballs are available at:
510
contents that have always been taken valid but something Git
511
wouldn't have written itself (e.g., missing terminating end-of-line
512
after the full object name).
513
+
514
+ Needs review.
515
source: <ZuRzCyjQFilGhj8j@ArchLinux>
516
517
@@ -534,33 +539,6 @@ Release tarballs are available at:
539
source: <cover.1723760847.git.me@ttaylorr.com>
540
541
537
-* ps/clar-unit-test (2024-09-10) 15 commits
538
- (merged to 'next' on 2024-09-11 at ccc0289490)
539
- + Makefile: rename clar-related variables to avoid confusion
540
- (merged to 'next' on 2024-09-05 at 87fb0a399a)
541
- + clar: add CMake support
542
- + t/unit-tests: convert ctype tests to use clar
543
- + t/unit-tests: convert strvec tests to use clar
544
- + t/unit-tests: implement test driver
545
- + Makefile: wire up the clar unit testing framework
546
- + Makefile: do not use sparse on third-party sources
547
- + Makefile: make hdr-check depend on generated headers
548
- + Makefile: fix sparse dependency on GENERATED_H
549
- + clar: stop including `shellapi.h` unnecessarily
550
- + clar(win32): avoid compile error due to unused `fs_copy()`
551
- + clar: avoid compile error with mingw-w64
552
- + t/clar: fix compatibility with NonStop
553
- + t: import the clar unit testing framework
554
- + t: do not pass GIT_TEST_OPTS to unit tests with prove
555
-
556
- Import clar unit tests framework libgit2 folks invented for our
557
- use.
558
-
559
- Will merge to 'master'.
560
- cf. <d5b1c95b-cbdc-4711-849e-c2cfc67787ee@gmail.com>
561
- source: <cover.1725459142.git.ps@pks.im>
562
-
563
-
542
* js/libgit-rust (2024-09-09) 7 commits
543
. SQUASH???
544
. Makefile: add option to build and test libgit-rs and libgit-rs-sys