What's cooking (2024/05 #11)
Junio C Hamano committed
May 27, 2024 at 19:11 UTC
aec7b672f84d3a53d4dae1eb0d3259940ef8d661
1 file changed
+80
-44
whats-cooking.txt
+80
-44
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #10; Fri, 24)
2
+Subject: What's cooking in git.git (May 2024, #11; Mon, 27)
3
X-master-at: b9cfe4845cb2562584837bc0101c0ab76490a239
4
-X-next-at: bbe1065a7e6f9ab964c30003b9eadf3a65c611d5
4
+X-next-at: bab1589fc04ad0202329dc933a2f485402c51dfa
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #10; Fri, 24)
7
+What's cooking in git.git (May 2024, #11; Mon, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -21,9 +21,10 @@ We unfortunately had serious regressions in 2.45.1 (and below, down
21
to 2.39 maintenance track are affected), and we are trying to assess
22
the extent of damage and which changes that went into the release to
23
revert. We know about "git lfs" and "git annex" getting affected.
24
-We have bunch of reverts planned to fix these regressions that I
25
-plan to merge to 'next' soonish. Please test it if you think you're
26
-affected.
24
+We have bunch of reverts planned to fix these regressions that are
25
+already in 'next'. Please test it if you think you're affected, so
26
+that we can have 2.45.2 and friends to fix these regressions early
27
+next month.
28
29
Copies of the source code to Git live in many repositories, and the
30
following is a list of the ones I push into or their mirrors. Some
@@ -56,6 +57,36 @@ Release tarballs are available at:
57
--------------------------------------------------
58
[New Topics]
59
60
+* ps/leakfixes-base (2024-05-27) 2 commits
61
+ (merged to 'next' on 2024-05-27 at bab1589fc0)
62
+ + t: mark a bunch of tests as leak-free
63
+ + ci: add missing dependency for TTY prereq
64
+ (this branch is used by ps/leakfixes.)
65
+
66
+ source: <cover.1716810168.git.ps@pks.im>
67
+
68
+
69
+* gt/t-hash-unit-test (2024-05-27) 2 commits
70
+ - t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash
71
+ - strbuf: introduce strbuf_addstrings() to repeatedly add a string
72
+
73
+ source: <20240526084345.24138-1-shyamthakkar001@gmail.com>
74
+
75
+
76
+* pp/add-parse-range-unit-test (2024-05-27) 1 commit
77
+ - apply: add unit tests for parse_range
78
+
79
+ source: <pull.1677.v2.git.git.1716710073910.gitgitgadget@gmail.com>
80
+
81
+
82
+* rs/difftool-env-simplify (2024-05-27) 1 commit
83
+ - difftool: add env vars directly in run_file_diff()
84
+
85
+ source: <c7c843b9-0ccf-4bcb-a036-d794729a99d6@web.de>
86
+
87
+--------------------------------------------------
88
+[Cooking]
89
+
90
* jc/format-patch-with-range-diff (2024-05-24) 2 commits
91
- format-patch: move range/inter diff at the end of a single patch output
92
- show_log: factor out interdiff/range-diff generation
@@ -87,16 +118,16 @@ Release tarballs are available at:
118
source: <20240524163926.2019648-1-christian.couder@gmail.com>
119
120
90
-* iw/trace-argv-on-alias (2024-05-24) 4 commits
91
- - fixup! run-command: show prepared command
121
+* iw/trace-argv-on-alias (2024-05-27) 4 commits
122
+ - SQUASH???
123
- run-command: show prepared command
124
- Documentation: alias: add notes on shell expansion
125
- Documentation: alias: rework notes into points
126
127
Log the alias-expanded command lines to the trace output.
128
98
- Expecting a (hopefully minor and final) reroll.
99
- source: <20240523043806.1223032-1-iwienand@redhat.com>
129
+ Comments?
130
+ source: <20240525234454.1489598-1-iwienand@redhat.com>
131
132
133
* ps/document-breaking-changes (2024-05-24) 1 commit
@@ -110,7 +141,7 @@ Release tarballs are available at:
141
source: <84c01f1b0a2d24d7de912606f548623601c0d715.1716555034.git.ps@pks.im>
142
143
113
-* ps/leakfixes (2024-05-24) 21 commits
144
+* ps/leakfixes (2024-05-27) 19 commits
145
- builtin/mv: fix leaks for submodule gitfile paths
146
- builtin/mv: refactor to use `struct strvec`
147
- builtin/mv duplicate string list memory
@@ -130,13 +161,12 @@ Release tarballs are available at:
161
- checkout: clarify memory ownership in `unique_tracking_name()`
162
- strbuf: fix leak when `appendwholeline()` fails with EOF
163
- transport-helper: fix leaking helper name
133
- - t: mark a bunch of tests as leak-free
134
- - ci: add missing dependency for TTY prereq
164
+ (this branch uses ps/leakfixes-base.)
165
166
Leakfixes.
167
138
- Will merge to 'next'?
139
- source: <cover.1716541556.git.ps@pks.im>
168
+ Will merge to 'next'.
169
+ source: <cover.1716810168.git.ps@pks.im>
170
171
172
* ps/ref-storage-migration (2024-05-24) 11 commits
@@ -157,6 +187,8 @@ Release tarballs are available at:
187
ref storage to use the reftable backend, with limitations.
188
189
Expecting a reroll.
190
+ With this in 'seen', "leaks" job at CI seems to fail.
191
+ cf. <xmqqwmniiqv2.fsf@gitster.g>
192
source: <cover.1716545235.git.ps@pks.im>
193
194
@@ -212,7 +244,8 @@ Release tarballs are available at:
244
245
246
* th/push-local-ff-check-without-lazy-fetch (2024-05-22) 1 commit
215
- - push: don't fetch commit object when checking existence
247
+ (merged to 'next' on 2024-05-25 at 520b6b2897)
248
+ + push: don't fetch commit object when checking existence
249
250
When "git push" notices that the commit at the tip of the ref on
251
the other side it is about to overwrite does not exist locally, it
@@ -220,21 +253,19 @@ Release tarballs are available at:
253
clone. The command has been taught not to do so and immediately
254
fail instead.
255
223
- Will merge to 'next'.
256
+ Will merge to 'master'.
257
source: <20240522201559.1677959-1-tom@compton.nu>
258
259
227
-* th/quiet-lazy-fetch-from-promisor (2024-05-24) 1 commit
260
+* th/quiet-lazy-fetch-from-promisor (2024-05-26) 1 commit
261
- promisor-remote: add promisor.quiet configuration option
262
263
The promisor.quiet configuration knob can be set to true to make
264
lazy fetching from promisor remotes silent.
265
233
- Comments?
234
- source: <20240524090937.2448229-1-tom@compton.nu>
266
+ Will merge to 'next'.
267
+ source: <20240525100927.2949808-1-tom@compton.nu>
268
236
---------------------------------------------------
237
-[Cooking]
269
270
* gt/unit-test-strcmp-offset (2024-05-20) 1 commit
271
(merged to 'next' on 2024-05-23 at f672ec425f)
@@ -259,35 +290,36 @@ Release tarballs are available at:
290
291
292
* jc/fix-2.45.1-and-friends-for-2.39 (2024-05-22) 12 commits
262
- - Revert "fsck: warn about symlink pointing inside a gitdir"
263
- - Revert "Add a helper function to compare file contents"
264
- - clone: drop the protections where hooks aren't run
265
- - tests: verify that `clone -c core.hooksPath=/dev/null` works again
266
- - Revert "core.hooksPath: add some protection while cloning"
267
- - init: use the correct path of the templates directory again
268
- - hook: plug a new memory leak
269
- - ci: stop installing "gcc-13" for osx-gcc
270
- - ci: avoid bare "gcc" for osx-gcc job
271
- - ci: drop mention of BREW_INSTALL_PACKAGES variable
272
- - send-email: avoid creating more than one Term::ReadLine object
273
- - send-email: drop FakeTerm hack
293
+ + Revert "fsck: warn about symlink pointing inside a gitdir"
294
+ + Revert "Add a helper function to compare file contents"
295
+ + clone: drop the protections where hooks aren't run
296
+ + tests: verify that `clone -c core.hooksPath=/dev/null` works again
297
+ + Revert "core.hooksPath: add some protection while cloning"
298
+ + init: use the correct path of the templates directory again
299
+ + hook: plug a new memory leak
300
+ + ci: stop installing "gcc-13" for osx-gcc
301
+ + ci: avoid bare "gcc" for osx-gcc job
302
+ + ci: drop mention of BREW_INSTALL_PACKAGES variable
303
+ + send-email: avoid creating more than one Term::ReadLine object
304
+ + send-email: drop FakeTerm hack
305
(this branch is used by jc/fix-2.45.1-and-friends-for-maint.)
306
307
Revert overly aggressive "layered defence" that went into 2.45.1
308
and friends, which broke "git-lfs", "git-annex", and other use
309
cases, so that we can rebuild necessary counterparts in the open.
310
280
- Needs consensus on what (more) to revert or adjust.
311
+ Will merge to 'master' and then prepare 2.45.2 and friends.
312
source: <20240521195659.870714-1-gitster@pobox.com>
313
314
315
* jc/fix-2.45.1-and-friends-for-maint (2024-05-24) 6 commits
285
- - Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
286
- - Merge branch 'fixes/2.45.1/2.43' into fixes/2.45.1/2.44
287
- - Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
288
- - Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
289
- - Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41
290
- - Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40
316
+ (merged to 'next' on 2024-05-25 at a090491028)
317
+ + Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint
318
+ + Merge branch 'fixes/2.45.1/2.43' into fixes/2.45.1/2.44
319
+ + Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43
320
+ + Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
321
+ + Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41
322
+ + Merge branch 'jc/fix-2.45.1-and-friends-for-2.39' into fixes/2.45.1/2.40
323
(this branch uses jc/fix-2.45.1-and-friends-for-2.39.)
324
325
Adjust jc/fix-2.45.1-and-friends-for-2.39 for more recent
@@ -297,13 +329,14 @@ Release tarballs are available at:
329
330
331
* ps/fix-reinit-includeif-onbranch (2024-05-22) 1 commit
300
- - setup: fix bug with "includeIf.onbranch" when initializing dir
332
+ (merged to 'next' on 2024-05-25 at 89c035186d)
333
+ + setup: fix bug with "includeIf.onbranch" when initializing dir
334
335
"git init" in an already created directory, when the user
336
configuration has includeif.onbranch, started to fail recently,
337
which has been corrected.
338
306
- Will merge to 'next'.
339
+ Will merge to 'master'.
340
source: <cf182bb9ee7d4a7eb46e5dbf4f3ef5deb198d823.1716374321.git.ps@pks.im>
341
342
@@ -360,7 +393,8 @@ Release tarballs are available at:
393
source: <pull.1729.v3.git.1715800868.gitgitgadget@gmail.com>
394
395
363
-* kn/update-ref-symref (2024-05-23) 7 commits
396
+* kn/update-ref-symref (2024-05-27) 8 commits
397
+ - SQUASH??? leakfix
398
- update-ref: add support for 'symref-update' command
399
- reftable: pick either 'oid' or 'target' for new updates
400
- update-ref: add support for 'symref-create' command
@@ -373,6 +407,8 @@ Release tarballs are available at:
407
symbolic-refs.
408
409
Needs review.
410
+ With this in 'seen', "leaks" job at CI seems to fail.
411
+ cf. <xmqqwmniiqv2.fsf@gitster.g>
412
source: <20240514124411.1037019-1-knayak@gitlab.com>
413
414