1
1
2
- Subject: What's cooking in git.git (Mar 2025, #05; Tue, 18 )
2
+ Subject: What's cooking in git.git (Mar 2025, #06; Fri, 21 )
3
3
X-master-at: 683c54c999c301c2cd6f715c411407c413b1d84e
4
4
X-next-at: e94155a9ecafb89f308d834dea8fed4f7ad85d2a
5
5
6
6
7
- What's cooking in git.git (Mar 2025, #05; Tue, 18 )
7
+ What's cooking in git.git (Mar 2025, #06; Fri, 21 )
8
8
--------------------------------------------------
9
9
10
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,12 +17,6 @@ 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
- Now Git 2.49 is out, we may see some regression reports, in which
21
- case we would have to first deal with them. I'll be on vacation for
22
- a few weeks, and will be back in early April. I may occasionally be
23
- online to merge some topics down but I will generally be much slower
24
- than usual during the latter half of this month.
25
-
26
20
Copies of the source code to Git live in many repositories, and the
27
21
following is a list of the ones I push into or their mirrors. Some
28
22
repositories have only a subset of branches.
@@ -54,6 +48,103 @@ Release tarballs are available at:
54
48
--------------------------------------------------
55
49
[New Topics]
56
50
51
+ * en/assert-wo-side-effects (2025-03-21) 3 commits
52
+ - treewide: replace assert() with ASSERT() in special cases
53
+ - ci: add build checking for side-effects in assert() calls
54
+ - git-compat-util: introduce ASSERT() macro
55
+
56
+ Ensure what we write in assert() does not have side effects,
57
+ and introduce ASSERT() macro to mark those that cannot be
58
+ mechanically checked for lack of side effects.
59
+
60
+ Will merge to 'next'.
61
+
62
+
63
+
64
+ * jt/ref-transaction-abort-fix (2025-03-21) 1 commit
65
+ - builtin/fetch: avoid aborting closed reference transaction
66
+
67
+ A ref transaction corner case fix.
68
+
69
+ Will merge to 'next'?
70
+
71
+
72
+
73
+ * kn/ci-meson-check-build-docs-fix (2025-03-20) 1 commit
74
+ - ci/github: add missing 'CI_JOB_IMAGE' env variable
75
+
76
+ GitHub Actions CI switched on a CI/CD variable that does not exist
77
+ when choosing what packages to install etc., which has been
78
+ corrected.
79
+
80
+ Will merge to 'next'.
81
+
82
+
83
+
84
+ * ms/reftable-block-writer-errors (2025-03-21) 3 commits
85
+ - reftable: adapt write_object_record() to propagate block_writer_add() errors
86
+ - reftable: adapt writer_add_record() to propagate block_writer_add() errors
87
+ - reftable: propagate specific error codes in block_writer_add()
88
+
89
+ Give more meaningful error return values from block writer layer of
90
+ the reftable ref-API backend.
91
+
92
+ Will merge to 'next'.
93
+
94
+
95
+
96
+
97
+ * tb/bitamp-typofix (2025-03-21) 1 commit
98
+ - pseudo-merge.h: fix a typo
99
+
100
+ Typofix.
101
+
102
+ Will merge to 'next'.
103
+ source: <3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>
104
+
105
+
106
+ * tb/http-curl-keepalive (2025-03-21) 4 commits
107
+ - http.c: allow custom TCP keepalive behavior via config
108
+ - http.c: inline `set_curl_keepalive()`
109
+ - http.c: introduce `set_long_from_env()` for convenience
110
+ - http.c: remove unnecessary casts to long
111
+
112
+ TCP keepalive behaviour on http transports can now be configured by
113
+ calling cURL library.
114
+
115
+ Will merge to 'next'.
116
+ cf. <CABPp-BEn+NfGu1c=ZWjwnFBJgmsxRVSq+Roin-KDQGqKPdDhCg@mail.gmail.com>
117
+
118
+
119
+
120
+ * tb/refspec-fetch-cleanup (2025-03-21) 5 commits
121
+ - refspec: replace `refspec_item_init()` with fetch/push variants
122
+ - refspec: remove refspec_item_init_or_die()
123
+ - refspec: replace `refspec_init()` with fetch/push variants
124
+ - refspec: treat 'fetch' as a Boolean value
125
+ - Merge branch 'jk/fetch-ref-prefix-cleanup' into tb/refspec-fetch-cleanup
126
+ (this branch uses jk/fetch-ref-prefix-cleanup.)
127
+
128
+ Code clean-up.
129
+
130
+ Will merge to 'next'.
131
+ cf. <CABPp-BE6JmiXB+pUL1Z4ewVDbG2RBxCdA2m5-WTYtoKMTtu_Xw@mail.gmail.com>
132
+
133
+
134
+
135
+ * zy/send-email-error-handling (2025-03-21) 2 commits
136
+ . send-email: finer-grained SMTP error handling
137
+ . send-email: capture errors in an eval {} block
138
+
139
+ Auth-related (and unrelated) error handling in send-email has been
140
+ made more robust.
141
+
142
+ Breaks t9001.
143
+
144
+
145
+ --------------------------------------------------
146
+ [Cooking]
147
+
57
148
* aj/doc-restore-p-update (2025-03-18) 1 commit
58
149
- doc: restore: remove note on --patch w/ pathspecs
59
150
@@ -98,39 +189,24 @@ Release tarballs are available at:
98
189
99
190
100
191
101
- * ja/doc-branch-markup (2025-03-17 ) 2 commits
192
+ * ja/doc-branch-markup (2025-03-20 ) 2 commits
102
193
- doc: apply new format to git-branch man page
103
194
- completion: take into account the formatting backticks for options
104
195
105
- Expecting a reroll to lose GNUism.
106
- cf. <2773494.mvXUDI8C0e@cayenne>
107
-
108
-
196
+ Doc mark-up updates.
109
197
110
- * jc/ci-meson-check-build-docs-fix (2025-03-14) 1 commit
111
- - install meson for Documentation job
112
- (this branch uses ps/ci-meson-check-build-docs.)
113
-
114
- The documentation CI job tries to build test documentation pages
115
- with both make- and meson-based build procedures, but somehow
116
- forgot to install meson in the Ci environment, which has been
117
- corrected.
118
-
119
- Will discard. Karthik root-caused the issue.
120
-
121
- cf. <CAOLa=ZRODjYfDXQ8m+hDosV7RBGDWeehzSvsR-+-HCmbS+tAcQ@mail.gmail.com>
122
-
198
+ Will merge to 'next'.
199
+
123
200
124
201
125
- * ps/mingw-creat-excl-fix (2025-03-13 ) 2 commits
202
+ * ps/mingw-creat-excl-fix (2025-03-21 ) 2 commits
126
203
- compat/mingw: fix EACCESS when opening files with `O_CREAT | O_EXCL`
127
- - compat/mingw: handle O_CLOEXEC in `mingw_open_existing()`
204
+ - meson: fix compat sources when compiling with MSVC
128
205
129
- Attempt to fix lockfile contention in reftable code on Windows.
206
+ Fix lockfile contention in reftable code on Windows.
130
207
131
- The second step needs rethinking.
132
-
133
-
208
+ Comments?
209
+
134
210
135
211
136
212
* rs/xdiff-context-length-fix (2025-03-14) 1 commit
@@ -154,7 +230,7 @@ Release tarballs are available at:
154
230
source: <3d127f293818f935efdb9ca7bb556e6a8f233ef7.1741975557.git.sam@gentoo.org>
155
231
156
232
157
- * tb/combine-cruft-below-size (2025-03-17 ) 6 commits
233
+ * tb/combine-cruft-below-size (2025-03-21 ) 6 commits
158
234
- repack: begin combining cruft packs with `--combine-cruft-below-size`
159
235
- repack: avoid combining cruft packs with `--max-cruft-size`
160
236
- t/t7704-repack-cruft.sh: consolidate `write_blob()`
@@ -166,8 +242,8 @@ Release tarballs are available at:
166
242
"git repack" learned "--combine-cruft-below-size" option that
167
243
controls how cruft-packs are combined.
168
244
169
- Needs review .
170
- source: <cover.
1742252411 [email protected] >
245
+ Will merge to 'next' .
246
+ source: <cover.
1742424671 [email protected] >
171
247
172
248
173
249
* jh/hash-init-fixes (2025-03-18) 1 commit
@@ -176,7 +252,8 @@ Release tarballs are available at:
176
252
An earlier code refactoring of the hash machinery missed a few
177
253
required calls to init_fn.
178
254
179
- Needs review.
255
+ Will merge to 'next'.
256
+
180
257
181
258
182
259
@@ -224,8 +301,6 @@ Release tarballs are available at:
224
301
Comments?
225
302
226
303
227
- --------------------------------------------------
228
- [Cooking]
229
304
230
305
* en/diff-rename-follow-fix (2025-03-14) 1 commit
231
306
(merged to 'next' on 2025-03-18 at 56808a7eda)
@@ -331,7 +406,7 @@ Release tarballs are available at:
331
406
+ t5516: drop NEEDSWORK about v2 reachability behavior
332
407
+ t5516: prefer "oid" to "sha1" in some test titles
333
408
+ t5702: fix typo in test name
334
- (this branch is used by jk/fetch-follow-remote-head-fix.)
409
+ (this branch is used by jk/fetch-follow-remote-head-fix and tb/refspec-fetch-cleanup .)
335
410
336
411
In protocol v2 where the refs advertisement is constrained, we try
337
412
to tell the server side not to limit the advertisement when there
@@ -342,19 +417,18 @@ Release tarballs are available at:
342
417
343
418
344
419
345
- * jt/rev-list-z (2025-03-13) 6 commits
420
+ * jt/rev-list-z (2025-03-21) 5 commits
346
421
- rev-list: support NUL-delimited --missing option
347
422
- rev-list: support NUL-delimited --boundary option
348
423
- rev-list: support delimiting objects with NUL bytes
349
- - revision: support NUL-delimited --stdin mode
350
424
- rev-list: refactor early option parsing
351
425
- rev-list: inline `show_object_with_name()` in `show_object()`
352
426
353
427
"git rev-list" learns machine-parsable output format that delimits
354
428
each field with NUL.
355
429
356
430
Will merge to 'next'?
357
- source: <
20250313001706.3390502 [email protected] >
431
+ source: <
20250319183410.1225428 [email protected] >
358
432
359
433
360
434
* kn/reflog-drop (2025-03-17) 2 commits
@@ -467,16 +541,16 @@ Release tarballs are available at:
467
541
468
542
469
543
470
- * kn/non-transactional-batch-updates (2025-03-12 ) 9 commits
471
- . update-ref: add --allow-partial flag for stdin mode
472
- . refs: support partial update rejections during F/D checks
473
- . refs: implement partial reference transaction support
474
- . refs: introduce enum-based transaction error types
475
- . refs/reftable: extract code from the transaction preparation
476
- . refs/files: remove duplicate duplicates check
477
- . refs: move duplicate refname update check to generic layer
478
- . refs/files: remove redundant check in split_symref_update()
479
- . Merge branch 'ps/refname-avail-check-optim' into kn/non-transactional-batch-updates
544
+ * kn/non-transactional-batch-updates (2025-03-21 ) 9 commits
545
+ - update-ref: add --batch-updates flag for stdin mode
546
+ - refs: support rejection in batch updates during F/D checks
547
+ - refs: implement batch reference update support
548
+ - refs: introduce enum-based transaction error types
549
+ - refs/reftable: extract code from the transaction preparation
550
+ - refs/files: remove duplicate duplicates check
551
+ - refs: move duplicate refname update check to generic layer
552
+ - refs/files: remove redundant check in split_symref_update()
553
+ - Merge branch 'ps/refname-avail-check-optim' into kn/non-transactional-batch-updates
480
554
(this branch uses ps/refname-avail-check-optim.)
481
555
482
556
Updating multiple references have only been possible in all-or-none
@@ -485,8 +559,8 @@ Release tarballs are available at:
485
559
best-effort manner. A new "best effort batches of updates" mode
486
560
has been introduced.
487
561
488
- Trips up -Wunreachable-code checker.
489
- source: <20250305 -245-partially-atomic-ref-updates-v3 -0-0c64e3052354 @gmail.com>
562
+ Comments?
563
+ source: <20250320 -245-partially-atomic-ref-updates-v4 -0-3dcc1b311dc9 @gmail.com>
490
564
491
565
492
566
* ps/object-wo-the-repository (2025-03-10) 12 commits
@@ -722,7 +796,7 @@ Release tarballs are available at:
722
796
723
797
724
798
725
- * tb/incremental-midx-part-2 (2025-03-14) 13 commits
799
+ * tb/incremental-midx-part-2 (2025-03-21) 14 commits
726
800
- midx: implement writing incremental MIDX bitmaps
727
801
- pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators
728
802
- pack-bitmap.c: keep track of each layer's type bitmaps
@@ -736,11 +810,12 @@ Release tarballs are available at:
736
810
- pack-bitmap.c: open and store incremental bitmap layers
737
811
- pack-revindex: prepare for incremental MIDX bitmaps
738
812
- Documentation: describe incremental MIDX bitmaps
813
+ - Documentation: remove a "future work" item from the MIDX docs
739
814
740
815
Incrementally updating multi-pack index files.
741
816
742
- Will merge to 'next'.
743
- source: <cover.
1741983492 [email protected] >
817
+ Comments?
818
+ source: <cover.
1742493373 [email protected] >
744
819
745
820
746
821
* ej/cat-file-remote-object-info (2025-02-24) 8 commits
@@ -756,3 +831,20 @@ Release tarballs are available at:
756
831
"git cat-file --batch" and friends can optionally ask a remote
757
832
server about objects it does not have.
758
833
834
+
835
+ --------------------------------------------------
836
+ [Discarded]
837
+
838
+ * jc/ci-meson-check-build-docs-fix (2025-03-14) 1 commit
839
+ . install meson for Documentation job
840
+ (this branch uses ps/ci-meson-check-build-docs.)
841
+
842
+ The documentation CI job tries to build test documentation pages
843
+ with both make- and meson-based build procedures, but somehow
844
+ forgot to install meson in the Ci environment, which has been
845
+ corrected.
846
+
847
+ Discarded. kn/ci-meson-check-build-docs-fix gives us the right fix.
848
+
849
+ cf. <CAOLa=ZRODjYfDXQ8m+hDosV7RBGDWeehzSvsR-+-HCmbS+tAcQ@mail.gmail.com>
850
+
0 commit comments