What's cooking (2025/02 #01)
Junio C Hamano committed
Feb 4, 2025 at 16:03 UTC
6ffe58157f8cdec5de7add4d7e35065e9a38b870
1 file changed
+242
-267
whats-cooking.txt
+242
-267
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2025, #09; Fri, 31)
3
-X-master-at: 58b5801aa94ad5031978f8e42c1be1230b3d352f
4
-X-next-at: 6defb0235c6e7c46974d7d65de7530e559ddcf0c
2
+Subject: What's cooking in git.git (Feb 2025, #01; Tue, 4)
3
+X-master-at: bc204b742735ae06f65bb20291c95985c9633b7f
4
+X-next-at: 6bd1c91b067bc73fdcedcc85aa2367f340cf3a2b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jan 2025, #09; Fri, 31)
7
+What's cooking in git.git (Feb 2025, #01; Tue, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,111 +48,196 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* am/trace2-with-valueless-true (2025-01-23) 1 commit
52
- (merged to 'next' on 2025-01-23 at 7dc4bdaea8)
53
- + trace2: prevent segfault on config collection with valueless true
51
+* jk/combine-diff-cleanup (2025-01-09) 14 commits
52
+ (merged to 'next' on 2025-01-28 at 97e76074b3)
53
+ + tree-diff: make list tail-passing more explicit
54
+ + tree-diff: simplify emit_path() list management
55
+ + tree-diff: use the name "tail" to refer to list tail
56
+ + tree-diff: drop list-tail argument to diff_tree_paths()
57
+ + combine-diff: drop public declaration of combine_diff_path_size()
58
+ + tree-diff: inline path_appendnew()
59
+ + tree-diff: pass whole path string to path_appendnew()
60
+ + tree-diff: drop path_appendnew() alloc optimization
61
+ + run_diff_files(): de-mystify the size of combine_diff_path struct
62
+ + diff: add a comment about combine_diff_path.parent.path
63
+ + combine-diff: use pointer for parent paths
64
+ + tree-diff: clear parent array in path_appendnew()
65
+ + combine-diff: add combine_diff_path_new()
66
+ + run_diff_files(): delay allocation of combine_diff_path
67
55
- The trace2 code was not prepared to show a configuration variable
56
- that is set to true using the valueless true syntax, which has been
57
- corrected.
58
- source: <pull.1814.v2.git.1736494100622.gitgitgadget@gmail.com>
68
+ Code clean-up for code paths around combined diff.
69
+ source: <20250109082723.GA2748497@coredump.intra.peff.net>
70
71
61
-* ds/path-walk-1 (2025-01-22) 8 commits
62
- (merged to 'next' on 2025-01-23 at 1d3743f005)
63
- + path-walk: drop redundant parse_tree() call
64
- (merged to 'next' on 2025-01-22 at 3171845b73)
65
- + path-walk: reorder object visits
66
- + path-walk: mark trees and blobs as UNINTERESTING
67
- + path-walk: visit tags and cached objects
68
- + path-walk: allow consumer to specify object types
69
- + t6601: add helper for testing path-walk API
70
- + test-lib-functions: add test_cmp_sorted
71
- + path-walk: introduce an object walk by path
72
- (this branch is used by ds/backfill.)
72
+* kn/pack-write-with-reduced-globals (2025-01-21) 5 commits
73
+ (merged to 'next' on 2025-01-28 at bb5f4b8547)
74
+ + pack-write: pass hash_algo to internal functions
75
+ + pack-write: pass hash_algo to `write_rev_file()`
76
+ + pack-write: pass hash_algo to `write_idx_file()`
77
+ + pack-write: pass repository to `index_pack_lockfile()`
78
+ + pack-write: pass hash_algo to `fixup_pack_header_footer()`
79
74
- Introduce a new API to visit objects in batches based on a common
75
- path, or by type.
76
- cf. <Z4jeQSLmARruE5l3@pks.im>
77
- source: <pull.1818.v4.git.1734711675.gitgitgadget@gmail.com>
80
+ Code clean-up.
81
+ source: <20250119-kn-the-repo-cleanup-v3-0-a495fce08d71@gmail.com>
82
83
80
-* ja/doc-commit-markup-updates (2025-01-15) 5 commits
81
- (merged to 'next' on 2025-01-23 at aa9235f015)
82
- + doc: migrate git-commit manpage secondary files to new format
83
- + doc: convert git commit config to new format
84
- + doc: make more direct explanations in git commit options
85
- + doc: the mode param of -u of git commit is optional
86
- + doc: apply new documentation guidelines to git commit
84
+* kn/reflog-migration-fix (2025-01-15) 1 commit
85
+ (merged to 'next' on 2025-01-16 at ae8f9ce9a0)
86
+ + reftable: write correct max_update_index to header
87
+ (this branch is used by kn/reflog-migration-fix-fix and kn/reflog-migration-fix-followup.)
88
88
- Doc updates.
89
- source: <pull.1845.v2.git.1736972628.gitgitgadget@gmail.com>
89
+ "git refs migrate" for migrating reflog data was broken.
90
+ source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>
91
92
92
-* ja/doc-notes-markup-updates (2025-01-10) 1 commit
93
- (merged to 'next' on 2025-01-24 at d02f3c8a9c)
94
- + doc: convert git-notes to new documentation format
93
+* kn/reflog-migration-fix-fix (2025-01-27) 1 commit
94
+ (merged to 'next' on 2025-01-28 at e70c392ca2)
95
+ + refs/reftable: fix uninitialized memory access of `max_index`
96
+ (this branch uses kn/reflog-migration-fix.)
97
96
- Doc mark-up updates.
97
- source: <pull.1846.v2.git.1736503703573.gitgitgadget@gmail.com>
98
+ Fix bugs in an earlier attempt to fix "git refs migration".
99
+ source: <Z4UbkcmJAU1MT-Rs@tapette.crustytoothpaste.net>
100
101
100
-* ja/doc-restore-markup-update (2025-01-10) 1 commit
101
- (merged to 'next' on 2025-01-24 at ba5df28904)
102
- + doc: convert git-restore to new style format
102
+* ps/3.0-remote-deprecation (2025-01-24) 6 commits
103
+ (merged to 'next' on 2025-01-28 at 970fcdf59d)
104
+ + remote: announce removal of "branches/" and "remotes/"
105
+ + builtin/pack-redundant: remove subcommand with breaking changes
106
+ + ci: repurpose "linux-gcc" job for deprecations
107
+ + ci: merge linux-gcc-default into linux-gcc
108
+ + Makefile: wire up build option for deprecated features
109
+ + Merge branch 'ps/build' into ps/3.0-remote-deprecation
110
104
- Doc mark-up updates.
105
- source: <pull.1847.v2.git.1736503760086.gitgitgadget@gmail.com>
111
+ Following the procedure we established to introduce breaking
112
+ changes for Git 3.0, allow an early opt-in for removing support of
113
+ $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
114
+ remotes.
115
+ source: <20250122-pks-remote-branches-deprecation-v4-0-5cbf5b28afd5@pks.im>
116
117
108
-* jc/show-index-h-update (2024-12-20) 1 commit
109
- (merged to 'next' on 2025-01-28 at 2196ecadc4)
110
- + show-index: the short help should say the command reads from its input
118
+* ps/build-meson-fixes (2025-01-22) 12 commits
119
+ (merged to 'next' on 2025-01-28 at c7c317a06f)
120
+ + ci: wire up Visual Studio build with Meson
121
+ + ci: raise error when Meson generates warnings
122
+ + meson: fix compilation with Visual Studio
123
+ + meson: make the CSPRNG backend configurable
124
+ + meson: wire up fuzzers
125
+ + meson: wire up generation of distribution archive
126
+ + meson: wire up development environments
127
+ + meson: fix dependencies for generated headers
128
+ + meson: populate project version via GIT-VERSION-GEN
129
+ + GIT-VERSION-GEN: allow running without input and output files
130
+ + GIT-VERSION-GEN: simplify computing the dirty marker
131
+ + Merge branch 'ps/meson-weak-sha1-build' into ps/build-meson-fixes
132
+ (this branch is used by ps/build-meson-fixes-0130 and ps/zlib-ng.)
133
112
- Doc and short-help text for "show-index" has been clarified to
113
- stress that the command reads its data from the standard input.
114
- source: <xmqqfrmidyhk.fsf@gitster.g>
134
+ More build fixes and enhancements on meson based build procedure.
135
+ source: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
136
137
117
-* kn/reflog-symref-fix (2025-01-23) 1 commit
118
- (merged to 'next' on 2025-01-23 at 123929bd42)
119
- + refs: fix creation of reflog entries for symrefs
138
+* tb/unsafe-hash-cleanup (2025-01-23) 8 commits
139
+ (merged to 'next' on 2025-01-28 at 9e0d6f9a5e)
140
+ + hash.h: drop unsafe_ function variants
141
+ + csum-file: introduce hashfile_checkpoint_init()
142
+ + t/helper/test-hash.c: use unsafe_hash_algo()
143
+ + csum-file.c: use unsafe_hash_algo()
144
+ + hash.h: introduce `unsafe_hash_algo()`
145
+ + csum-file.c: extract algop from hashfile_checksum_valid()
146
+ + csum-file: store the hash algorithm as a struct field
147
+ + t/helper/test-tool: implement sha1-unsafe helper
148
+ (this branch is used by ps/hash-cleanup.)
149
121
- reflog entries for symbolic ref updates were broken, which has been
122
- corrected.
123
- source: <20250123112944.3922712-1-karthik.188@gmail.com>
150
+ The API around choosing to use unsafe variant of SHA-1
151
+ implementation has been updated in an attempt to make it harder to
152
+ abuse.
153
+ source: <cover.1737653640.git.me@ttaylorr.com>
154
155
+--------------------------------------------------
156
+[New Topics]
157
126
-* ps/reflog-migration-with-logall-fix (2025-01-22) 1 commit
127
- (merged to 'next' on 2025-01-23 at 079036d154)
128
- + refs: fix migration of reflogs respecting "core.logAllRefUpdates"
158
+* jk/ci-coverity-update (2025-02-03) 2 commits
159
+ (merged to 'next' on 2025-02-03 at 9597182d1d)
160
+ + ci: set CI_JOB_IMAGE for coverity job
161
+ + Merge branch 'ps/ci-misc-updates' into jk/ci-coverity-update
162
+ (this branch uses ps/ci-misc-updates.)
163
130
- The "git refs migrate" command did not migrate the reflog for
131
- refs/stash, which is the contents of the stashes, which has been
132
- corrected.
133
- source: <20250122-b4-pks-reflog-migration-fix-stash-v1-1-27dbae4602f7@pks.im>
164
+ CI update to make Coverity job work again.
165
166
+ Will merge to 'master'.
167
+ source: <20250131233015.GA3544301@coredump.intra.peff.net>
168
136
-* rs/ref-fitler-used-atoms-value-fix (2025-01-21) 3 commits
137
- (merged to 'next' on 2025-01-23 at 714518543f)
138
- + ref-filter: remove ref_format_clear()
139
- + ref-filter: move is-base tip to used_atom
140
- + ref-filter: move ahead-behind bases into used_atom
169
142
- "git branch --sort=..." and "git for-each-ref --format=... --sort=..."
143
- did not work as expected with some atoms, which has been corrected.
144
- source: <6b824f05-6f16-4cd9-85b7-3b8b236158b4@web.de>
170
+* ps/repack-keep-unreachable-in-unpacked-repo (2025-02-04) 1 commit
171
+ (merged to 'next' on 2025-02-04 at 96a862b6f8)
172
+ + builtin/repack: fix `--keep-unreachable` when there are no packs
173
174
+ "git repack --keep-unreachable" to send unreachable objects to the
175
+ main pack "git repack -ad" produces did not work when there is no
176
+ existing packs, which has been corrected.
177
147
-* sk/strlen-returns-size_t (2024-12-26) 1 commit
148
- (merged to 'next' on 2025-01-24 at 43464adc45)
149
- + date.c: Fix type missmatch warings from msvc
178
+ Will merge to 'master'.
179
+ source: <20250204-b4-pks-repack-unreachable-objects-wo-packfiles-v2-1-1eae23366711@pks.im>
180
151
- Code clean-up.
152
- source: <20241223110407.3308-3-soekkle@freenet.de>
181
+
182
+* ac/t5401-use-test-path-is-file (2025-02-03) 1 commit
183
+ (merged to 'next' on 2025-02-04 at 6bd1c91b06)
184
+ + t5401: prefer test_path_is_* helper function
185
+
186
+ Test clean-up.
187
+
188
+ Will merge to 'master'.
189
+ source: <20250201071210.30509-1-amch9605@gmail.com>
190
+
191
+
192
+* ac/t6423-unhide-git-exit-status (2025-02-03) 1 commit
193
+ (merged to 'next' on 2025-02-04 at 5290fb63c2)
194
+ + t6423: fix suppression of Git’s exit code in tests
195
+
196
+ Test clean-up.
197
+
198
+ Will merge to 'master'.
199
+ source: <20250202120926.322417-1-ayu.chandekar@gmail.com>
200
+
201
+
202
+* bc/contrib-thunderbird-patch-inline-fix (2025-02-04) 1 commit
203
+ - thunderbird-patch-inline: avoid bashism
204
+
205
+ A thunderbird helper script lost its bashism.
206
+
207
+ Expecting a reroll.
208
+ cf. <Z6F-ySoYbDJxJ3xs@tapette.crustytoothpaste.net>
209
+ source: <20250204014652.3509928-1-sandals@crustytoothpaste.net>
210
+
211
+
212
+* da/help-autocorrect-one-fix (2025-02-03) 3 commits
213
+ - help: add "show" as a valid configuration value
214
+ - help: show the suggested command when help.autocorrect is false
215
+ - Merge branch 'sc/help-autocorrect-one' into da/help-autocorrect-one-fix
216
+ (this branch uses sc/help-autocorrect-one.)
217
+
218
+ "git -c help.autocorrect=0 psuh" shows the suggested typofix,
219
+ unlike the previous attempt in the base topic.
220
+
221
+ WIll merge to 'next'.
222
+ source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
223
+
224
+
225
+* ms/remote-valid-remote-name (2025-02-04) 1 commit
226
+ - remote: relocate valid_remote_name
227
+
228
+ Code shuffling.
229
+
230
+ Will merge to 'next'.
231
+ source: <20250204142852.13035-1-meetsoni3017@gmail.com>
232
+
233
+
234
+* da/difftool-sans-the-repository (2025-02-04) 1 commit
235
+ - difftool: eliminate use of global variables
236
+
237
+ source: <20250204225501.597873-1-davvid@gmail.com>
238
239
--------------------------------------------------
155
-[New Topics]
240
+[Cooking]
241
242
* ps/leakfixes-0129 (2025-01-30) 2 commits
243
(merged to 'next' on 2025-01-30 at 6dc24dfdaf)
@@ -180,7 +265,6 @@ Release tarballs are available at:
265
- meson: fix OpenSSL fallback when not explicitly required
266
- meson: fix exec path with enabled runtime prefix
267
- Merge branch 'ps/build-meson-fixes' into ps/build-meson-fixes-0130
183
- (this branch uses ps/build-meson-fixes.)
268
269
Assorted fixes and improvements to the build procedure based on
270
meson.
@@ -190,50 +274,54 @@ Release tarballs are available at:
274
275
276
* ps/setup-reinit-fixes (2025-01-30) 3 commits
193
- - setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH
194
- - setup: fix reinit of repos with incompatible GIT_DEFAULT_REF_FORMAT
195
- - t0001: remove duplicate test
277
+ (merged to 'next' on 2025-02-03 at b4eb8f2fc8)
278
+ + setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH
279
+ + setup: fix reinit of repos with incompatible GIT_DEFAULT_REF_FORMAT
280
+ + t0001: remove duplicate test
281
282
"git init" to reinitialize a repository that already exists cannot
283
change the hash function and ref backends; such a request is
284
silently ignored now.
285
201
- Will merge to 'next'.
286
+ Will merge to 'master'.
287
source: <20250130-b4-pks-reinit-default-ref-format-v1-0-d2769ca01207@pks.im>
288
289
290
* pw/apply-ulong-overflow-check (2025-01-30) 1 commit
206
- - apply: detect overflow when parsing hunk header
291
+ (merged to 'next' on 2025-02-03 at e2b37c2c77)
292
+ + apply: detect overflow when parsing hunk header
293
294
"git apply" internally uses unsigned long for line numbers and uses
295
strtoul() to parse numbers on the hunk headers. It however forgot
296
to check parse errors.
297
212
- Will merge to 'next'.
298
+ Will merge to 'master'.
299
source: <pull.1858.git.1738235310815.gitgitgadget@gmail.com>
300
301
302
* sk/unit-tests-0130 (2025-01-31) 4 commits
217
- - t/unit-tests: convert strcmp-offset test to use clar test framework
218
- - t/unit-tests: convert strbuf test to use clar test framework
219
- - t/unit-tests: adapt example decorate test to use clar test framework
220
- - t/unit-tests: convert hashmap test to use clar test framework
303
+ (merged to 'next' on 2025-02-03 at 163109072c)
304
+ + t/unit-tests: convert strcmp-offset test to use clar test framework
305
+ + t/unit-tests: convert strbuf test to use clar test framework
306
+ + t/unit-tests: adapt example decorate test to use clar test framework
307
+ + t/unit-tests: convert hashmap test to use clar test framework
308
309
Convert a handful of unit tests to work with the clar framework.
310
224
- Will merge to 'next'.
311
+ Will merge to 'master'.
312
source: <20250131221420.38161-1-kuforiji98@gmail.com>
313
314
315
* jt/gitlab-ci-base-fix (2025-01-31) 1 commit
229
- - ci: fix base commit fallback for check-whitespace and check-style
316
+ (merged to 'next' on 2025-02-03 at bf225248c9)
317
+ + ci: fix base commit fallback for check-whitespace and check-style
318
319
Two CI tasks, whitespace check and style check, work on the
320
difference from the base version and the version being checked, but
321
the base was computed incorrectly in GitLab CI in some cases, which
322
has been corrected.
323
236
- Will merge to 'next'.
324
+ Will merge to 'master'.
325
source: <20250131173938.3592899-1-jltobler@gmail.com>
326
327
@@ -244,28 +332,29 @@ Release tarballs are available at:
332
bare?" did not work correctly when per-worktree configuration
333
option was in use, which has been corrected.
334
247
- Will merge to 'next'?
335
+ Expecting a (hopefully minor and final) reroll.
336
+ cf. <xmqq8qqq7n26.fsf@gitster.g>
337
source: <pull.1829.v3.git.1738346881907.gitgitgadget@gmail.com>
338
339
340
* ps/hash-cleanup (2025-01-31) 5 commits
252
- - global: adapt callers to use generic hash context helpers
253
- - hash: provide generic wrappers to update hash contexts
254
- - hash: stop typedeffing the hash context
255
- - hash: convert hashing context to a structure
256
- - Merge branch 'tb/unsafe-hash-cleanup' into ps/hash-cleanup
257
- (this branch uses tb/unsafe-hash-cleanup.)
341
+ (merged to 'next' on 2025-02-03 at 98bdef7666)
342
+ + global: adapt callers to use generic hash context helpers
343
+ + hash: provide generic wrappers to update hash contexts
344
+ + hash: stop typedeffing the hash context
345
+ + hash: convert hashing context to a structure
346
+ + Merge branch 'tb/unsafe-hash-cleanup' into ps/hash-cleanup
347
348
Further code clean-up on the use of hash functions. Now the
349
context object knows what hash function it is working with.
350
262
- Will merge to 'next'.
351
+ Will merge to 'master'.
352
source: <20250131-b4-pks-hash-context-direct-v1-0-67a6d3f49d6e@pks.im>
353
354
266
-* tc/clone-single-revision (2025-01-31) 7 commits
267
- - fixup! builtin/clone: teach git-clone(1) the --revision= option
355
+* tc/clone-single-revision (2025-02-04) 7 commits
356
- builtin/clone: teach git-clone(1) the --revision= option
357
+ - parse-options: introduce die_for_incompatible_opt2()
358
- clone: introduce struct clone_opts in builtin/clone.c
359
- clone: add tags refspec earlier to fetch refspec
360
- clone: refactor wanted_peer_refs()
@@ -275,18 +364,16 @@ Release tarballs are available at:
364
"git clone" learned to make a shallow clone for a single commit
365
that is not necessarily be at the tip of any branch.
366
278
- Needs review.
279
- source: <20250131-toon-clone-refs-v4-0-2a4ff851498f@iotcl.com>
367
+ Will merge to 'next'?
368
+ source: <20250204-toon-clone-refs-v5-0-37e34af283c8@iotcl.com>
369
281
---------------------------------------------------
282
-[Cooking]
370
371
* jp/doc-trailer-config (2025-01-24) 1 commit
372
- config.txt: add trailer.* variables
373
374
Documentaiton updates.
375
289
- Will merge to 'next'?
376
+ Will merge to 'next'.
377
source: <pull.1871.git.git.1736429142334.gitgitgadget@gmail.com>
378
379
@@ -303,22 +390,24 @@ Release tarballs are available at:
390
source: <pull.1857.git.1737849456338.gitgitgadget@gmail.com>
391
392
306
-* ms/refspec-cleanup (2025-01-27) 3 commits
393
+* ms/refspec-cleanup (2025-02-04) 5 commits
394
- refspec: relocate apply_refspecs and related funtions
308
- - refspec: relocate query related functions
309
- - refspec: relocate omit_name_by_refspec and related functions
395
+ - refspec: relocate matching related functions
396
+ - remote: rename query_refspecs functions
397
+ - refspec: relocate refname_matches_negative_refspec_item
398
+ - remote: rename function omit_name_by_refspec
399
400
Code clean-up.
312
- source: <20250127103644.36627-1-meetsoni3017@gmail.com>
401
+ Will merge to 'next'.
402
+ cf. <Z6G-toOJjMmK8iJG@pks.im>
403
+ source: <20250204040558.34766-1-meetsoni3017@gmail.com>
404
405
315
-* ps/reftable-sans-compat-util (2025-01-28) 21 commits
406
+* ps/reftable-sans-compat-util (2025-02-03) 19 commits
407
- Makefile: skip reftable library for Coccinelle
408
- reftable: decouple from Git codebase by pulling in "compat/posix.h"
409
- git-compat-util.h: split out POSIX-emulating bits
319
- - compat/msvc: split out POSIX-related bits
410
- compat/mingw: split out POSIX-related bits
321
- - compat: consistently resolve headers via project root
411
- reftable/basics: stop using `UNUSED` annotation
412
- reftable/basics: stop using `SWAP()` macro
413
- reftable/stack: stop using `sleep_millisec()`
@@ -338,7 +427,9 @@ Release tarballs are available at:
427
Make the code in reftable library less reliant on the service
428
routines it used to borrow from Git proper, to make it easier to
429
use by external users of the library.
341
- source: <20250128-pks-reftable-drop-git-compat-util-v2-0-c85c20336317@pks.im>
430
+
431
+ Will merge to 'next'?
432
+ source: <20250203-pks-reftable-drop-git-compat-util-v3-0-446c9ed4ee9e@pks.im>
433
434
435
* ac/doc-http-ssl-type-config (2025-01-23) 1 commit
@@ -352,17 +443,6 @@ Release tarballs are available at:
443
source: <pull.1854.git.1737591366672.gitgitgadget@gmail.com>
444
445
355
-* kn/reflog-migration-fix-fix (2025-01-27) 1 commit
356
- (merged to 'next' on 2025-01-28 at e70c392ca2)
357
- + refs/reftable: fix uninitialized memory access of `max_index`
358
- (this branch uses kn/reflog-migration-fix.)
359
-
360
- Fix bugs in an earlier attempt to fix "git refs migration".
361
-
362
- Will merge to 'master'.
363
- source: <Z4UbkcmJAU1MT-Rs@tapette.crustytoothpaste.net>
364
-
365
-
446
* bc/doc-adoc-not-txt (2025-01-21) 5 commits
447
(merged to 'next' on 2025-01-24 at 737049d332)
448
+ Remove obsolete ".txt" extensions for AsciiDoc files
@@ -387,44 +467,18 @@ Release tarballs are available at:
467
468
Foreign language interface for Rust into our code base has been added.
469
390
- Will merge to 'next'?
470
+ Will merge to 'next'.
471
source: <cover.1738187176.git.steadmon@google.com>
472
473
394
-* kn/reflog-migration-fix (2025-01-15) 1 commit
395
- (merged to 'next' on 2025-01-16 at ae8f9ce9a0)
396
- + reftable: write correct max_update_index to header
397
- (this branch is used by kn/reflog-migration-fix-fix and kn/reflog-migration-fix-followup.)
398
-
399
- "git refs migrate" for migrating reflog data was broken.
400
-
401
- On hold.
402
- cf. <Z4mUizLNUdq_1BgY@tapette.crustytoothpaste.net>
403
- cf. <CAOLa=ZT4nws0irdZKUuWc70Rv9RUNQuSXnGAt1SnE1O+umSReg@mail.gmail.com>
404
- source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>
405
-
406
-
407
-* kn/pack-write-with-reduced-globals (2025-01-21) 5 commits
408
- (merged to 'next' on 2025-01-28 at bb5f4b8547)
409
- + pack-write: pass hash_algo to internal functions
410
- + pack-write: pass hash_algo to `write_rev_file()`
411
- + pack-write: pass hash_algo to `write_idx_file()`
412
- + pack-write: pass repository to `index_pack_lockfile()`
413
- + pack-write: pass hash_algo to `fixup_pack_header_footer()`
414
-
415
- Code clean-up.
416
-
417
- Will merge to 'master'.
418
- source: <20250119-kn-the-repo-cleanup-v3-0-a495fce08d71@gmail.com>
419
-
420
-
474
* zh/gc-expire-to (2025-01-24) 1 commit
475
- gc: add `--expire-to` option
476
477
"git gc" learned the "--expire-to" option and passes it down to
478
underlying "git repack".
479
427
- Will merge to 'next'?
480
+ Will merge to 'next'.
481
+ cf. <>
482
source: <pull.1843.v4.git.1737704954987.gitgitgadget@gmail.com>
483
484
@@ -433,7 +487,6 @@ Release tarballs are available at:
487
- refs: use 'uint64_t' for 'ref_update.index'
488
- refs: mark `ref_transaction_update_reflog()` as static
489
- Merge branch 'kn/reflog-migration-fix' into kn/reflog-migration-fix-followup
436
- (this branch uses kn/reflog-migration-fix.)
490
491
Code clean-up.
492
@@ -454,28 +507,6 @@ Release tarballs are available at:
507
source: <Z5Mrk02wMdABtrVZ@pks.im>
508
509
457
-* ps/build-meson-fixes (2025-01-22) 12 commits
458
- (merged to 'next' on 2025-01-28 at c7c317a06f)
459
- + ci: wire up Visual Studio build with Meson
460
- + ci: raise error when Meson generates warnings
461
- + meson: fix compilation with Visual Studio
462
- + meson: make the CSPRNG backend configurable
463
- + meson: wire up fuzzers
464
- + meson: wire up generation of distribution archive
465
- + meson: wire up development environments
466
- + meson: fix dependencies for generated headers
467
- + meson: populate project version via GIT-VERSION-GEN
468
- + GIT-VERSION-GEN: allow running without input and output files
469
- + GIT-VERSION-GEN: simplify computing the dirty marker
470
- + Merge branch 'ps/meson-weak-sha1-build' into ps/build-meson-fixes
471
- (this branch is used by ps/build-meson-fixes-0130 and ps/zlib-ng.)
472
-
473
- More build fixes and enhancements on meson based build procedure.
474
-
475
- Will merge to 'master'.
476
- source: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
477
-
478
-
510
* ps/zlib-ng (2025-01-28) 12 commits
511
(merged to 'next' on 2025-01-30 at ecf8e8bbef)
512
+ ci: make "linux-musl" job use zlib-ng
@@ -490,7 +521,6 @@ Release tarballs are available at:
521
+ compat: drop `uncompress2()` compatibility shim
522
+ Merge branch 'ps/build-meson-fixes' into ps/zlib-ng
523
+ Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng
493
- (this branch uses ps/build-meson-fixes.)
524
525
The code paths to interact with zlib has been cleaned up in
526
preparation for building with zlib-ng.
@@ -499,74 +529,33 @@ Release tarballs are available at:
529
source: <20250128-b4-pks-compat-drop-uncompress2-v4-0-129bc36ae8f5@pks.im>
530
531
502
-* tb/unsafe-hash-cleanup (2025-01-23) 8 commits
503
- (merged to 'next' on 2025-01-28 at 9e0d6f9a5e)
504
- + hash.h: drop unsafe_ function variants
505
- + csum-file: introduce hashfile_checkpoint_init()
506
- + t/helper/test-hash.c: use unsafe_hash_algo()
507
- + csum-file.c: use unsafe_hash_algo()
508
- + hash.h: introduce `unsafe_hash_algo()`
509
- + csum-file.c: extract algop from hashfile_checksum_valid()
510
- + csum-file: store the hash algorithm as a struct field
511
- + t/helper/test-tool: implement sha1-unsafe helper
512
- (this branch is used by ps/hash-cleanup.)
513
-
514
- The API around choosing to use unsafe variant of SHA-1
515
- implementation has been updated in an attempt to make it harder to
516
- abuse.
517
-
518
- Will merge to 'master'.
519
- source: <cover.1737653640.git.me@ttaylorr.com>
520
-
521
-
532
* sj/ref-consistency-checks-more (2025-01-30) 8 commits
523
- . builtin/fsck: add `git refs verify` child process
524
- . packed-backend: check whether the "packed-refs" is sorted
525
- . packed-backend: add "packed-refs" entry consistency check
526
- . packed-backend: check whether the refname contains NUL characters
527
- . packed-backend: add "packed-refs" header consistency check
528
- . packed-backend: check whether the "packed-refs" is regular
529
- . builtin/refs: get worktrees without reading head info
530
- . t0602: use subshell to ensure working directory unchanged
533
+ - builtin/fsck: add `git refs verify` child process
534
+ - packed-backend: check whether the "packed-refs" is sorted
535
+ - packed-backend: add "packed-refs" entry consistency check
536
+ - packed-backend: check whether the refname contains NUL characters
537
+ - packed-backend: add "packed-refs" header consistency check
538
+ - packed-backend: check whether the "packed-refs" is regular
539
+ - builtin/refs: get worktrees without reading head info
540
+ - t0602: use subshell to ensure working directory unchanged
541
542
"git fsck" becomes more careful when checking the refs.
543
534
- A reroll exists.
544
+ Expecting a reroll.
545
+ cf. <Z6CBC5kyvIhBuLk6@pks.im>
546
source: <Z5r6ZnLH3Ee8IQnN@ArchLinux>
547
548
538
-* jk/combine-diff-cleanup (2025-01-09) 14 commits
539
- (merged to 'next' on 2025-01-28 at 97e76074b3)
540
- + tree-diff: make list tail-passing more explicit
541
- + tree-diff: simplify emit_path() list management
542
- + tree-diff: use the name "tail" to refer to list tail
543
- + tree-diff: drop list-tail argument to diff_tree_paths()
544
- + combine-diff: drop public declaration of combine_diff_path_size()
545
- + tree-diff: inline path_appendnew()
546
- + tree-diff: pass whole path string to path_appendnew()
547
- + tree-diff: drop path_appendnew() alloc optimization
548
- + run_diff_files(): de-mystify the size of combine_diff_path struct
549
- + diff: add a comment about combine_diff_path.parent.path
550
- + combine-diff: use pointer for parent paths
551
- + tree-diff: clear parent array in path_appendnew()
552
- + combine-diff: add combine_diff_path_new()
553
- + run_diff_files(): delay allocation of combine_diff_path
554
-
555
- Code clean-up for code paths around combined diff.
556
-
557
- Will merge to 'master'.
558
- source: <20250109082723.GA2748497@coredump.intra.peff.net>
559
-
560
-
549
* sc/help-autocorrect-one (2025-01-13) 1 commit
550
- help: interpret boolean string values for help.autocorrect
551
+ (this branch is used by da/help-autocorrect-one-fix.)
552
553
"[help] autocorrect = 1" used to be a way to say "please wait for
554
0.1 second after suggesting a typofix of the command name before
555
running that command"; now it means "yes, if there is a plausible
556
typofix for the command name, please run it immediately".
557
569
- Looking good except for "should 0 and false be 'tell it without doing it'?".
558
+ Will merge together with da/help-autocorrect-one-fix to 'next'.
559
source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
560
561
@@ -597,6 +586,7 @@ Release tarballs are available at:
586
+ github: adapt containerized jobs to be rootless
587
+ t7422: fix flaky test caused by buffered stdout
588
+ t0060: fix EBUSY in MinGW when setting up runtime prefix
589
+ (this branch is used by jk/ci-coverity-update.)
590
591
CI updates (containerization, dropping stale ones, etc.).
592
@@ -610,7 +600,8 @@ Release tarballs are available at:
600
A new periodic maintenance task to run "git remote prune" has been
601
introduced.
602
613
- Expecting a reroll.
603
+ Will discard.
604
+ Has been expecting a reroll for too long.
605
source: <pull.1838.v3.git.1735928035056.gitgitgadget@gmail.com>
606
607
@@ -626,24 +617,6 @@ Release tarballs are available at:
617
source: <xmqq5xnladwi.fsf@gitster.g>
618
619
629
-* ps/3.0-remote-deprecation (2025-01-24) 6 commits
630
- (merged to 'next' on 2025-01-28 at 970fcdf59d)
631
- + remote: announce removal of "branches/" and "remotes/"
632
- + builtin/pack-redundant: remove subcommand with breaking changes
633
- + ci: repurpose "linux-gcc" job for deprecations
634
- + ci: merge linux-gcc-default into linux-gcc
635
- + Makefile: wire up build option for deprecated features
636
- + Merge branch 'ps/build' into ps/3.0-remote-deprecation
637
-
638
- Following the procedure we established to introduce breaking
639
- changes for Git 3.0, allow an early opt-in for removing support of
640
- $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
641
- remotes.
642
-
643
- Will merge to 'master'.
644
- source: <20250122-pks-remote-branches-deprecation-v4-0-5cbf5b28afd5@pks.im>
645
-
646
-
620
* cc/lop-remote (2025-01-27) 6 commits
621
- doc: add technical design doc for large object promisors
622
- promisor-remote: check advertised name or URL
@@ -656,21 +629,21 @@ Release tarballs are available at:
629
source: <20250127151701.2321341-1-christian.couder@gmail.com>
630
631
659
-* ds/backfill (2025-01-23) 6 commits
632
+* ds/backfill (2025-02-03) 7 commits
633
- backfill: assume --sparse when sparse-checkout is enabled
634
- backfill: add --sparse option
635
- backfill: add --min-batch-size=<n> option
636
- backfill: basic functionality and tests
637
- backfill: add builtin boilerplate
638
+ - Merge branch 'master' into ds/backfill
639
- Merge branch 'ds/path-walk-1' into ds/backfill
640
641
Lazy-loading missing files in a blobless clone on demand is costly
642
as it tends to be one-blob-at-a-time. "git backfill" is introduced
643
to help bulk-download necessary files beforehand.
644
671
- Expecting a reroll.
672
- cf. <Z4jeQSLmARruE5l3@pks.im>
673
- source: <pull.1820.v2.git.1734712193.gitgitgadget@gmail.com>
645
+ Will merge to 'next'?
646
+ source: <pull.1820.v3.git.1738602667.gitgitgadget@gmail.com>
647
648
649
* tb/incremental-midx-part-2 (2024-11-20) 15 commits
@@ -696,7 +669,7 @@ Release tarballs are available at:
669
source: <cover.1732054032.git.me@ttaylorr.com>
670
671
699
-* ps/send-pack-unhide-error-in-atomic-push (2025-01-31) 8 commits
672
+* ps/send-pack-unhide-error-in-atomic-push (2025-02-03) 8 commits
673
- send-pack: gracefully close the connection for atomic push
674
- t5543: atomic push reports exit code failure
675
- send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS"
@@ -710,25 +683,27 @@ Release tarballs are available at:
683
other side, losing the error status from the child process, which
684
has been corrected.
685
713
- Needs review.
714
- source: <20250131-pks-push-atomic-respect-exit-code-v4-0-a8b41f01a676@pks.im>
686
+ Will merge to 'next'?
687
+ source: <20250203-pks-push-atomic-respect-exit-code-v5-0-d66481e36622@pks.im>
688
689
690
* ds/name-hash-tweaks (2025-01-27) 7 commits
718
- - pack-objects: prevent name hash version change
719
- - test-tool: add helper for name-hash values
720
- - p5313: add size comparison test
721
- - pack-objects: add GIT_TEST_NAME_HASH_VERSION
722
- - repack: add --name-hash-version option
723
- - pack-objects: add --name-hash-version option
724
- - pack-objects: create new name-hash function version
691
+ (merged to 'next' on 2025-02-04 at d83bc700a7)
692
+ + pack-objects: prevent name hash version change
693
+ + test-tool: add helper for name-hash values
694
+ + p5313: add size comparison test
695
+ + pack-objects: add GIT_TEST_NAME_HASH_VERSION
696
+ + repack: add --name-hash-version option
697
+ + pack-objects: add --name-hash-version option
698
+ + pack-objects: create new name-hash function version
699
700
"git pack-objects" and its wrapper "git repack" learned an option
701
to use an alternative path-hash function to improve delta-base
702
selection to produce a packfile with deeper history than window
703
size.
704
731
- Will merge to 'next'?
705
+ Will merge to 'master'.
706
+ cf. <Z51DHdS8SStRGalX@nand.local>
707
source: <pull.1823.v4.git.1738004554.gitgitgadget@gmail.com>
708
709