What's cooking (2024/12 #11)
Junio C Hamano committed
Dec 30, 2024 at 08:48 UTC
8765508c349a7c225a96d7c7a8bd2045945e5ff0
1 file changed
+89
-38
whats-cooking.txt
+89
-38
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2024, #10; Sat, 28)
3
-X-master-at: df2faf1a65fc821384e618b3c291a184fbed039e
4
-X-next-at: bfe548d87ed7786f06c2d9519f69c38ed47176e6
2
+Subject: What's cooking in git.git (Dec 2024, #11; Mon, 30)
3
+X-master-at: bc2c65770dca70c1d4e151fad971bc7c7235a702
4
+X-next-at: 8677dc54d23642379db0014f8fa76565a086b1d5
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2024, #10; Sat, 28)
7
+What's cooking in git.git (Dec 2024, #11; Mon, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +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
-Hopefully we can tag -rc1 40-hours+ from now.
20
+It has been a very slow week, and I expect this week will also be
21
+slow. Git 2.48-rc1 has been tagged. Hopefully we can have 2.48
22
+final around the end of next week.
23
24
Extra testing the tip of 'master' before we actually tag it is as
25
always very much appreciated.
@@ -51,36 +53,76 @@ Release tarballs are available at:
53
https://www.kernel.org/pub/software/scm/git/
54
55
--------------------------------------------------
54
-[Graduated to 'master']
56
+[New Topics]
57
56
-* as/gitk-git-gui-repo-update (2024-12-26) 1 commit
57
- (merged to 'next' on 2024-12-26 at 10b9e8227b)
58
- + Update the official repo of gitk
58
+* jk/lsan-race-with-barrier (2024-12-30) 5 commits
59
+ (merged to 'next' on 2024-12-30 at 3fc0e14928)
60
+ + grep: work around LSan threading race with barrier
61
+ + index-pack: work around LSan threading race with barrier
62
+ + thread-utils: introduce optional barrier type
63
+ + Revert "index-pack: spawn threads atomically"
64
+ + test-lib: use individual lsan dir for --stress runs
65
60
- The developer documentation has been updated to give the latest
61
- info on gitk and git-gui maintainer.
62
-
63
- source: <20241224122912.20666-2-ash@kambanaria.org>
66
+ CI jobs that run threaded programs under LSan has been giving false
67
+ positives from time to time, which has been worked around.
68
65
---------------------------------------------------
66
-[New Topics]
69
+ Will merge to 'master'.
70
+ source: <20241230042325.GA112439@coredump.intra.peff.net>
71
68
-* sk/strlen-returns-size_t (2024-12-26) 1 commit
69
- - date.c: Fix type missmatch warings from msvc
72
71
- Code clean-up.
73
+* ps/meson-weak-sha1-build (2024-12-30) 8 commits
74
+ - meson: provide a summary of configured backends
75
+ - meson: wire up unsafe SHA1 backend
76
+ - meson: add missing dots for build options
77
+ - meson: simplify conditions for HTTPS and SHA1 dependencies
78
+ - meson: require SecurityFramework when it's used as SHA1 backend
79
+ - meson: deduplicate access to SHA1/SHA256 backend options
80
+ - meson: consistenlty spell 'CommonCrypto'
81
+ - Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
82
+ (this branch uses ps/weak-sha1-for-tail-sum-fix.)
83
73
- The remainder needs to be reviewed.
74
- source: <20241223110407.3308-3-soekkle@freenet.de>
84
+ meson-based build now supports the unsafe-sha1 build knob.
85
+
86
+ Will merge to 'next'.
87
+ source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
88
+
89
+
90
+* ps/object-collision-check (2024-12-30) 1 commit
91
+ (merged to 'next' on 2024-12-30 at e083ea3154)
92
+ + object-file: fix race in object collision check
93
+
94
+ CI jobs gave sporadic failures, which turns out that that the
95
+ object finalization code was giving an error when it did not have
96
+ to.
97
+
98
+ Will merge to 'master'.
99
+ source: <20241230-b4-pks-object-file-racy-collision-check-v1-1-11571294e60a@pks.im>
100
+
101
+
102
+* ps/weak-sha1-for-tail-sum-fix (2024-12-30) 3 commits
103
+ (merged to 'next' on 2024-12-30 at c24783e99d)
104
+ + ci: exercise unsafe OpenSSL backend
105
+ + builtin/fast-import: fix segfault with unsafe SHA1 backend
106
+ + bulk-checkin: fix segfault with unsafe SHA1 backend
107
+ (this branch is used by ps/meson-weak-sha1-build.)
108
+
109
+ An earlier "csum-file checksum does not have to be computed with
110
+ sha1dc" topic had a few code paths that had initialized an
111
+ implementation of a hash function to be used by an unmatching hash
112
+ by mistake, which have been corrected.
113
+
114
+ Will merge to 'master'.
115
+ source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
116
117
+--------------------------------------------------
118
+[Graduated to 'master']
119
120
* ms/t7611-test-path-is-file (2024-12-27) 1 commit
121
(merged to 'next' on 2024-12-28 at b08a0c8e23)
122
+ t7611: replace test -f with test_path_is* helpers
123
124
Test modernization.
82
-
83
- Will merge to 'master'.
125
+
126
source: <20241227105345.10184-1-meetsoni3017@gmail.com>
127
128
@@ -91,10 +133,19 @@ Release tarballs are available at:
133
+ GIT-BUILD-OPTIONS: sort variables alphabetically
134
135
meson-based build without GitWeb failed the self tests.
94
-
95
- Will merge to 'master'.
136
source: <20241227-b4-pks-meson-wo-gitweb-v1-0-14ca8515bb3b@pks.im>
137
138
+--------------------------------------------------
139
+[Cooking]
140
+
141
+* sk/strlen-returns-size_t (2024-12-26) 1 commit
142
+ - date.c: Fix type missmatch warings from msvc
143
+
144
+ Code clean-up.
145
+
146
+ The remainder needs to be reviewed.
147
+ source: <20241223110407.3308-3-soekkle@freenet.de>
148
+
149
150
* ps/more-sign-compare (2024-12-27) 10 commits
151
- sign-compare: avoid comparing ptrdiff with an int/unsigned
@@ -110,21 +161,20 @@ Release tarballs are available at:
161
162
More -Wsign-compare fixes.
163
113
- Expecting a reroll?
114
- cf. <Z2-2dbYVuuLxpNmK@pks.im>
164
+ Will merge to 'next'.
165
cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
166
source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>
167
168
119
-* as/long-option-help-i18n (2024-12-28) 2 commits
120
- - SQUASH???
121
- - parse-options: localize mark-up of placeholder text in the short help
169
+* as/long-option-help-i18n (2024-12-30) 1 commit
170
+ (merged to 'next' on 2024-12-30 at 900c79808f)
171
+ + parse-options: localize mark-up of placeholder text in the short help
172
173
Tweak the help text used for the option value placeholders by
174
parse-options API so that translations can customize the "<>"
175
placeholder signal (e.g. "--option=<value>").
176
127
- Will merge to 'next' after squashing the fix-up in?
177
+ Will cook in 'next'.
178
source: <20241228114221.10351-4-ash@kambanaria.org>
179
180
@@ -134,22 +184,23 @@ Release tarballs are available at:
184
A new periodic maintenance task to run "git remote prune" has been
185
introduced.
186
137
- Will merge to 'next'?
187
+ Expecting a reroll.
188
+ cf. <Z3JLdIG4C9D2-1ZT@pks.im>
189
source: <pull.1838.v2.git.1735380461980.gitgitgadget@gmail.com>
190
140
---------------------------------------------------
141
-[Cooking]
191
192
* rs/reftable-realloc-errors (2024-12-28) 4 commits
144
- - t-reftable-merged: handle realloc errors
145
- - reftable: handle realloc error in parse_names()
146
- - reftable: fix allocation count on realloc error
147
- - reftable: avoid leaks on realloc error
193
+ (merged to 'next' on 2024-12-30 at ebc9625a4c)
194
+ + t-reftable-merged: handle realloc errors
195
+ + reftable: handle realloc error in parse_names()
196
+ + reftable: fix allocation count on realloc error
197
+ + reftable: avoid leaks on realloc error
198
199
The custom allocator code in the reftable library did not handle
200
failing realloc() very well, which has been addressed.
201
152
- Will merge to 'next'?
202
+ Will merge to 'master'?
203
+ cf. <Z3JLdIG4C9D2-1ZT@pks.im>
204
source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>
205
206