What's cooking (2025/01 #04)
Junio C Hamano committed
Jan 14, 2025 at 09:59 UTC
13b2e7ed634ec3333cbed99312f620b2aedec0d6
1 file changed
+158
-111
whats-cooking.txt
+158
-111
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2025, #03; Fri, 10)
3
-X-master-at: fbe8d3079d4a96aeb4e4529cc93cc0043b759a05
4
-X-next-at: d3603152ad074a50ed6022133a71b91a16cc7baf
2
+Subject: What's cooking in git.git (Jan 2025, #04; Tue, 14)
3
+X-master-at: 757161efcca150a9a96b312d9e780a071e601a03
4
+X-next-at: 85cc9f2d1ee4d65cb1edb00d4f56863185a53e0f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2025, #03; Fri, 10)
7
+What's cooking in git.git (Jan 2025, #04; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,8 +17,9 @@ 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
-Git 2.48.0 has been tagged. Thank you, everybody, for your hard
21
-work.
20
+Git 2.48.1 and other maintenance releases have been tagged and
21
+released. A handful of topics that were marked with "Will discard?"
22
+without seeing any further activity have been discarded.
23
24
There are quite a few topics that are listed here but without much
25
review activities. I'll review the notes below with list archive
@@ -54,55 +55,102 @@ Release tarballs are available at:
55
https://www.kernel.org/pub/software/scm/git/
56
57
--------------------------------------------------
57
-[Graduated to 'master']
58
-
59
-* bf/fetch-set-head-config (2025-01-06) 1 commit
60
- (merged to 'next' on 2025-01-06 at 841c3a38a6)
61
- + fetch: fix erroneous set_head advice message
62
-
63
- A hotfix on an advice message added during this cycle.
64
- source: <20250105161017.210412-1-bence@ferdinandy.com>
58
+[New Topics]
59
60
+* ak/instaweb-python-port-binding-fix (2025-01-10) 1 commit
61
+ - instaweb: fix ip binding for the python http.server
62
67
-* js/git-version-gen-update (2025-01-10) 1 commit
68
- (merged to 'next' on 2025-01-10 at e4c4bf6b44)
69
- + GIT-VERSION-GEN: allow it to be run in parallel
63
+ The "instaweb" bound only to local IP address without "--local" and
64
+ to all addresses with "--local", which was the other way around, when
65
+ using Python's http.server class, which has been corrected.
66
71
- Build regression fix.
72
-
73
- source: <pull.1850.v2.git.1736509717426.gitgitgadget@gmail.com>
67
+ Will merge to 'next'.
68
+ source: <20250110101346.30416-1-alecsk@gmail.com>
69
70
76
-* js/reftable-realloc-errors-fix (2025-01-08) 1 commit
77
- (merged to 'next' on 2025-01-08 at 5efe7e2f5d)
78
- + t-reftable-basics: allow for `malloc` to be `#define`d
71
+* bf/fetch-set-head-fix (2025-01-13) 1 commit
72
+ - fetch set_head: fix non-mirror remotes in bare repositories
73
80
- Last-minute fix to a recent update.
81
- source: <pull.1848.git.1736352005578.gitgitgadget@gmail.com>
74
+ Fetching into a bare repository incorrectly assumed it always used
75
+ a mirror layout when deciding to update remote-tracking HEAD, which
76
+ has been corrected.
77
78
+ Needs review.
79
+ source: <20250112165125.130400-1-bence@ferdinandy.com>
80
84
-* ps/build-sign-compare (2025-01-10) 2 commits
85
- (merged to 'next' on 2025-01-10 at 8b4d916cbf)
86
- + builtin/blame: fix out-of-bounds write with blank boundary commits
87
- + builtin/blame: fix out-of-bounds read with excessive `--abbrev`
81
89
- Last-minute fix for a regression in "git blame --abbrev=<length>"
90
- when insane <length> is specified; we used to correctly cap it to
91
- the hash output length but broke it during the cycle.
92
-
93
- source: <20250110-b4-pks-blame-truncate-hash-length-v3-0-e61f25b68f30@pks.im>
82
+* mh/doc-credential-helpers-with-pat (2025-01-10) 2 commits
83
+ - docs: discuss caching personal access tokens
84
+ - docs: list popular credential helpers
85
86
+ Document that it is insecure to use Personal Access Tokens, which
87
+ some hosting providers take as username/password, embedded in URLs.
88
96
-* sj/meson-perl-build-fix (2025-01-08) 1 commit
97
- (merged to 'next' on 2025-01-08 at cce5ed7397)
98
- + meson: fix perl dependencies
89
+ Will merge to 'next'.
90
+ source: <pull.1851.v2.git.1736549677.gitgitgadget@gmail.com>
91
+
92
+
93
+* ps/build-meson-fixes (2025-01-13) 10 commits
94
+ - ci: wire up Visual Studio build with Meson
95
+ - meson: fix compilation with Visual Studio
96
+ - meson: make the CSPRNG backend configurable
97
+ - meson: wire up generation of distribution archive
98
+ - meson: wire up fuzzers
99
+ - meson: wire up development environments
100
+ - meson: fix dependencies for generated headers
101
+ - GIT-VERSION-GEN: move default version into a separate file
102
+ - GIT-VERSION-GEN: simplify computing the dirty marker
103
+ - Merge branch 'ps/meson-weak-sha1-build' into ps/build-meson-fixes
104
+ (this branch uses ps/meson-weak-sha1-build.)
105
+
106
+ More build fixes and enhancements on meson based build procedure.
107
+ source: <20250113-b4-pks-meson-additions-v1-0-97f6a93f691d@pks.im>
108
+
109
+
110
+* ps/zlib-ng (2025-01-10) 9 commits
111
+ - compat/zlib: allow use of zlib-ng as backend
112
+ - git-zlib: cast away potential constness of `next_in` pointer
113
+ - compat/zlib: provide stubs for `deflateSetHeader()`
114
+ - compat/zlib: provide `deflateBound()` shim centrally
115
+ - git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
116
+ - compat: introduce new "zlib.h" header
117
+ - git-compat-util: drop `z_const` define
118
+ - compat: drop `uncompress2()` compatibility shim
119
+ - Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng
120
+ (this branch uses ps/meson-weak-sha1-build.)
121
+
122
+ The code paths to interact with zlib has been cleaned up in
123
+ preparation for building with zlib-ng.
124
+ source: <20250110-b4-pks-compat-drop-uncompress2-v1-0-965d0022a74d@pks.im>
125
+
126
+
127
+* rs/ref-fitler-used-atoms-value-fix (2025-01-13) 1 commit
128
+ - ref-filter: share bases and is_base_tips between formatting and sorting
129
+
130
+ "git branch --sort=..." and "git for-each-ref --format=... --sort=..."
131
+ did not work as expected with some atoms, which has been corrected.
132
+
133
+ cf. https://lore.kernel.org/git/20250113051700.GA767856@coredump.intra.peff.net/
134
+ source: <6b824f05-6f16-4cd9-85b7-3b8b236158b4@web.de>
135
+
136
+
137
+* tb/unsafe-hash-cleanup (2025-01-10) 8 commits
138
+ - hash.h: drop unsafe_ function variants
139
+ - csum-file: introduce hashfile_checkpoint_init()
140
+ - t/helper/test-hash.c: use unsafe_hash_algo()
141
+ - csum-file.c: use unsafe_hash_algo()
142
+ - hash.h: introduce `unsafe_hash_algo()`
143
+ - csum-file.c: extract algop from hashfile_checksum_valid()
144
+ - csum-file: store the hash algorithm as a struct field
145
+ - t/helper/test-tool: implement sha1-unsafe helper
146
100
- The build procedure in "meson" for the "perl/" hierarchy lacked
101
- necessary dependencies, which has been corrected.
102
- source: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org>
147
+ The API around choosing to use unsafe variant of SHA-1
148
+ implementation has been updated in an attempt to make it harder to
149
+ abuse.
150
+ source: <cover.1736363652.git.me@ttaylorr.com>
151
152
--------------------------------------------------
105
-[New Topics]
153
+[Cooking]
154
155
* dk/zsh-config-completion-fix (2025-01-06) 1 commit
156
(merged to 'next' on 2025-01-10 at efba7d534c)
@@ -110,20 +158,19 @@ Release tarballs are available at:
158
159
Completion script updates for zsh
160
113
- Will cook in 'next'.
161
+ Will merge to 'master'.
162
source: <pull.1860.v3.git.git.1736200026899.gitgitgadget@gmail.com>
163
164
117
-* en/object-name-with-funny-refname-fix (2025-01-06) 2 commits
165
+* en/object-name-with-funny-refname-fix (2025-01-13) 2 commits
166
- object-name: be more strict in parsing describe-like output
167
- object-name: fix resolution of object names containing curly braces
168
169
Extended SHA-1 expression parser did not work well when a branch
170
with an unusual name (e.g. "foo{bar") is involved.
171
124
- Expecting a reroll.
125
- cf. <CABPp-BHyWgu47mCDH_f_MkS4CMGh_OtX4K-YGFsB-fZvvaNJPQ@mail.gmail.com>
126
- source: <pull.1844.v2.git.1735949870.gitgitgadget@gmail.com>
172
+ Will merge to 'next'.
173
+ source: <pull.1844.v3.git.1736788417.gitgitgadget@gmail.com>
174
175
176
* sj/ref-consistency-checks-more (2025-01-06) 10 commits
@@ -151,7 +198,7 @@ Release tarballs are available at:
198
The code to check LSan results has been simplified and made more
199
robust.
200
154
- Will cook in 'next'.
201
+ Will merge to 'master'.
202
source: <20250107070409.GA584456@coredump.intra.peff.net>
203
204
@@ -161,7 +208,7 @@ Release tarballs are available at:
208
209
Test clean-up.
210
164
- Will cook in 'next'.
211
+ Will merge to 'master'.
212
source: <20250107071824.GA594237@coredump.intra.peff.net>
213
214
@@ -172,7 +219,7 @@ Release tarballs are available at:
219
A misconfigured "fsck.skiplist" configuration variable was not
220
diagnosed as an error, which has been corrected.
221
175
- Will cook in 'next'.
222
+ Will merge to 'master'.
223
source: <20250107162914.3756968-2-jltobler@gmail.com>
224
225
@@ -185,7 +232,7 @@ Release tarballs are available at:
232
get stuck; the callsite does not require cryptographic security.
233
Introduce the "insecure" mode and use it appropriately.
234
188
- Will cook in 'next'.
235
+ Will merge to 'master'.
236
source: <20250107-b4-pks-reftable-csprng-v1-0-6109a54a8756@pks.im>
237
238
@@ -203,16 +250,17 @@ Release tarballs are available at:
250
251
Doc markup fix.
252
206
- Will cook in 'next'.
253
+ Will merge to 'master'.
254
source: <20250107212421.7yyvuzw4uqxnqv7t@archP14s>
255
256
257
* sk/unit-test-hash (2025-01-09) 1 commit
211
- - t/unit-tests: convert hash to use clar test framework
258
+ (merged to 'next' on 2025-01-13 at 865b121824)
259
+ + t/unit-tests: convert hash to use clar test framework
260
261
Test update.
262
215
- Will merge to 'next'.
263
+ Will merge to 'master'.
264
source: <20250109140952.5267-1-kuforiji98@gmail.com>
265
266
@@ -222,7 +270,7 @@ Release tarballs are available at:
270
271
Docfix.
272
225
- Will cook in 'next'.
273
+ Will merge to 'master'.
274
source: <pull.1849.git.1736379323427.gitgitgadget@gmail.com>
275
276
@@ -246,26 +294,23 @@ Release tarballs are available at:
294
source: <20250109082723.GA2748497@coredump.intra.peff.net>
295
296
249
-* sc/help-autocorrect-one (2025-01-09) 1 commit
250
- - help: interpret help.autocorrect=1 as "immediate" rather than 0.1s
297
+* sc/help-autocorrect-one (2025-01-13) 1 commit
298
+ - help: interpret boolean string values for help.autocorrect
299
300
"[help] autocorrect = 1" used to be a way to say "please wait for
301
0.1 second after suggesting a typofix of the command name before
302
running that command"; now it means "yes, if there is a plausible
303
typofix for the command name, please run it immediately".
304
257
- Expecting a reroll.
258
- Almost there.
259
- source: <pull.1869.git.git.1736364707068.gitgitgadget@gmail.com>
305
+ Looking good except for "should 0 and false be 'tell it without doing it'?".
306
+ source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
307
261
---------------------------------------------------
262
-[Cooking]
308
264
-* ja/doc-notes-markup-updates (2025-01-03) 1 commit
265
- - doc: git-notes.txt: migrate to new documentation format
309
+* ja/doc-notes-markup-updates (2025-01-10) 1 commit
310
+ - doc: convert git-notes to new documentation format
311
312
Doc mark-up updates.
268
- source: <pull.1846.git.1735924216993.gitgitgadget@gmail.com>
313
+ source: <pull.1846.v2.git.1736503703573.gitgitgadget@gmail.com>
314
315
316
* mb/t7110-use-test-path-helper (2025-01-03) 1 commit
@@ -274,15 +319,15 @@ Release tarballs are available at:
319
320
Test modernization.
321
277
- Will cook in 'next'.
322
+ Will merge to 'master'.
323
source: <20250103130035.79376-1-matteobagnolini2003@gmail.com>
324
325
281
-* ja/doc-restore-markup-update (2025-01-04) 1 commit
282
- - doc: git-restore: migrate to new style format
326
+* ja/doc-restore-markup-update (2025-01-10) 1 commit
327
+ - doc: convert git-restore to new style format
328
329
Doc mark-up updates.
285
- source: <pull.1847.git.1735996601092.gitgitgadget@gmail.com>
330
+ source: <pull.1847.v2.git.1736503760086.gitgitgadget@gmail.com>
331
332
333
* ua/os-version-capability (2025-01-06) 4 commits
@@ -331,10 +376,11 @@ Release tarballs are available at:
376
+ meson: deduplicate access to SHA1/SHA256 backend options
377
+ meson: consistenlty spell 'CommonCrypto'
378
+ Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
379
+ (this branch is used by ps/build-meson-fixes and ps/zlib-ng.)
380
381
meson-based build now supports the unsafe-sha1 build knob.
382
337
- Will cook in 'next'.
383
+ Will merge to 'master'.
384
source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
385
386
@@ -350,7 +396,7 @@ Release tarballs are available at:
396
object finalization code was giving an error when it did not have
397
to.
398
353
- Will cook in 'next'.
399
+ Will merge to 'master'.
400
source: <20250106-b4-pks-object-file-racy-collision-check-v2-0-8b3984ecbb18@pks.im>
401
402
@@ -378,7 +424,7 @@ Release tarballs are available at:
424
425
More -Wsign-compare fixes.
426
381
- Will cook in 'next'.
427
+ Will merge to 'master'.
428
cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
429
source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>
430
@@ -391,7 +437,7 @@ Release tarballs are available at:
437
parse-options API so that translations can customize the "<>"
438
placeholder signal (e.g. "--option=<value>").
439
394
- Will cook in 'next'.
440
+ Will merge to 'master'.
441
source: <20241228114221.10351-4-ash@kambanaria.org>
442
443
@@ -436,7 +482,7 @@ Release tarballs are available at:
482
More code paths have a repository passed through the callchain,
483
instead of assuming the primary the_repository object.
484
439
- Will cook in 'next'.
485
+ Will merge to 'master'.
486
source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
487
488
@@ -509,22 +555,10 @@ Release tarballs are available at:
555
"git submodule" learned various ways to spell the same option,
556
e.g. "--branch=B" can be spelled "--branch B" or "-bB".
557
512
- Will cook in 'next'.
558
+ Will merge to 'master'.
559
source: <20241211063234.7610-1-royeldar0@gmail.com>
560
561
516
-* tb/unsafe-hash-test (2024-11-21) 2 commits
517
- - t/helper/test-tool: implement sha1-unsafe helper
518
- - t/helper/test-sha1: prepare for an unsafe mode
519
-
520
- Preliminary addition to the test tool to allow a plain SHA-1 hash
521
- algorithm without collision protection.
522
-
523
- Comments?
524
- cf. <xmqqr073antj.fsf@gitster.g>
525
- source: <cover.1730833506.git.me@ttaylorr.com>
526
-
527
-
562
* tb/incremental-midx-part-2 (2024-11-20) 15 commits
563
- midx: implement writing incremental MIDX bitmaps
564
- pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
@@ -611,50 +645,63 @@ Release tarballs are available at:
645
source: <pull.1818.v4.git.1734711675.gitgitgadget@gmail.com>
646
647
648
+* ej/cat-file-remote-object-info (2025-01-10) 8 commits
649
+ - cat-file: add remote-object-info to batch-command
650
+ - transport: add client support for object-info
651
+ - serve: advertise object-info feature
652
+ - fetch-pack: move fetch initialization
653
+ - fetch-pack: refactor packet writing
654
+ - cat-file: split test utility functions into a separate library file
655
+ - cat-file: add declaration of variable i inside its for loop
656
+ - git-compat-util: add strtoul_ul() with error handling
657
+
658
+ "git cat-file --batch" and friends can optionally ask a remote
659
+ server about objects it does not have.
660
+ source: <20250108183740.67022-1-eric.peijian@gmail.com>
661
+
662
+--------------------------------------------------
663
+[Discarded]
664
+
665
* km/config-remote-by-name (2024-10-21) 1 commit
615
- - config: support remote name in includeIf.hasconfig condition
666
+ . config: support remote name in includeIf.hasconfig condition
667
668
Support conditionally including configuration by remote name, instead
669
of just URL.
670
620
- Will discard?
671
+ Discarded.
672
source: <20241020173216.40852-2-ken@kmatsui.me>
673
674
675
* y5/diff-pager (2024-10-21) 1 commit
625
- - diff: setup pager only before diff contents truly ready
676
+ . diff: setup pager only before diff contents truly ready
677
678
Delay setting up the pager in 'git diff' until after the diff contents
679
itself is fully prepared.
680
630
- Will discard?
681
+ Discarded.
682
source: <pull.1817.git.git.1729370390416.gitgitgadget@gmail.com>
683
684
634
-* ej/cat-file-remote-object-info (2024-11-25) 6 commits
635
- - cat-file: add remote-object-info to batch-command
636
- - transport: add client support for object-info
637
- - serve: advertise object-info feature
638
- - fetch-pack: move fetch initialization
639
- - fetch-pack: refactor packet writing
640
- - cat-file: add declaration of variable i inside its for loop
685
+* js/libgit-rust (2024-10-16) 5 commits
686
+ . Makefile: add option to build and test libgit-rs and libgit-rs-sys
687
+ . libgit: add higher-level libgit crate
688
+ . libgit-sys: also export some config_set functions
689
+ . libgit-sys: introduce Rust wrapper for libgit.a
690
+ . common-main: split init and exit code into new files
691
642
- "git cat-file --batch" and friends can optionally ask a remote
643
- server about objects it does not have.
692
+ A rust binding to libgit.a functions has been introduced.
693
645
- Expecting a reroll.
646
- cf. <Z0RIrKwUnaWWm_gJ@pks.im>
647
- source: <20241125053616.25170-1-eric.peijian@gmail.com>
694
+ Discarded.
695
+ source: <cover.1729032373.git.steadmon@google.com>
696
697
650
-* js/libgit-rust (2024-10-16) 5 commits
651
- - Makefile: add option to build and test libgit-rs and libgit-rs-sys
652
- - libgit: add higher-level libgit crate
653
- - libgit-sys: also export some config_set functions
654
- - libgit-sys: introduce Rust wrapper for libgit.a
655
- - common-main: split init and exit code into new files
698
+* tb/unsafe-hash-test (2024-11-21) 2 commits
699
+ . t/helper/test-tool: implement sha1-unsafe helper
700
+ . t/helper/test-sha1: prepare for an unsafe mode
701
657
- A rust binding to libgit.a functions has been introduced.
702
+ Preliminary addition to the test tool to allow a plain SHA-1 hash
703
+ algorithm without collision protection.
704
659
- Will discard?
660
- source: <cover.1729032373.git.steadmon@google.com>
705
+ Superseded by tb/unsafe-hash-cleanup
706
+ cf. <Z4Km9QaGflwAI7tA@nand.local>
707
+ source: <cover.1730833506.git.me@ttaylorr.com>