1
1
2
- Subject: What's cooking in git.git (Jan 2025, #01; Fri, 3 )
3
- X-master-at: 1b4e9a5f8b5f048972c21fe8acafe0404096f694
4
- X-next-at: b3e6e7acbc16ce8a8986ee84b24ad7d97f6017c4
2
+ Subject: What's cooking in git.git (Jan 2025, #02; Mon, 6 )
3
+ X-master-at: b74ff38af58464688b211140b90ec90598d340c6
4
+ X-next-at: 9ec6785566993ea05d28010e7a742dc2d8f0daae
5
5
6
6
7
- What's cooking in git.git (Jan 2025, #01; Fri, 3 )
7
+ What's cooking in git.git (Jan 2025, #02; Mon, 6 )
8
8
--------------------------------------------------
9
9
10
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,12 +17,10 @@ topic without enough support may be discarded after a long period of
17
17
no activity (of course they can be resubmit when new interests
18
18
arise).
19
19
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.
20
+ Git 2.48-rc2 has been tagged. I expect there will be a few more
21
+ "finishing touches" before the final release is tagged later this
22
+ week. Extra testing the tip of 'master' before we actually tag it
23
+ is as always very much appreciated.
26
24
27
25
Copies of the source code to Git live in many repositories, and the
28
26
following is a list of the ones I push into or their mirrors. Some
@@ -53,17 +51,7 @@ Release tarballs are available at:
53
51
https://www.kernel.org/pub/software/scm/git/
54
52
55
53
--------------------------------------------------
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
-
66
-
54
+ [Graduated to 'master']
67
55
68
56
* jc/doc-opt-tilde-expand (2025-01-03) 1 commit
69
57
(merged to 'next' on 2025-01-03 at b3e6e7acbc)
@@ -84,8 +72,68 @@ Release tarballs are available at:
84
72
Will merge to 'next' and then to 'master'.
85
73
source: <50e47d14a8a0a2ca0dd158f01b833a28c7b46887.1735903029.git.martin.agren@gmail.com>
86
74
75
+ --------------------------------------------------
76
+ [New Topics]
77
+
78
+ * ja/doc-notes-markup-updates (2025-01-03) 1 commit
79
+ - doc: git-notes.txt: migrate to new documentation format
80
+
81
+ Doc mark-up updates.
82
+
83
+
84
+
85
+
86
+ * mb/t7110-use-test-path-helper (2025-01-03) 1 commit
87
+ - t7110: replace `test -f` with `test_path_is_*` helpers
88
+
89
+ Test modernization.
90
+
91
+ Will merge to 'next'.
92
+
93
+
94
+
95
+ * bf/fetch-set-head-config (2025-01-06) 1 commit
96
+ (merged to 'next' on 2025-01-06 at 841c3a38a6)
97
+ + fetch: fix erroneous set_head advice message
98
+
99
+ A hotfix on an advice messagge added during this cycle.
100
+
101
+ Will merge to 'master'.
102
+
103
+
104
+
105
+ * ja/doc-restore-markup-update (2025-01-04) 1 commit
106
+ - doc: git-restore: migrate to new style format
107
+
108
+ Doc mark-up updates.
109
+
110
+
87
111
88
- * ps/ci-misc-updates (2025-01-03) 10 commits
112
+
113
+ * ua/os-version-capability (2025-01-06) 4 commits
114
+ - version: introduce osversion.command config for os-version output
115
+ - connect: advertise OS version
116
+ - version: refactor get_uname_info()
117
+ - version: refactor redact_non_printables()
118
+
119
+ The value of "uname -s" is by default sent over the wire as a new
120
+ capability, with an opt-out for privacy-concious folks.
121
+
122
+
123
+
124
+ --------------------------------------------------
125
+ [Cooking]
126
+
127
+ * ja/doc-commit-markup-updates (2025-01-03) 3 commits
128
+ - doc: git-commit: migrate secondary files to new format
129
+ - doc: git-commit.txt: convert git commit config to new format
130
+ - doc: git-commit: apply new documentation guidelines
131
+
132
+ Doc updates.
133
+
134
+
135
+
136
+ * ps/ci-misc-updates (2025-01-06) 10 commits
89
137
- ci: remove stale code for Azure Pipelines
90
138
- ci: use latest Ubuntu release
91
139
- ci: stop special-casing for Ubuntu 16.04
@@ -98,90 +146,9 @@ Release tarballs are available at:
98
146
- t0060: fix EBUSY in MinGW when setting up runtime prefix
99
147
100
148
CI updates (containerization, dropping stale ones, etc.).
101
-
102
-
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
-
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
126
- + index-pack: work around LSan threading race with barrier
127
- + thread-utils: introduce optional barrier type
128
- + Revert "index-pack: spawn threads atomically"
129
- + test-lib: use individual lsan dir for --stress runs
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.
133
-
134
-
135
-
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
-
151
- The build procedure based on meson learned to generate HTML
152
- documention pages.
153
-
154
-
155
-
156
- * ps/weak-sha1-for-tail-sum-fix (2024-12-30) 3 commits
157
- (merged to 'next' on 2024-12-30 at c24783e99d)
158
- + ci: exercise unsafe OpenSSL backend
159
- + builtin/fast-import: fix segfault with unsafe SHA1 backend
160
- + bulk-checkin: fix segfault with unsafe SHA1 backend
161
- (this branch is used by ps/meson-weak-sha1-build.)
162
-
163
- An earlier "csum-file checksum does not have to be computed with
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.
167
-
149
+
168
150
169
151
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
-
180
-
181
-
182
- --------------------------------------------------
183
- [Cooking]
184
-
185
152
* ps/meson-weak-sha1-build (2024-12-30) 8 commits
186
153
(merged to 'next' on 2025-01-01 at e01db872e4)
187
154
+ meson: provide a summary of configured backends
@@ -199,18 +166,18 @@ Release tarballs are available at:
199
166
200
167
201
168
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()`
169
+ * ps/object-collision-check (2025-01-06) 4 commits
170
+ (merged to 'next' on 2025-01-06 at 540e2bae11)
171
+ + object-file: retry linking file into place when occluding file vanishes
172
+ + object-file: don't special-case missing source file in collision check
173
+ + object-file: rename variables in `check_collision()`
205
174
(merged to 'next' on 2024-12-30 at e083ea3154)
206
175
+ object-file: fix race in object collision check
207
176
208
177
CI jobs gave sporadic failures, which turns out that that the
209
178
object finalization code was giving an error when it did not have
210
179
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>
180
+ source: <20250106-b4-pks-object-file-racy-collision-check-v2-0-8b3984ecbb18@pks.im>
214
181
215
182
216
183
* sk/strlen-returns-size_t (2024-12-26) 1 commit
@@ -254,15 +221,14 @@ Release tarballs are available at:
254
221
255
222
256
223
257
- * sk/maintenance-remote-prune (2024-12-28 ) 1 commit
224
+ * sk/maintenance-remote-prune (2025-01-03 ) 1 commit
258
225
- maintenance: add prune-remote-refs task
259
226
260
227
A new periodic maintenance task to run "git remote prune" has been
261
228
introduced.
262
229
263
230
Expecting a reroll.
264
-
265
-
231
+
266
232
267
233
268
234
* jc/show-index-h-update (2024-12-20) 1 commit
@@ -309,7 +275,7 @@ Release tarballs are available at:
309
275
310
276
311
277
312
- * ps/3.0-remote-deprecation (2024-12-12 ) 6 commits
278
+ * ps/3.0-remote-deprecation (2025-01-06 ) 6 commits
313
279
- remote: announce removal of "branches/" and "remotes/"
314
280
- builtin/pack-redundant: remove subcommand with breaking changes
315
281
- ci: repurpose "linux-gcc" job for deprecations
@@ -322,8 +288,7 @@ Release tarballs are available at:
322
288
$GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
323
289
remotes.
324
290
325
- Needs review.
326
- source: <20241211-pks-remote-branches-deprecation-v1-0-1431e2369135@pks.im>
291
+ source: <20250106-pks-remote-branches-deprecation-v2-0-2ce87c053536@pks.im>
327
292
328
293
329
294
* cc/lop-remote (2024-12-07) 5 commits
0 commit comments