What's cooking (2025/02 #02)
Junio C Hamano committed
Feb 7, 2025 at 11:27 UTC
93bfad180c86801a6bcf439675654c38f4b0624e
1 file changed
+215
-255
whats-cooking.txt
+215
-255
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2025, #01; Tue, 4)
3
-X-master-at: bc204b742735ae06f65bb20291c95985c9633b7f
4
-X-next-at: 6bd1c91b067bc73fdcedcc85aa2367f340cf3a2b
2
+Subject: What's cooking in git.git (Feb 2025, #02; Fri, 7)
3
+X-master-at: 9520f7d9985d8879bddd157309928fc0679c8e92
4
+X-next-at: 30ceb7b040fb0d98a6c17a39c106f6eb9a112b24
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Feb 2025, #01; Tue, 4)
7
+What's cooking in git.git (Feb 2025, #02; Fri, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,118 +48,127 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
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
-
68
- Code clean-up for code paths around combined diff.
69
- source: <20250109082723.GA2748497@coredump.intra.peff.net>
70
-
71
-
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()`
51
+* js/bundle-unbundle-fd-reuse-fix (2025-01-25) 1 commit
52
+ (merged to 'next' on 2025-01-29 at e490587933)
53
+ + bundle: avoid closing file descriptor twice
54
80
- Code clean-up.
81
- source: <20250119-kn-the-repo-cleanup-v3-0-a495fce08d71@gmail.com>
82
-
83
-
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
-
89
- "git refs migrate" for migrating reflog data was broken.
90
- source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>
91
-
92
-
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
-
98
- Fix bugs in an earlier attempt to fix "git refs migration".
99
- source: <Z4UbkcmJAU1MT-Rs@tapette.crustytoothpaste.net>
100
-
101
-
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
-
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
-
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
-
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
-
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
-
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>
55
+ The code path used when "git fetch" fetches from a bundle file
56
+ closed the same file descriptor twice, which sometimes broke things
57
+ unexpectedly when the file descriptor was reused, which has been
58
+ corrected.
59
+ source: <pull.1857.git.1737849456338.gitgitgadget@gmail.com>
60
+
61
+
62
+* ps/ci-misc-updates (2025-01-10) 10 commits
63
+ (merged to 'next' on 2025-01-29 at 4d2f9d7f18)
64
+ + ci: remove stale code for Azure Pipelines
65
+ + ci: use latest Ubuntu release
66
+ + ci: stop special-casing for Ubuntu 16.04
67
+ + gitlab-ci: add linux32 job testing against i386
68
+ + gitlab-ci: remove the "linux-old" job
69
+ + github: simplify computation of the job's distro
70
+ + github: convert all Linux jobs to be containerized
71
+ + github: adapt containerized jobs to be rootless
72
+ + t7422: fix flaky test caused by buffered stdout
73
+ + t0060: fix EBUSY in MinGW when setting up runtime prefix
74
+ (this branch is used by jk/ci-coverity-update.)
75
+
76
+ CI updates (containerization, dropping stale ones, etc.).
77
+ source: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im>
78
+
79
+
80
+* ps/leakfixes-0129 (2025-01-30) 2 commits
81
+ (merged to 'next' on 2025-01-30 at 6dc24dfdaf)
82
+ + scalar: free result of `remote_default_branch()`
83
+ + unix-socket: fix memory leak when chdir(3p) fails
84
+
85
+ A few more leakfixes.
86
+ source: <20250130-b4-pks-memory-leaks-v2-0-fc29dc7d4b19@pks.im>
87
+
88
+
89
+* ps/zlib-ng (2025-01-28) 12 commits
90
+ (merged to 'next' on 2025-01-30 at ecf8e8bbef)
91
+ + ci: make "linux-musl" job use zlib-ng
92
+ + ci: switch linux-musl to use Meson
93
+ + compat/zlib: allow use of zlib-ng as backend
94
+ + git-zlib: cast away potential constness of `next_in` pointer
95
+ + compat/zlib: provide stubs for `deflateSetHeader()`
96
+ + compat/zlib: provide `deflateBound()` shim centrally
97
+ + git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
98
+ + compat: introduce new "zlib.h" header
99
+ + git-compat-util: drop `z_const` define
100
+ + compat: drop `uncompress2()` compatibility shim
101
+ + Merge branch 'ps/build-meson-fixes' into ps/zlib-ng
102
+ + Merge branch 'ps/meson-weak-sha1-build' into ps/zlib-ng
103
+
104
+ The code paths to interact with zlib has been cleaned up in
105
+ preparation for building with zlib-ng.
106
+ source: <20250128-b4-pks-compat-drop-uncompress2-v4-0-129bc36ae8f5@pks.im>
107
108
--------------------------------------------------
109
[New Topics]
110
111
+* jt/rev-list-missing-print-info (2025-02-05) 2 commits
112
+ - rev-list: extend print-info to print missing object type
113
+ - rev-list: add print-info action to print missing object path
114
+
115
+ "git rev-list --missing=" learned to accept "print-info" that gives
116
+ known details expected of the missing objects, like path and type.
117
+
118
+ Will merge to 'next'.
119
+ cf. <CAP8UFD31kbtqXQDp9LyA+x+h+m592=HQHHbskSfar3S2GOfWVg@mail.gmail.com>
120
+ source: <20250205004147.887106-1-jltobler@gmail.com>
121
+
122
+
123
+* pw/rebase-i-ff-empty-commit (2025-02-05) 1 commit
124
+ - rebase -i: reword empty commit after fast-forward
125
+
126
+ "git rebase -i" failed to allow rewording an empty commit that has
127
+ been fast-forwarded.
128
+
129
+ Expecting a reroll.
130
+ cf. <xmqqtt98nt89.fsf@gitster.g>
131
+ source: <pull.1860.git.1738751840816.gitgitgadget@gmail.com>
132
+
133
+
134
+* ib/diff-S-G-with-longhand (2025-02-06) 1 commit
135
+ - diff: --patch-{modifies,grep} arg names for -S and -G
136
+
137
+ The commands in the "diff" family learned longhands for "-S" and
138
+ "-G" options.
139
+
140
+ Expecting a reroll.
141
+ cf. <xmqqseoqiybi.fsf@gitster.g>
142
+ source: <20250206014324.1839232-2-illia.bobyr@gmail.com>
143
+
144
+
145
+* ps/doc-http-upload-archive-service (2025-02-06) 1 commit
146
+ (merged to 'next' on 2025-02-06 at dd19c245e9)
147
+ + doc: documentation for http.uploadarchive config option
148
+
149
+ Doc update.
150
+
151
+ Will merge to 'master'.
152
+ source: <pull.1885.v2.git.git.1738863927849.gitgitgadget@gmail.com>
153
+
154
+
155
+* ps/reftable-windows-unlink-fix (2025-02-07) 2 commits
156
+ - reftable: ignore file-in-use errors when unlink(3p) fails on Windows
157
+ - Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-windows-unlink-fix
158
+ (this branch uses ps/reftable-sans-compat-util.)
159
+
160
+ Portability fix.
161
+
162
+ Waiting for the base topic.
163
+ source: <20250206-b4-pks-reftable-win32-in-use-errors-v2-1-56985a4f6186@pks.im>
164
+
165
+--------------------------------------------------
166
+[Cooking]
167
+
168
* jk/ci-coverity-update (2025-02-03) 2 commits
169
(merged to 'next' on 2025-02-03 at 9597182d1d)
170
+ ci: set CI_JOB_IMAGE for coverity job
171
+ Merge branch 'ps/ci-misc-updates' into jk/ci-coverity-update
162
- (this branch uses ps/ci-misc-updates.)
172
173
CI update to make Coverity job work again.
174
@@ -210,44 +219,39 @@ Release tarballs are available at:
219
220
221
* 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
222
+ (merged to 'next' on 2025-02-05 at 74a3c43834)
223
+ + help: add "show" as a valid configuration value
224
+ + help: show the suggested command when help.autocorrect is false
225
+ + Merge branch 'sc/help-autocorrect-one' into da/help-autocorrect-one-fix
226
(this branch uses sc/help-autocorrect-one.)
227
228
"git -c help.autocorrect=0 psuh" shows the suggested typofix,
229
unlike the previous attempt in the base topic.
230
221
- WIll merge to 'next'.
231
+ Will merge to 'master'.
232
source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
233
234
235
* ms/remote-valid-remote-name (2025-02-04) 1 commit
226
- - remote: relocate valid_remote_name
236
+ (merged to 'next' on 2025-02-05 at 3d58d63932)
237
+ + remote: relocate valid_remote_name
238
239
Code shuffling.
240
230
- Will merge to 'next'.
241
+ Will merge to 'master'.
242
source: <20250204142852.13035-1-meetsoni3017@gmail.com>
243
244
234
-* da/difftool-sans-the-repository (2025-02-04) 1 commit
245
+* da/difftool-sans-the-repository (2025-02-06) 3 commits
246
+ - difftool: eliminate use of USE_THE_REPOSITORY_VARIABLE
247
+ - difftool: eliminate use of the_repository
248
- difftool: eliminate use of global variables
249
237
- source: <20250204225501.597873-1-davvid@gmail.com>
238
-
239
---------------------------------------------------
240
-[Cooking]
241
-
242
-* ps/leakfixes-0129 (2025-01-30) 2 commits
243
- (merged to 'next' on 2025-01-30 at 6dc24dfdaf)
244
- + scalar: free result of `remote_default_branch()`
245
- + unix-socket: fix memory leak when chdir(3p) fails
246
-
247
- A few more leakfixes.
250
+ "git difftool" code clean-up.
251
249
- Will merge to 'master'.
250
- source: <20250130-b4-pks-memory-leaks-v2-0-fc29dc7d4b19@pks.im>
252
+ Will merge to 'next'.
253
+ cf. <xmqq4j15hch1.fsf@gitster.g>
254
+ source: <20250206042010.865947-3-davvid@gmail.com>
255
256
257
* ps/build-meson-fixes-0130 (2025-01-30) 14 commits
@@ -325,16 +329,16 @@ Release tarballs are available at:
329
source: <20250131173938.3592899-1-jltobler@gmail.com>
330
331
328
-* op/worktree-is-main-bare-fix (2025-01-31) 1 commit
329
- - worktree: detect from secondary worktree if main worktree is bare
332
+* op/worktree-is-main-bare-fix (2025-02-05) 1 commit
333
+ (merged to 'next' on 2025-02-06 at 25c618bf37)
334
+ + worktree: detect from secondary worktree if main worktree is bare
335
336
Going into a secondary worktree and asking "is the main worktree
337
bare?" did not work correctly when per-worktree configuration
338
option was in use, which has been corrected.
339
335
- Expecting a (hopefully minor and final) reroll.
336
- cf. <xmqq8qqq7n26.fsf@gitster.g>
337
- source: <pull.1829.v3.git.1738346881907.gitgitgadget@gmail.com>
340
+ Will merge to 'master'.
341
+ source: <pull.1829.v4.git.1738737014194.gitgitgadget@gmail.com>
342
343
344
* ps/hash-cleanup (2025-01-31) 5 commits
@@ -352,63 +356,54 @@ Release tarballs are available at:
356
source: <20250131-b4-pks-hash-context-direct-v1-0-67a6d3f49d6e@pks.im>
357
358
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()
361
- - clone: make it possible to specify --tags
362
- - clone: cut down on global variables in clone.c
359
+* tc/clone-single-revision (2025-02-06) 7 commits
360
+ (merged to 'next' on 2025-02-06 at d67b50d35c)
361
+ + builtin/clone: teach git-clone(1) the --revision= option
362
+ + parse-options: introduce die_for_incompatible_opt2()
363
+ + clone: introduce struct clone_opts in builtin/clone.c
364
+ + clone: add tags refspec earlier to fetch refspec
365
+ + clone: refactor wanted_peer_refs()
366
+ + clone: make it possible to specify --tags
367
+ + clone: cut down on global variables in clone.c
368
369
"git clone" learned to make a shallow clone for a single commit
370
that is not necessarily be at the tip of any branch.
371
367
- Will merge to 'next'?
368
- source: <20250204-toon-clone-refs-v5-0-37e34af283c8@iotcl.com>
372
+ Will merge to 'master'.
373
+ cf. <xmqq4j16kefu.fsf@gitster.g>
374
+ source: <20250206-toon-clone-refs-v7-0-4622b7392202@iotcl.com>
375
376
377
* jp/doc-trailer-config (2025-01-24) 1 commit
372
- - config.txt: add trailer.* variables
378
+ (merged to 'next' on 2025-02-05 at 7bbd51e504)
379
+ + config.txt: add trailer.* variables
380
381
Documentaiton updates.
382
376
- Will merge to 'next'.
377
- source: <pull.1871.git.git.1736429142334.gitgitgadget@gmail.com>
378
-
379
-
380
-* js/bundle-unbundle-fd-reuse-fix (2025-01-25) 1 commit
381
- (merged to 'next' on 2025-01-29 at e490587933)
382
- + bundle: avoid closing file descriptor twice
383
-
384
- The code path used when "git fetch" fetches from a bundle file
385
- closed the same file descriptor twice, which sometimes broke things
386
- unexpectedly when the file descriptor was reused, which has been
387
- corrected.
388
-
383
Will merge to 'master'.
390
- source: <pull.1857.git.1737849456338.gitgitgadget@gmail.com>
384
+ source: <pull.1871.git.git.1736429142334.gitgitgadget@gmail.com>
385
386
387
* ms/refspec-cleanup (2025-02-04) 5 commits
394
- - refspec: relocate apply_refspecs and related funtions
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
388
+ (merged to 'next' on 2025-02-05 at 5b53c49215)
389
+ + refspec: relocate apply_refspecs and related funtions
390
+ + refspec: relocate matching related functions
391
+ + remote: rename query_refspecs functions
392
+ + refspec: relocate refname_matches_negative_refspec_item
393
+ + remote: rename function omit_name_by_refspec
394
395
Code clean-up.
401
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
cf. <Z6G-toOJjMmK8iJG@pks.im>
398
source: <20250204040558.34766-1-meetsoni3017@gmail.com>
399
400
406
-* ps/reftable-sans-compat-util (2025-02-03) 19 commits
401
+* ps/reftable-sans-compat-util (2025-02-07) 19 commits
402
- Makefile: skip reftable library for Coccinelle
403
- reftable: decouple from Git codebase by pulling in "compat/posix.h"
404
- git-compat-util.h: split out POSIX-emulating bits
405
- compat/mingw: split out POSIX-related bits
411
- - reftable/basics: stop using `UNUSED` annotation
406
+ - reftable/basics: introduce `REFTABLE_UNUSED` annotation
407
- reftable/basics: stop using `SWAP()` macro
408
- reftable/stack: stop using `sleep_millisec()`
409
- reftable/system: introduce `reftable_rand()`
@@ -423,24 +418,25 @@ Release tarballs are available at:
418
- reftable/stack: stop using `write_in_full()`
419
- reftable/stack: stop using `read_in_full()`
420
- Merge branch 'ps/reftable-sign-compare' into ps/reftable-sans-compat-util
421
+ (this branch is used by ps/reftable-windows-unlink-fix.)
422
423
Make the code in reftable library less reliant on the service
424
routines it used to borrow from Git proper, to make it easier to
425
use by external users of the library.
426
431
- Will merge to 'next'?
432
- source: <20250203-pks-reftable-drop-git-compat-util-v3-0-446c9ed4ee9e@pks.im>
427
+ Waiting for Acks? Otherwise looking good.
428
+ cf. <Z6MNRVrhw3Nxz6Iw@pks.im>
429
+ source: <20250207-pks-reftable-drop-git-compat-util-v5-0-ba2adc79110f@pks.im>
430
431
435
-* ac/doc-http-ssl-type-config (2025-01-23) 1 commit
432
+* ac/doc-http-ssl-type-config (2025-02-05) 1 commit
433
- docs: indicate http.sslCertType and sslKeyType
434
435
Two configuration variables about SSL authentication material that
436
weren't mentioned in the documentations are now mentioned.
437
441
- Waiting for review response.
442
- cf. <Z5GOfwBR7JBloIs0@tapette.crustytoothpaste.net>
443
- source: <pull.1854.git.1737591366672.gitgitgadget@gmail.com>
438
+ Will merge to 'next'?
439
+ source: <20250205053856.72723-1-andrew@emailcarter.com>
440
441
442
* bc/doc-adoc-not-txt (2025-01-21) 5 commits
@@ -460,94 +456,76 @@ Release tarballs are available at:
456
457
458
* js/libgit-rust (2025-01-29) 4 commits
463
- - libgit: add higher-level libgit crate
464
- - libgit-sys: also export some config_set functions
465
- - libgit-sys: introduce Rust wrapper for libgit.a
466
- - common-main: split init and exit code into new files
459
+ (merged to 'next' on 2025-02-05 at ac1fefbba1)
460
+ + libgit: add higher-level libgit crate
461
+ + libgit-sys: also export some config_set functions
462
+ + libgit-sys: introduce Rust wrapper for libgit.a
463
+ + common-main: split init and exit code into new files
464
465
Foreign language interface for Rust into our code base has been added.
466
470
- Will merge to 'next'.
467
+ Will merge to 'master'.
468
source: <cover.1738187176.git.steadmon@google.com>
469
470
471
* zh/gc-expire-to (2025-01-24) 1 commit
475
- - gc: add `--expire-to` option
472
+ (merged to 'next' on 2025-02-05 at e075d609ae)
473
+ + gc: add `--expire-to` option
474
475
"git gc" learned the "--expire-to" option and passes it down to
476
underlying "git repack".
477
480
- Will merge to 'next'.
481
- cf. <>
478
+ Will merge to 'master'.
479
source: <pull.1843.v4.git.1737704954987.gitgitgadget@gmail.com>
480
481
482
* kn/reflog-migration-fix-followup (2025-01-22) 4 commits
486
- - reftable: prevent 'update_index' changes after adding records
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
483
+ (merged to 'next' on 2025-02-06 at 1b0fc3be42)
484
+ + reftable: prevent 'update_index' changes after adding records
485
+ + refs: use 'uint64_t' for 'ref_update.index'
486
+ + refs: mark `ref_transaction_update_reflog()` as static
487
+ + Merge branch 'kn/reflog-migration-fix' into kn/reflog-migration-fix-followup
488
489
Code clean-up.
490
493
- On hold.
494
- cf. <Z5DgxQuc2j_-5GHg@pks.im>
491
+ Will merge to 'master'.
492
+ cf. <Z6MNRVrhw3Nxz6Iw@pks.im>
493
source: <20250122-461-corrupted-reftable-followup-v3-0-ae5f88bf04fa@gmail.com>
494
495
496
* bf/fetch-set-head-fix (2025-01-27) 2 commits
499
- - fetch set_head: fix non-mirror remotes in bare repositories
500
- - fetch set_head: refactor to use remote directly
497
+ (merged to 'next' on 2025-02-06 at 9d20f0b55a)
498
+ + fetch set_head: fix non-mirror remotes in bare repositories
499
+ + fetch set_head: refactor to use remote directly
500
501
Fetching into a bare repository incorrectly assumed it always used
502
a mirror layout when deciding to update remote-tracking HEAD, which
503
has been corrected.
504
506
- Will merge to 'next'?
507
- source: <Z5Mrk02wMdABtrVZ@pks.im>
508
-
509
-
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
513
- + ci: switch linux-musl to use Meson
514
- + compat/zlib: allow use of zlib-ng as backend
515
- + git-zlib: cast away potential constness of `next_in` pointer
516
- + compat/zlib: provide stubs for `deflateSetHeader()`
517
- + compat/zlib: provide `deflateBound()` shim centrally
518
- + git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
519
- + compat: introduce new "zlib.h" header
520
- + git-compat-util: drop `z_const` define
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
524
-
525
- The code paths to interact with zlib has been cleaned up in
526
- preparation for building with zlib-ng.
527
-
505
Will merge to 'master'.
529
- source: <20250128-b4-pks-compat-drop-uncompress2-v4-0-129bc36ae8f5@pks.im>
506
+ cf. <Z6MNRVrhw3Nxz6Iw@pks.im>
507
+ source: <Z5Mrk02wMdABtrVZ@pks.im>
508
509
532
-* sj/ref-consistency-checks-more (2025-01-30) 8 commits
510
+* sj/ref-consistency-checks-more (2025-02-06) 8 commits
511
- builtin/fsck: add `git refs verify` child process
512
- packed-backend: check whether the "packed-refs" is sorted
513
- packed-backend: add "packed-refs" entry consistency check
514
- packed-backend: check whether the refname contains NUL characters
515
- 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
516
+ - packed-backend: check whether the "packed-refs" is regular file
517
+ - builtin/refs: get worktrees without reading head information
518
- t0602: use subshell to ensure working directory unchanged
519
520
"git fsck" becomes more careful when checking the refs.
521
544
- Expecting a reroll.
545
- cf. <Z6CBC5kyvIhBuLk6@pks.im>
546
- source: <Z5r6ZnLH3Ee8IQnN@ArchLinux>
522
+ Comments?
523
+ source: <Z6RPJI10-2QkwyqH@ArchLinux>
524
525
526
* sc/help-autocorrect-one (2025-01-13) 1 commit
550
- - help: interpret boolean string values for help.autocorrect
527
+ (merged to 'next' on 2025-02-05 at 1ecb7c7c9c)
528
+ + help: interpret boolean string values for help.autocorrect
529
(this branch is used by da/help-autocorrect-one-fix.)
530
531
"[help] autocorrect = 1" used to be a way to say "please wait for
@@ -555,12 +533,12 @@ Release tarballs are available at:
533
running that command"; now it means "yes, if there is a plausible
534
typofix for the command name, please run it immediately".
535
558
- Will merge together with da/help-autocorrect-one-fix to 'next'.
536
+ Will merge together with da/help-autocorrect-one-fix to 'master'.
537
source: <pull.1869.v4.git.git.1736760824201.gitgitgadget@gmail.com>
538
539
562
-* ua/os-version-capability (2025-01-24) 6 commits
563
- - connect: advertise OS version
540
+* ua/os-version-capability (2025-02-05) 6 commits
541
+ - agent: advertise OS name via agent capability
542
- t5701: add setup test to remove side-effect dependency
543
- version: extend get_uname_info() to hide system details
544
- version: refactor get_uname_info()
@@ -570,39 +548,8 @@ Release tarballs are available at:
548
The value of "uname -s" is by default sent over the wire as a new
549
capability, with an opt-out for privacy-concious folks.
550
573
- Will merge to 'next'?
574
- source: <20250124122217.250925-1-usmanakinyemi202@gmail.com>
575
-
576
-
577
-* ps/ci-misc-updates (2025-01-10) 10 commits
578
- (merged to 'next' on 2025-01-29 at 4d2f9d7f18)
579
- + ci: remove stale code for Azure Pipelines
580
- + ci: use latest Ubuntu release
581
- + ci: stop special-casing for Ubuntu 16.04
582
- + gitlab-ci: add linux32 job testing against i386
583
- + gitlab-ci: remove the "linux-old" job
584
- + github: simplify computation of the job's distro
585
- + github: convert all Linux jobs to be containerized
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
-
593
- Will merge to 'master'.
594
- source: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im>
595
-
596
-
597
-* sk/maintenance-remote-prune (2025-01-03) 1 commit
598
- - maintenance: add prune-remote-refs task
599
-
600
- A new periodic maintenance task to run "git remote prune" has been
601
- introduced.
602
-
603
- Will discard.
604
- Has been expecting a reroll for too long.
605
- source: <pull.1838.v3.git.1735928035056.gitgitgadget@gmail.com>
551
+ Under discussion.
552
+ source: <20250205185246.111447-1-usmanakinyemi202@gmail.com>
553
554
555
* jc/doc-attr-tree (2024-12-14) 1 commit
@@ -642,7 +589,8 @@ Release tarballs are available at:
589
as it tends to be one-blob-at-a-time. "git backfill" is introduced
590
to help bulk-download necessary files beforehand.
591
645
- Will merge to 'next'?
592
+ Will merge to 'next'.
593
+ cf. <Z6MQK6anxpMhlL9i@pks.im>
594
source: <pull.1820.v3.git.1738602667.gitgitgadget@gmail.com>
595
596
@@ -683,7 +631,8 @@ Release tarballs are available at:
631
other side, losing the error status from the child process, which
632
has been corrected.
633
686
- Will merge to 'next'?
634
+ Will merge to 'next'.
635
+ cf. <xmqqh65azk3a.fsf@gitster.g>
636
source: <20250203-pks-push-atomic-respect-exit-code-v5-0-d66481e36622@pks.im>
637
638
@@ -722,3 +671,14 @@ Release tarballs are available at:
671
672
Comments?
673
source: <20250114021502.41499-1-eric.peijian@gmail.com>
674
+
675
+
676
+* sk/maintenance-remote-prune (2025-01-03) 1 commit
677
+ . maintenance: add prune-remote-refs task
678
+
679
+ A new periodic maintenance task to run "git remote prune" has been
680
+ introduced.
681
+
682
+ Will discard.
683
+ Has been expecting a reroll for too long.
684
+ source: <pull.1838.v3.git.1735928035056.gitgitgadget@gmail.com>