What's cooking (2025/01 #01)
Junio C Hamano committed
Jan 3, 2025 at 10:04 UTC
fae4c40e90f10851a15b8fd4a77e90e3977968ed
1 file changed
+137
-97
whats-cooking.txt
+137
-97
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2024, #11; Mon, 30)
3
-X-master-at: bc2c65770dca70c1d4e151fad971bc7c7235a702
4
-X-next-at: 8677dc54d23642379db0014f8fa76565a086b1d5
2
+Subject: What's cooking in git.git (Jan 2025, #01; Fri, 3)
3
+X-master-at: 1b4e9a5f8b5f048972c21fe8acafe0404096f694
4
+X-next-at: b3e6e7acbc16ce8a8986ee84b24ad7d97f6017c4
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2024, #11; Mon, 30)
7
+What's cooking in git.git (Jan 2025, #01; Fri, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -55,6 +55,71 @@ Release tarballs are available at:
55
--------------------------------------------------
56
[New Topics]
57
58
+* ja/doc-commit-markup-updates (2025-01-03) 3 commits
59
+ - doc: git-commit: migrate secondary files to new format
60
+ - doc: git-commit.txt: convert git commit config to new format
61
+ - doc: git-commit: apply new documentation guidelines
62
+
63
+ Doc updates.
64
+
65
+ source: <pull.1845.git.1735912046.gitgitgadget@gmail.com>
66
+
67
+
68
+* jc/doc-opt-tilde-expand (2025-01-03) 1 commit
69
+ (merged to 'next' on 2025-01-03 at b3e6e7acbc)
70
+ + gitcli.txt: typeset pathnames as monospace
71
+
72
+ Docfix.
73
+
74
+ Will merge to 'next' and then to 'master'.
75
+ source: <6e0abe96b60a94d4fdee15a45b7d53c2f44a0c69.1735903029.git.martin.agren@gmail.com>
76
+
77
+
78
+* mh/doc-windows-home-env (2025-01-03) 1 commit
79
+ (merged to 'next' on 2025-01-03 at 1d4db69ce0)
80
+ + git.txt: fix heading line of tildes
81
+
82
+ Docfix.
83
+
84
+ Will merge to 'next' and then to 'master'.
85
+ source: <50e47d14a8a0a2ca0dd158f01b833a28c7b46887.1735903029.git.martin.agren@gmail.com>
86
+
87
+
88
+* ps/ci-misc-updates (2025-01-03) 10 commits
89
+ - ci: remove stale code for Azure Pipelines
90
+ - ci: use latest Ubuntu release
91
+ - ci: stop special-casing for Ubuntu 16.04
92
+ - gitlab-ci: add linux32 job testing against i386
93
+ - gitlab-ci: remove the "linux-old" job
94
+ - github: simplify computation of the job's distro
95
+ - github: convert all Linux jobs to be containerized
96
+ - github: adapt containerized jobs to be rootless
97
+ - t7422: fix flaky test caused by buffered stdout
98
+ - t0060: fix EBUSY in MinGW when setting up runtime prefix
99
+
100
+ CI updates (containerization, dropping stale ones, etc.).
101
+
102
+ source: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im>
103
+
104
+--------------------------------------------------
105
+[Graduated to 'master']
106
+
107
+* jk/lsan-race-ignore-false-positive (2025-01-01) 5 commits
108
+ (merged to 'next' on 2025-01-02 at 7b5c9e281e)
109
+ + test-lib: ignore leaks in the sanitizer's thread code
110
+ + test-lib: check leak logs for presence of DEDUP_TOKEN
111
+ + test-lib: simplify leak-log checking
112
+ + test-lib: rely on logs to detect leaks
113
+ + Revert barrier-based LSan threading race workaround
114
+
115
+ CI jobs that run threaded programs under LSan has been giving false
116
+ positives from time to time, which has been worked around.
117
+
118
+ This is an alternative to the jk/lsan-race-with-barrier topic with
119
+ much smaller change to the production code.
120
+ source: <20250101201226.GA3304465@coredump.intra.peff.net>
121
+
122
+
123
* jk/lsan-race-with-barrier (2024-12-30) 5 commits
124
(merged to 'next' on 2024-12-30 at 3fc0e14928)
125
+ grep: work around LSan threading race with barrier
@@ -65,38 +130,27 @@ Release tarballs are available at:
130
131
CI jobs that run threaded programs under LSan has been giving false
132
positives from time to time, which has been worked around.
68
-
69
- Will merge to 'master'.
133
source: <20241230042325.GA112439@coredump.intra.peff.net>
134
135
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
-
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.
136
+* ps/build-meson-html (2024-12-27) 12 commits
137
+ (merged to 'next' on 2025-01-02 at 115458a58b)
138
+ + Documentation: wire up sanity checks for Meson
139
+ + t/Makefile: make "check-meson" work with Dash
140
+ + meson: install static files for HTML documentation
141
+ + meson: generate articles
142
+ + Documentation: refactor "howto-index.sh" for out-of-tree builds
143
+ + Documentation: refactor "api-index.sh" for out-of-tree builds
144
+ + meson: generate user manual
145
+ + Documentation: inline user-manual.conf
146
+ + meson: generate HTML pages for all man page categories
147
+ + meson: fix generation of merge tools
148
+ + meson: properly wire up dependencies for our docs
149
+ + meson: wire up support for AsciiDoctor
150
98
- Will merge to 'master'.
99
- source: <20241230-b4-pks-object-file-racy-collision-check-v1-1-11571294e60a@pks.im>
151
+ The build procedure based on meson learned to generate HTML
152
+ documention pages.
153
+ source: <20241227-b4-pks-meson-docs-v2-0-f61e63edbfa1@pks.im>
154
155
156
* ps/weak-sha1-for-tail-sum-fix (2024-12-30) 3 commits
@@ -110,33 +164,54 @@ Release tarballs are available at:
164
sha1dc" topic had a few code paths that had initialized an
165
implementation of a hash function to be used by an unmatching hash
166
by mistake, which have been corrected.
113
-
114
- Will merge to 'master'.
167
source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
168
169
+
170
+* rs/reftable-realloc-errors (2024-12-28) 4 commits
171
+ (merged to 'next' on 2024-12-30 at ebc9625a4c)
172
+ + t-reftable-merged: handle realloc errors
173
+ + reftable: handle realloc error in parse_names()
174
+ + reftable: fix allocation count on realloc error
175
+ + reftable: avoid leaks on realloc error
176
+
177
+ The custom allocator code in the reftable library did not handle
178
+ failing realloc() very well, which has been addressed.
179
+ cf. <Z3JLdIG4C9D2-1ZT@pks.im>
180
+ source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>
181
+
182
--------------------------------------------------
118
-[Graduated to 'master']
183
+[Cooking]
184
+
185
+* ps/meson-weak-sha1-build (2024-12-30) 8 commits
186
+ (merged to 'next' on 2025-01-01 at e01db872e4)
187
+ + meson: provide a summary of configured backends
188
+ + meson: wire up unsafe SHA1 backend
189
+ + meson: add missing dots for build options
190
+ + meson: simplify conditions for HTTPS and SHA1 dependencies
191
+ + meson: require SecurityFramework when it's used as SHA1 backend
192
+ + meson: deduplicate access to SHA1/SHA256 backend options
193
+ + meson: consistenlty spell 'CommonCrypto'
194
+ + Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
195
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
196
+ meson-based build now supports the unsafe-sha1 build knob.
197
124
- Test modernization.
125
-
126
- source: <20241227105345.10184-1-meetsoni3017@gmail.com>
198
+ Will cook in 'next'.
199
+ source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
200
201
129
-* ps/meson-test-wo-gitweb (2024-12-27) 3 commits
130
- (merged to 'next' on 2024-12-28 at 39938f41fd)
131
- + meson: enable auto-discovered "gitweb"
132
- + GIT-BUILD-OPTIONS: wire up NO_GITWEB option
133
- + GIT-BUILD-OPTIONS: sort variables alphabetically
202
+* ps/object-collision-check (2025-01-03) 3 commits
203
+ - object-file: retry linking file into place when occluding file vanishes
204
+ - object-file: rename variables in `check_collision()`
205
+ (merged to 'next' on 2024-12-30 at e083ea3154)
206
+ + object-file: fix race in object collision check
207
135
- meson-based build without GitWeb failed the self tests.
136
- source: <20241227-b4-pks-meson-wo-gitweb-v1-0-14ca8515bb3b@pks.im>
208
+ CI jobs gave sporadic failures, which turns out that that the
209
+ object finalization code was giving an error when it did not have
210
+ to.
211
+
212
+ source: <20241230-b4-pks-object-file-racy-collision-check-v1-1-11571294e60a@pks.im>
213
+ source: <20250103-b4-pks-object-file-racy-collision-check-v1-0-6ef9e2da1f87@pks.im>
214
138
---------------------------------------------------
139
-[Cooking]
215
216
* sk/strlen-returns-size_t (2024-12-26) 1 commit
217
- date.c: Fix type missmatch warings from msvc
@@ -148,20 +223,21 @@ Release tarballs are available at:
223
224
225
* ps/more-sign-compare (2024-12-27) 10 commits
151
- - sign-compare: avoid comparing ptrdiff with an int/unsigned
152
- - commit-reach: use `size_t` to track indices when computing merge bases
153
- - shallow: fix -Wsign-compare warnings
154
- - builtin/log: fix remaining -Wsign-compare warnings
155
- - builtin/log: use `size_t` to track indices
156
- - commit-reach: use `size_t` to track indices in `get_reachable_subset()`
157
- - commit-reach: use `size_t` to track indices in `remove_redundant()`
158
- - commit-reach: fix type of `min_commit_date`
159
- - commit-reach: fix index used to loop through unsigned integer
160
- - prio-queue: fix type of `insertion_ctr`
226
+ (merged to 'next' on 2025-01-01 at 41c78cf690)
227
+ + sign-compare: avoid comparing ptrdiff with an int/unsigned
228
+ + commit-reach: use `size_t` to track indices when computing merge bases
229
+ + shallow: fix -Wsign-compare warnings
230
+ + builtin/log: fix remaining -Wsign-compare warnings
231
+ + builtin/log: use `size_t` to track indices
232
+ + commit-reach: use `size_t` to track indices in `get_reachable_subset()`
233
+ + commit-reach: use `size_t` to track indices in `remove_redundant()`
234
+ + commit-reach: fix type of `min_commit_date`
235
+ + commit-reach: fix index used to loop through unsigned integer
236
+ + prio-queue: fix type of `insertion_ctr`
237
238
More -Wsign-compare fixes.
239
164
- Will merge to 'next'.
240
+ Will cook in 'next'.
241
cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
242
source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>
243
@@ -189,21 +265,6 @@ Release tarballs are available at:
265
source: <pull.1838.v2.git.1735380461980.gitgitgadget@gmail.com>
266
267
192
-* rs/reftable-realloc-errors (2024-12-28) 4 commits
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
-
202
- Will merge to 'master'?
203
- cf. <Z3JLdIG4C9D2-1ZT@pks.im>
204
- source: <f4677194-0a3a-4f07-b003-c0295b51c100@web.de>
205
-
206
-
268
* jc/show-index-h-update (2024-12-20) 1 commit
269
- show-index: the short help should say the command reads from its input
270
@@ -236,27 +297,6 @@ Release tarballs are available at:
297
source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
298
299
239
-* ps/build-meson-html (2024-12-27) 12 commits
240
- - Documentation: wire up sanity checks for Meson
241
- - t/Makefile: make "check-meson" work with Dash
242
- - meson: install static files for HTML documentation
243
- - meson: generate articles
244
- - Documentation: refactor "howto-index.sh" for out-of-tree builds
245
- - Documentation: refactor "api-index.sh" for out-of-tree builds
246
- - meson: generate user manual
247
- - Documentation: inline user-manual.conf
248
- - meson: generate HTML pages for all man page categories
249
- - meson: fix generation of merge tools
250
- - meson: properly wire up dependencies for our docs
251
- - meson: wire up support for AsciiDoctor
252
-
253
- The build procedure based on meson learned to generate HTML
254
- documention pages.
255
-
256
- Needs review. On hold.
257
- source: <20241227-b4-pks-meson-docs-v2-0-f61e63edbfa1@pks.im>
258
-
259
-
300
* jc/doc-attr-tree (2024-12-14) 1 commit
301
- doc: give attr.tree a bit more visibility
302