1
1
2
- Subject: What's cooking in git.git (Dec 2024, #08; Mon, 23 )
3
- X-master-at: 996f0c583b36aa5d6c6308285aea1421eb7efae7
4
- X-next-at: 73897bcc729bd26ea18552b27e1ed5ffad93a951
2
+ Subject: What's cooking in git.git (Dec 2024, #09; Thu, 26 )
3
+ X-master-at: 76cf4f61c87855ebf0784b88aaf737d6b09f504b
4
+ X-next-at: b6c66824c156363e934b3d989fb123efb1a9c63d
5
5
6
6
7
- What's cooking in git.git (Dec 2024, #08; Mon, 23 )
7
+ What's cooking in git.git (Dec 2024, #09; Thu, 26 )
8
8
--------------------------------------------------
9
9
10
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,11 +17,14 @@ 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
- Let's wait for git-gui, gitk, and possibly po/ and delay the tagging
21
- of the -rc1. Many people are already offline for the end-of-year
22
- holidays and it is a slow week, and 'master' front has too many new
23
- things graduated from 'next' a bit too early for me to feel
24
- comfortable.
20
+ Let's wait for gitk and possibly po/ and delay the tagging of the
21
+ -rc1. Many people are already offline for the end-of-year holidays
22
+ and it is a slow week, and 'master' front has too many new things
23
+ graduated from 'next' a bit too early for me to feel comfortable.
24
+
25
+ Extra testing the tip of 'master' before we actually tag it is as
26
+ always very much appreciated. Right now, the optional meson-based
27
+ build does not pass gitweb tests, IIUC.
25
28
26
29
Copies of the source code to Git live in many repositories, and the
27
30
following is a list of the ones I push into or their mirrors. Some
@@ -52,231 +55,33 @@ Release tarballs are available at:
52
55
https://www.kernel.org/pub/software/scm/git/
53
56
54
57
--------------------------------------------------
55
- [Graduated to 'master']
56
-
57
- * as/show-index-uninitialized-hash (2024-11-11) 2 commits
58
- (merged to 'next' on 2024-12-16 at b54e9a56f0)
59
- + t5300: add test for 'show-index --object-format'
60
- + show-index: fix uninitialized hash function
61
-
62
- Regression fix for 'show-index' when run outside of a repository.
63
-
64
-
65
-
66
- * jk/prio-queue-sign-compare-fix (2024-12-20) 1 commit
67
- (merged to 'next' on 2024-12-21 at 11a5c3d11f)
68
- + prio-queue: use size_t rather than int for size
69
-
70
- Type clean-up.
71
-
72
-
73
-
74
- * js/github-windows-setup-fix (2024-12-17) 1 commit
75
- (merged to 'next' on 2024-12-17 at 6d59340ec5)
76
- + GitHub ci(windows): speed up initializing Git for Windows' minimal SDK again
77
-
78
- Revert recent changes to the way windows environment is set up for
79
- GitHub CI.
80
-
81
-
58
+ [New Topics]
82
59
83
- * js/mingw-rename-fix (2024-12-17 ) 1 commit
84
- (merged to 'next' on 2024-12-17 at 57dc9a0ebb )
85
- + mingw_rename: do support directory renames
60
+ * as/gitk-git-gui-repo-update (2024-12-26 ) 1 commit
61
+ (merged to 'next' on 2024-12-26 at 10b9e8227b )
62
+ + Update the official repo of gitk
86
63
87
- Update the way rename() emulation on Windows handle directories to
88
- correct an earlier attempt to do the same.
89
-
64
+ The developer documentation has been updated to give the latest
65
+ info on gitk and git-gui maintainer.
90
66
67
+ Will merge to 'master'.
68
+
91
69
92
- * js/ps-build-cmake-fixup (2024-12-17) 5 commits
93
- (merged to 'next' on 2024-12-17 at 653a20d2f5)
94
- + cmake/vcxproj: stop special-casing `remote-ext`
95
- + cmake: put the Perl modules into the correct location again
96
- + cmake: use the correct file name for the Perl header
97
- + cmake(mergetools): better support for out-of-tree builds
98
- + cmake: better support for out-of-tree builds follow-up
99
70
100
- Build fixes for Windows.
101
-
71
+ * rs/reftable-realloc-errors (2024-12-26) 4 commits
72
+ - t-reftable-merged: check realloc errors
73
+ - reftable: handle realloc error in parse_names()
74
+ - reftable: fix allocation count on realloc error
75
+ - reftable: avoid leaks on realloc error
102
76
77
+ The custom allocator code in the reftable library did not handle
78
+ failing realloc() very well, which has been addressed.
103
79
104
- * js/range-diff-diff-merges (2024-12-16) 3 commits
105
- (merged to 'next' on 2024-12-18 at 47394ea998)
106
- + range-diff: introduce the convenience option `--remerge-diff`
107
- + range-diff: optionally include merge commits' diffs in the analysis
108
- + Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges
109
-
110
- "git range-diff" learned to optionally show and compare merge
111
- commits in the ranges being compared, with the --diff-merges
112
- option.
113
-
114
-
115
-
116
- * kl/doc-build-fix (2024-12-17) 1 commit
117
- (merged to 'next' on 2024-12-21 at d6f8295805)
118
- + doc: remove extra quotes in generated docs
119
-
120
- Build fix.
121
-
122
-
123
-
124
- * kn/reflog-migration (2024-12-20) 10 commits
125
- (merged to 'next' on 2024-12-22 at b75456bef5)
126
- + refs: mark invalid refname message for translation
127
- (merged to 'next' on 2024-12-18 at 5634446b20)
128
- + refs: add support for migrating reflogs
129
- + refs: allow multiple reflog entries for the same refname
130
- + refs: introduce the `ref_transaction_update_reflog` function
131
- + refs: add `committer_info` to `ref_transaction_add_update()`
132
- + refs: extract out refname verification in transactions
133
- + refs/files: add count field to ref_lock
134
- + refs: add `index` field to `struct ref_udpate`
135
- + refs: include committer info in `ref_update` struct
136
- + Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migration
137
- (this branch uses kn/reftable-writer-log-write-verify.)
138
-
139
- "git refs migrate" learned to also migrate the reflog data across
140
- backends.
141
- source: <20241216-320-git-refs-migrate-reflogs-v4-0-d7cd3f197453@gmail.com>
142
-
143
-
144
-
145
- * kn/reftable-writer-log-write-verify (2024-12-07) 1 commit
146
- (merged to 'next' on 2024-12-15 at 7e6b58d98e)
147
- + reftable/writer: ensure valid range for log's update_index
148
- (this branch is used by kn/reflog-migration.)
149
-
150
- Reftable backend adds check for upper limit of log's update_index.
151
- source: <20241206-424-reftable-writer-add-check-for-limits-v2-1-82ca350b10be@gmail.com>
152
-
153
-
154
- * ma/asciidoctor-build-fixes (2024-12-20) 4 commits
155
- (merged to 'next' on 2024-12-22 at 7a2aad750e)
156
- + asciidoctor-extensions.rb.in: inject GIT_DATE
157
- + asciidoctor-extensions.rb.in: add missing word
158
- + asciidoctor-extensions.rb.in: delete existing <refmiscinfo/>
159
- + Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixes
160
- (this branch uses ps/build-hotfix.)
161
-
162
- A topic to optionally build with meson, which has graduated to
163
- 'master' recently, broke Documentation pipeline with asciidoctor
164
- for the normal Makefile build as well as meson-based one, which
165
- have been corrected.
166
-
167
-
168
-
169
-
170
- * ps/build-hotfix (2024-12-20) 6 commits
171
- (merged to 'next' on 2024-12-22 at 0d4dfd121e)
172
- + meson: add options to override build information
173
- + GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
174
- + GIT-VERSION-GEN: fix overriding GIT_VERSION
175
- + Makefile: introduce template for GIT-VERSION-GEN
176
- + Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs
177
- + Makefile: stop including "GIT-VERSION-FILE" in docs
178
- (this branch is used by ma/asciidoctor-build-fixes.)
179
-
180
- A topic to optionally build with meson, which has graduated to
181
- 'master' recently, has regressed the normal Makefile build, which
182
- is being corrected.
183
- source: <20241220-b4-pks-git-version-via-environment-v3-0-1fd79b52a5fb@pks.im>
184
-
185
-
186
- * ps/build-meson-gitweb (2024-12-20) 1 commit
187
- (merged to 'next' on 2024-12-21 at f775554ea5)
188
- + meson: skip gitweb build when Perl is disabled
189
-
190
- meson-based build still tried to build and install gitweb even when
191
- Perl is disabled, which has been corrected.
192
- source: <20241220-b4-pks-meson-fix-gitweb-wo-perl-v2-1-18ab23dd6446@pks.im>
193
-
194
-
195
- * ps/build-sign-compare (2024-12-06) 16 commits
196
- (merged to 'next' on 2024-12-16 at 1ddb1485df)
197
- + t/helper: don't depend on implicit wraparound
198
- + scalar: address -Wsign-compare warnings
199
- + builtin/patch-id: fix type of `get_one_patchid()`
200
- + builtin/blame: fix type of `length` variable when emitting object ID
201
- + gpg-interface: address -Wsign-comparison warnings
202
- + daemon: fix type of `max_connections`
203
- + daemon: fix loops that have mismatching integer types
204
- + global: trivial conversions to fix `-Wsign-compare` warnings
205
- + pkt-line: fix -Wsign-compare warning on 32 bit platform
206
- + csum-file: fix -Wsign-compare warning on 32-bit platform
207
- + diff.h: fix index used to loop through unsigned integer
208
- + config.mak.dev: drop `-Wno-sign-compare`
209
- + global: mark code units that generate warnings with `-Wsign-compare`
210
- + compat/win32: fix -Wsign-compare warning in "wWinMain()"
211
- + compat/regex: explicitly ignore "-Wsign-compare" warnings
212
- + git-compat-util: introduce macros to disable "-Wsign-compare" warnings
213
- (this branch is used by ps/the-repository.)
214
-
215
- Start working to make the codebase buildable with -Wsign-compare.
216
-
217
-
218
-
219
- * ps/ci-gitlab-update (2024-12-12) 4 commits
220
- (merged to 'next' on 2024-12-15 at e0ca818197)
221
- + ci/lib: fix "CI setup" sections with GitLab CI
222
- + ci/lib: do not interpret escape sequences in `group ()` arguments
223
- + ci/lib: remove duplicate trap to end "CI setup" group
224
- + gitlab-ci: update macOS images to Sonoma
225
-
226
- GitLab CI updates.
227
-
228
-
229
-
230
- * ps/ci-meson (2024-12-13) 10 commits
231
- (merged to 'next' on 2024-12-17 at fc95a5a9cb)
232
- + ci: wire up Meson builds
233
- + t: introduce compatibility options to clar-based tests
234
- + t: fix out-of-tree tests for some git-p4 tests
235
- + Makefile: detect missing Meson tests
236
- + meson: detect missing tests at configure time
237
- + t/unit-tests: rename clar-based unit tests to have a common prefix
238
- + Makefile: drop -DSUPPRESS_ANNOTATED_LEAKS
239
- + ci/lib: support custom output directories when creating test artifacts
240
- + Merge branch 'ps/build' into ps/ci-meson
241
- + Merge branch 'cw/worktree-extension' into ps/ci-meson
242
-
243
- The meson-build procedure is integrated into CI to catch and
244
- prevent bitrotting.
245
-
246
-
247
-
248
-
249
- * ps/reftable-alloc-failures-zalloc-fix (2024-12-22) 4 commits
250
- (merged to 'next' on 2024-12-22 at 92bc55b18e)
251
- + reftable/basics: return NULL on zero-sized allocations
252
- + reftable/stack: fix zero-sized allocation when there are no readers
253
- + reftable/merged: fix zero-sized allocation when there are no readers
254
- + reftable/stack: don't perform auto-compaction with less than two tables
255
-
256
- Recent reftable updates mistook a NULL return from a request for
257
- 0-byte allocation as OOM and died unnecessarily, which has been
258
- corrected.
259
- source: <20241222-b4-pks-reftable-oom-fix-without-readers-v2-0-19550090d15a@pks.im>
260
-
261
-
262
- * sk/calloc-not-malloc-plus-memset (2024-12-18) 1 commit
263
- (merged to 'next' on 2024-12-18 at 5af85a77f3)
264
- + git: use calloc instead of malloc + memset where possible
265
-
266
- Code clean-up.
267
-
268
-
269
-
270
- * tb/bitmap-fix-pack-reuse (2024-12-18) 1 commit
271
- (merged to 'next' on 2024-12-21 at 104463402b)
272
- + pack-bitmap.c: ensure pack validity for all reuse packs
273
-
274
- Code to reuse objects based on bitmap contents have been tightened
275
- to avoid race condition even when multiple packs are involved.
276
- source: <7fdbfadc04926efc094633b238a55168c92e3d58.1734117577.git.me@ttaylorr.com>
80
+ Needs review.
81
+
277
82
278
83
--------------------------------------------------
279
- [New Topics ]
84
+ [Cooking ]
280
85
281
86
* jc/show-index-h-update (2024-12-20) 1 commit
282
87
- show-index: the short help should say the command reads from its input
@@ -287,8 +92,6 @@ Release tarballs are available at:
287
92
Comments?
288
93
289
94
290
- --------------------------------------------------
291
- [Cooking]
292
95
293
96
* ps/the-repository (2024-12-18) 15 commits
294
97
- match-trees: stop using `the_repository`
0 commit comments