What's cooking (2024/10 #10)
Taylor Blau committed
Oct 22, 2024 at 16:08 UTC
d486550793c7af83fa7e0d24e1f4697f45bbc655
1 file changed
+289
-188
whats-cooking.txt
+289
-188
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2024, #09; Fri, 18)
3
-X-master-at: 34b6ce9b30747131b6e781ff718a45328aa887d0
4
-X-next-at: 1226f6d8faf60d03cbb3b021c68d48364bf67ac0
2
+Subject: What's cooking in git.git (Oct 2024, #10; Tue, 22)
3
+X-master-at: fd3785337beb285ed7fd67ce6fc3d3bed2097b40
4
+X-next-at: 0d6d43b58acc8d3aa85089b1bdf2e30d60228685
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2024, #09; Fri, 18)
7
+What's cooking in git.git (Oct 2024, #10; Tue, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,11 +17,12 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-This is the second integration round from the interim maintainer. Some
21
-more topics which were marked to graduate to 'master' have done so,
22
-and 'next' has some new topics that have moved down. A large handful
23
-of topics are awaiting review or discussion, so please take a look at
24
-those marked as such below.
20
+This is the third integration round from the interim maintainer. A
21
+couple of topics have graduated from 'next', and there are 10 topics
22
+in 'next' that should graduate before the next integration round. As
23
+last time, there are still a large handful of topics are awaiting
24
+review or discussion, so please take a look at those marked as such
25
+below.
26
27
Copies of the source code to Git live in many repositories, and the
28
following is a list of the ones I push into or their mirrors. Some
@@ -58,98 +59,232 @@ Release tarballs are available at:
59
--------------------------------------------------
60
[Graduated to 'master']
61
61
-* aa/t7300-modernize (2024-10-09) 1 commit
62
- (merged to 'next' on 2024-10-11 at e3a8d7f6c4)
63
- + t7300-clean.sh: use test_path_* helper functions for error logging
62
+* cw/worktree-relative (2024-10-08) 4 commits
63
+ (merged to 'next' on 2024-10-18 at efc01c616e)
64
+ + worktree: add test for path handling in linked worktrees
65
+ + worktree: link worktrees with relative paths
66
+ + worktree: refactor infer_backlink() to use *strbuf
67
+ + Merge branch 'es/worktree-repair-copied' into cw/worktrees-relative
68
+ (this branch uses es/worktree-repair-copied.)
69
+
70
+ An extra worktree attached to a repository points at each other to
71
+ allow finding the repository from the worktree and vice versa
72
+ possible. Turn this linkage to relative paths.
73
+ source: <20241007-wt_relative_paths-v3-0-622cf18c45eb@pm.me>
74
+
75
+
76
+* es/worktree-repair-copied (2024-09-23) 1 commit
77
+ + worktree: repair copied repository and linked worktrees
78
+ (this branch is used by cw/worktree-relative.)
79
+
80
+ The heuristics in "git worktree repair" can be confused when et
81
+ worktree and its repository are copied and break correctly
82
+ configured worktree and repository that point at each other, which
83
+ has been corrected.
84
+
85
+ source: <20240923075416.54289-1-ericsunshine@charter.net>
86
65
- Test modernization.
87
67
- source: <pull.1811.v4.git.1728498122419.gitgitgadget@gmail.com>
88
+* ps/cache-tree-w-broken-index-entry (2024-10-07) 3 commits
89
+ (merged to 'next' on 2024-10-18 at 0048cdba0b)
90
+ + unpack-trees: detect mismatching number of cache-tree/index entries
91
+ + cache-tree: detect mismatching number of index entries
92
+ + cache-tree: refactor verification to return error codes
93
+
94
+ Fail gracefully instead of crashing when attempting to write the
95
+ contents of a corrupt in-core index as a tree object.
96
+ source: <cover.1728275640.git.ps@pks.im>
97
98
+--------------------------------------------------
99
+[New Topics]
100
70
-* jc/doc-refspec-syntax (2024-10-09) 1 commit
71
- (merged to 'next' on 2024-10-11 at 912ed5fae8)
72
- + doc: clarify <src> in refspec syntax
101
+* ak/t1016-cleanup (2024-10-22) 1 commit
102
+ - t1016: clean up style
103
+ (this branch uses ak/typofix.)
104
74
- Doc updates.
105
+ Test cleanup.
106
76
- source: <xmqqy137wtyz.fsf@gitster.g>
107
+ Will merge to 'next'.
108
+ source: <20241022110730.7655-1-algonell@gmail.com>
109
110
79
-* kh/checkout-ignore-other-docfix (2024-10-10) 1 commit
80
- (merged to 'next' on 2024-10-11 at ed66b60f52)
81
- + checkout: refer to other-worktree branch, not ref
111
+* cw/config-extensions (2024-10-22) 1 commit
112
+ - doc: consolidate extensions in git-config documentation
113
83
- Doc updates.
114
+ Centralize documentation for repository extensions into a single place.
115
+ source: <20241021-cleanup-extension-docs-v1-1-ab02cece3132@pm.me>
116
85
- source: <fcfbcd3868bda75dd0463e04739047e74d239d32.1728585467.git.code@khaugsbakk.name>
117
118
+* kh/mv-breakage (2024-10-21) 1 commit
119
+ - t7001: add' failure test which triggers assertion
120
88
-* kh/merge-tree-doc (2024-10-09) 1 commit
89
- (merged to 'next' on 2024-10-11 at b22c213d6c)
90
- + doc: merge-tree: improve example script
121
+ Demonstrate an assertion failure in 'git mv'.
122
+
123
+ Will merge to 'next'?
124
+ source: <29d71db280c972c91174bd0a501af66be72643af.1729462326.git.code@khaugsbakk.name>
125
+
126
+
127
+* kh/submitting-patches (2024-10-21) 1 commit
128
+ (merged to 'next' on 2024-10-22 at 0882adfc45)
129
+ + SubmittingPatches: tags -> trailers
130
131
Docfix.
93
- cf. <CABPp-BE=JfoZp19Va-1oF60ADBUibGDwDkFX-Zytx7A3uJ__gg@mail.gmail.com>
94
- source: <c7e0d76e71eef56c6279e0f7e82a2d194f78d2a4.1728492617.git.code@khaugsbakk.name>
132
133
+ Will merge to 'master'.
134
+ source: <d3a1ba01104da8496d52308c07c5c274fd30b0c2.1729443395.git.code@khaugsbakk.name>
135
97
-* kn/loose-object-layer-wo-global-hash (2024-10-09) 1 commit
98
- (merged to 'next' on 2024-10-11 at 99252fb6cc)
99
- + loose: don't rely on repository global state
136
101
- Code clean-up.
137
+* km/config-remote-by-name (2024-10-21) 1 commit
138
+ - config: support remote name in includeIf.hasconfig condition
139
103
- source: <CAOLa=ZRMaw-PAsZ9s0zJ2zp_suMppi=ZrT67B__LU1tWZSvuUQ@mail.gmail.com>
140
+ Support conditionally including configuration by remote name, instead
141
+ of just URL.
142
143
+ Needs review.
144
+ source: <20241020173216.40852-2-ken@kmatsui.me>
145
106
-* ng/rebase-merges-branch-name-as-label (2024-10-09) 3 commits
107
- (merged to 'next' on 2024-10-11 at a5785fd206)
108
- + rebase-merges: try and use branch names as labels
109
- + rebase-update-refs: extract load_branch_decorations
110
- + load_branch_decorations: fix memory leak with non-static filters
146
112
- "git rebase --rebase-merges" now uses branch names as labels when
113
- able.
147
+* kn/arbitrary-suffixes (2024-10-21) 1 commit
148
+ - CodingGuidelines: discourage arbitrary suffixes in function names
149
115
- source: <pull.1784.v3.git.git.1728460700.gitgitgadget@gmail.com>
150
+ Update the project's CodingGuidelines to discourage naming functions
151
+ with a "_1()" suffix.
152
153
+ Under discussion.
154
+ source: <20241021124145.636561-1-karthik.188@gmail.com>
155
+
156
+
157
+* ks/t4205-fixup (2024-10-21) 1 commit
158
+ (merged to 'next' on 2024-10-22 at daa85d02c3)
159
+ + t4205: fix typo in 'NUL termination with --stat'
160
+
161
+ Testfix.
162
+
163
+ Will merge to 'master'.
164
+ source: <20241020191910.31096-1-five231003@gmail.com>
165
+
166
+
167
+* ps/leakfixes-part-9 (2024-10-21) 22 commits
168
+ - list-objects-filter-options: work around reported leak on error
169
+ - builtin/merge: release outbut buffer after performing merge
170
+ - dir: fix leak when parsing "status.showUntrackedFiles"
171
+ - t/helper: fix leaking buffer in "dump-untracked-cache"
172
+ - t/helper: stop re-initialization of `the_repository`
173
+ - sparse-index: correctly free EWAH contents
174
+ - dir: release untracked cache data
175
+ - combine-diff: fix leaking lost lines
176
+ - builtin/tag: fix leaking key ID on failure to sign
177
+ - transport-helper: fix leaking import/export marks
178
+ - builtin/commit: fix leaking cleanup config
179
+ - trailer: fix leaking strbufs when formatting trailers
180
+ - trailer: fix leaking trailer values
181
+ - builtin/commit: fix leaking change data contents
182
+ - upload-pack: fix leaking URI protocols
183
+ - pretty: clear signature check
184
+ - diff-lib: fix leaking diffopts in `do_diff_cache()`
185
+ - revision: fix leaking bloom filters
186
+ - builtin/grep: fix leak with `--max-count=0`
187
+ - grep: fix leak in `grep_splice_or()`
188
+ - t/helper: fix leaks in "reach" test tool
189
+ - builtin/ls-remote: plug leaking server options
190
+
191
+ More leakfixes.
192
118
-* ps/maintenance-start-crash-fix (2024-10-10) 1 commit
119
- (merged to 'next' on 2024-10-11 at c54df41815)
120
- + builtin/gc: fix crash when running `git maintenance start`
193
+ Needs review.
194
+ source: <cover.1729502823.git.ps@pks.im>
195
122
- "git maintenance start" crashed due to an uninitialized variable
123
- reference, which has been corrected.
196
125
- source: <a5b1433abfd84cb627efc17f52e0d644ee207bb0.1728538282.git.ps@pks.im>
197
+* ps/upload-pack-doc (2024-10-21) 1 commit
198
+ - doc: document how uploadpack.allowAnySHA1InWant impact other allow options
199
200
+ Documentation update to clarify that 'uploadpack.allowAnySHA1InWant'
201
+ implies both 'allowTipSHA1InWant' and 'allowReachableSHA1InWant'.
202
128
-* tc/bundle-uri-leakfix (2024-10-10) 1 commit
129
- (merged to 'next' on 2024-10-11 at 07ac214952)
130
- + bundle-uri: plug leak in unbundle_from_file()
203
+ Will merge to 'next'?
204
+ source: <pull.1814.v2.git.git.1729355997353.gitgitgadget@gmail.com>
205
132
- Leakfix.
206
134
- source: <20241010091249.1895960-1-toon@iotcl.com>
207
+* rj/cygwin-exit (2024-10-18) 1 commit
208
+ - credential-cache: treat ECONNABORTED like ECONNRESET
209
210
+ Treat ECONNABORTED the same as ECONNRESET in 'git credential-cache' to
211
+ work around a possible Cygwin regression. This resolves a race condition
212
+ caused by changes in Cygwin's handling of socket closures, allowing the
213
+ client to exit cleanly when encountering ECONNABORTED.
214
137
-* xx/protocol-v2-doc-markup-fix (2024-10-10) 1 commit
138
- (merged to 'next' on 2024-10-11 at 37932adca4)
139
- + Documentation/gitprotocol-v2.txt: fix a slight inconsistency in format
215
+ Will merge to 'next'?
216
+ source: <20241018052952.GE2408674@coredump.intra.peff.net>
217
141
- Docfix.
218
143
- source: <pull.1807.git.git.1728566443089.gitgitgadget@gmail.com>
219
+* rs/grep-lookahead (2024-10-22) 1 commit
220
+ - grep: disable lookahead on error
221
+
222
+ Fix 'git grep' regression on macOS by disabling lookahead when
223
+ encountering invalid UTF-8 byte sequences.
224
+
225
+ Will merge to 'next'.
226
+ source: <7a51a68e-5f9d-4444-a568-9ca180bc4c6b@web.de>
227
+
228
+
229
+* sa/notes-edit (2024-10-21) 1 commit
230
+ - notes: teach the -e option to edit messages in editor
231
+
232
+ Teach 'git notes add' and 'git notes append' a new '-e' flag,
233
+ instructing them to open the note in $GIT_EDITOR before saving.
234
+
235
+ Needs review.
236
+ source: <pull.1817.v4.git.1729534340786.gitgitgadget@gmail.com>
237
+
238
+
239
+* sk/t7011-cleanup (2024-10-22) 1 commit
240
+ (merged to 'next' on 2024-10-22 at 4273cb6260)
241
+ + t7011: ensure no whitespace after redirect
242
+
243
+ Test cleanup.
244
+ source: <20241018191744.209746-1-kuforiji98@gmail.com>
245
+
246
+
247
+* ss/duplicate-typos (2024-10-21) 1 commit
248
+ - global: Fix duplicate word typos
249
+
250
+ Typofixes.
251
+
252
+ Will merge to 'next'?
253
+ source: <6ce47185-690d-415e-95c9-06a3b828be29e@cs-ware.de>
254
+
255
+
256
+* ua/atoi (2024-10-22) 3 commits
257
+ - imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing
258
+ - merge: replace atoi() with strtol_i() for marker size validation
259
+ - daemon: replace atoi() with strtoul_ui() and strtol_i()
260
+
261
+ Replace various calls to atoi() with strtol_i() and strtoul_ui(), and
262
+ add improved error handling.
263
+
264
+ Under review.
265
+ source: <pull.1810.v3.git.git.1729574624.gitgitgadget@gmail.com>
266
+
267
+
268
+* y5/diff-pager (2024-10-21) 1 commit
269
+ - diff: setup pager only before diff contents truly ready
270
+
271
+ Delay setting up the pager in 'git diff' until after the diff contents
272
+ itself is fully prepared.
273
+
274
+ Under review.
275
+ source: <pull.1817.git.git.1729370390416.gitgitgadget@gmail.com>
276
277
--------------------------------------------------
146
-[New Topics]
278
+[Cooking]
279
280
* ak/typofix (2024-10-17) 1 commit
281
+ (merged to 'next' on 2024-10-18 at 83df4b3265)
282
+ t: fix typos
283
+ (this branch is used by ak/t1016-cleanup.)
284
285
More typofixes.
286
287
+ Will merge to 'master'.
288
source: <20241017112835.10100-1-algonell@gmail.com>
289
290
@@ -161,41 +296,43 @@ Release tarballs are available at:
296
Teach configuration values of type "pathname" a new ':(optional)'
297
suffix.
298
299
+ Needs review.
300
source: <20241014204427.1712182-1-gitster@pobox.com>
301
302
167
-* kh/update-ref (2024-10-16) 6 commits
168
- - doc: mutually link update-ref and symbolic-ref
169
- - doc: update-ref: discuss symbolic links
170
- - doc: update-ref: remove confusing paragraph
171
- - doc: update-ref: demote symlink to last section
172
- - doc: update-ref: remove safety paragraphs
173
- - doc: update-ref: drop “flag”
303
+* kh/update-ref (2024-10-21) 6 commits
304
+ - Documentation: mutually link update-ref and symbolic-ref
305
+ - Documentation/git-update-ref.txt: discuss symbolic refs
306
+ - Documentation/git-update-ref.txt: remove confusing paragraph
307
+ - Documentation/git-update-ref.txt: demote symlink to last section
308
+ - Documentation/git-update-ref.txt: remove safety paragraphs
309
+ - Documentation/git-update-ref.txt: drop “flag”
310
311
Documentation updates to 'git-update-ref(1)'.
312
177
- source: <cover.1729017728.git.code@khaugsbakk.name>
313
+ Under discussion.
314
+ source: <cover.1729543007.git.code@khaugsbakk.name>
315
316
180
-* ps/ref-filter-sort (2024-10-17) 1 commit
181
- - ref-filter: format iteratively with lexicographic refname sorting
317
+* ps/ref-filter-sort (2024-10-21) 1 commit
318
+ (merged to 'next' on 2024-10-22 at 6313df7028)
319
+ + ref-filter: format iteratively with lexicographic refname sorting
320
321
Teaches the ref-filter machinery to recognize and avoid cases where
322
sorting would be redundant.
323
186
- Will merge to 'next'?
187
- source: <e0daa6a2eac97c2b18a53399b7c124fc8d3d238d.1729141657.git.ps@pks.im>
324
+ source: <d23c3e3ee7fdb49fcd05b4f2e52dd2a1cfdc10f2.1729510342.git.ps@pks.im>
325
326
327
* sk/msvc-warnings (2024-10-17) 1 commit
328
+ (merged to 'next' on 2024-10-18 at 954a1eb93d)
329
+ mingw.c: Fix complier warnings for a 64 bit msvc
330
331
Fixes compile time warnings with 64-bit MSVC.
332
333
+ Will merge to 'master'.
334
source: <20241017171820.2679-2-soekkle@freenet.de>
335
197
---------------------------------------------------
198
-[Cooking]
336
337
* am/git-blame-ignore-revs-by-default (2024-10-14) 2 commits
338
- blame: introduce --override-ignore-revs to bypass ignore revisions list
@@ -204,17 +341,18 @@ Release tarballs are available at:
341
Teaches 'git blame' to treat '.git-blame-ignore-revs' as if it were
342
passed as '--ignore-revs-file' by default.
343
344
+ Under discussion.
345
source: <pull.1809.v2.git.1728707867.gitgitgadget@gmail.com>
346
347
210
-* kn/ci-clang-format-tidy (2024-10-14) 3 commits
211
- - clang-format: don't align expressions after linebreaks
348
+* kn/ci-clang-format-tidy (2024-10-18) 2 commits
349
- clang-format: align consecutive macro definitions
350
- clang-format: re-adjust line break penalties
351
352
Updates the '.clang-format' to match project conventions.
353
217
- source: <cover.1728697428.git.karthik.188@gmail.com>
354
+ Needs review.
355
+ source: <cover.1729241030.git.karthik.188@gmail.com>
356
357
358
* la/trailer-info (2024-10-14) 1 commit
@@ -222,64 +360,60 @@ Release tarballs are available at:
360
361
Refactoring.
362
363
+ Needs review.
364
source: <pull.1811.git.git.1728820722580.gitgitgadget@gmail.com>
365
366
228
-* ps/cmake-clar (2024-10-15) 3 commits
229
- - cmake: set up proper dependencies for generated clar headers
230
- - cmake: fix compilation of clar-based unit tests
231
- - Makefile: extract script to generate clar declarations
232
-
233
- Buildfix for unit tests when using CMake.
234
-
235
- source: <cover.1728985514.git.ps@pks.im>
236
-
237
-
367
* ps/platform-compat-fixes (2024-10-16) 10 commits
239
- - http: fix build error on FreeBSD
240
- - builtin/credential-cache: fix missing parameter for stub function
241
- - t7300: work around platform-specific behaviour with long paths on MinGW
242
- - t5500, t5601: skip tests which exercise paths with '[::1]' on Cygwin
243
- - t3404: work around platform-specific behaviour on macOS 10.15
244
- - t1401: make invocation of tar(1) work with Win32-provided one
245
- - t/lib-gpg: fix setup of GNUPGHOME in MinGW
246
- - t/lib-gitweb: test against the build version of gitweb
247
- - t/test-lib: wire up NO_ICONV prerequisite
248
- - t/test-lib: fix quoting of TEST_RESULTS_SAN_FILE
368
+ (merged to 'next' on 2024-10-22 at 46b99d8301)
369
+ + http: fix build error on FreeBSD
370
+ + builtin/credential-cache: fix missing parameter for stub function
371
+ + t7300: work around platform-specific behaviour with long paths on MinGW
372
+ + t5500, t5601: skip tests which exercise paths with '[::1]' on Cygwin
373
+ + t3404: work around platform-specific behaviour on macOS 10.15
374
+ + t1401: make invocation of tar(1) work with Win32-provided one
375
+ + t/lib-gpg: fix setup of GNUPGHOME in MinGW
376
+ + t/lib-gitweb: test against the build version of gitweb
377
+ + t/test-lib: wire up NO_ICONV prerequisite
378
+ + t/test-lib: fix quoting of TEST_RESULTS_SAN_FILE
379
+ (this branch is used by ps/build.)
380
381
Various platform compatibility fixes split out of the larger effort
382
to use Meson as the primary build tool.
383
253
- Will merge to 'next'?
384
source: <cover.1729060405.git.ps@pks.im>
385
386
387
* ps/reftable-strbuf (2024-10-17) 10 commits
258
- - reftable: handle trivial `reftable_buf` errors
259
- - reftable/stack: adapt `stack_filename()` to handle allocation failures
260
- - reftable/record: adapt `reftable_record_key()` to handle allocation failures
261
- - reftable/stack: adapt `format_name()` to handle allocation failures
262
- - t/unit-tests: check for `reftable_buf` allocation errors
263
- - reftable/blocksource: adapt interface name
264
- - reftable: convert from `strbuf` to `reftable_buf`
265
- - reftable/basics: provide new `reftable_buf` interface
266
- - reftable: stop using `strbuf_addf()`
267
- - reftable: stop using `strbuf_addbuf()`
388
+ (merged to 'next' on 2024-10-22 at 469c11aca4)
389
+ + reftable: handle trivial `reftable_buf` errors
390
+ + reftable/stack: adapt `stack_filename()` to handle allocation failures
391
+ + reftable/record: adapt `reftable_record_key()` to handle allocation failures
392
+ + reftable/stack: adapt `format_name()` to handle allocation failures
393
+ + t/unit-tests: check for `reftable_buf` allocation errors
394
+ + reftable/blocksource: adapt interface name
395
+ + reftable: convert from `strbuf` to `reftable_buf`
396
+ + reftable/basics: provide new `reftable_buf` interface
397
+ + reftable: stop using `strbuf_addf()`
398
+ + reftable: stop using `strbuf_addbuf()`
399
400
Implements a new reftable-specific strbuf replacement to reduce
401
reftable's dependency on Git-specific data structures.
402
272
- Will merge to 'next'?
403
source: <cover.1729140565.git.ps@pks.im>
404
405
276
-* ps/upgrade-clar (2024-10-14) 2 commits
406
+* ps/upgrade-clar (2024-10-21) 5 commits
407
+ - cmake: set up proper dependencies for generated clar headers
408
+ - cmake: fix compilation of clar-based unit tests
409
+ - Makefile: extract script to generate clar declarations
410
- Makefile: adjust sed command for generating "clar-decls.h"
278
- - t/unit-tests: update clar to 0810a36
411
+ - t/unit-tests: update clar to 206accb
412
413
Buildfix and upgrade of Clar to a newer version.
414
282
- source: <cover.1728903464.git.ps@pks.im>
415
+ Needs review.
416
+ source: <cover.1729506329.git.ps@pks.im>
417
418
419
* wf/diff-highlight-install (2024-10-14) 1 commit
@@ -287,16 +421,18 @@ Release tarballs are available at:
421
422
Adds an 'install' recipe to diff-highlight's Makefile.
423
424
+ Under discussion.
425
source: <pull.938.v3.git.git.1728764613835.gitgitgadget@gmail.com>
426
427
428
* wm/shortlog-hash (2024-10-17) 1 commit
429
+ (merged to 'next' on 2024-10-18 at 25307069e9)
430
+ builtin/shortlog: explicitly set hash algo when there is no repo
431
432
Teaches 'shortlog' to explicitly use SHA-1 when operating outside of
433
a repository.
434
299
- Will merge to 'next'.
435
+ Will merge to 'master'.
436
source: <20241017093528.18157-1-wolf@oriole.systems>
437
438
@@ -321,16 +457,14 @@ Release tarballs are available at:
457
source: <20241010235621.738239-1-sandals@crustytoothpaste.net>
458
459
324
-* co/t6050-pipefix (2024-10-15) 1 commit
325
- - t6050: avoid pipes with upstream Git commands
460
+* co/t6050-pipefix (2024-10-22) 1 commit
461
+ (merged to 'next' on 2024-10-22 at d377ddbb64)
462
+ + t6050: avoid pipes with upstream Git commands
463
464
Avoid losing exit status by having Git command being tested on the
465
upstream side of a pipe.
466
330
- Needs review.
331
- There is at least one known broken conversion.
332
- cf. <CAPig+cRLdzAEA-G=L81yR9dmm8Y-5VEU7ybyohKmbq9=0bDUaQ@mail.gmail.com>
333
- source: <20241015112645.415955-1-chizobajames21@gmail.com>
467
+ source: <20241022012701.8959-1-chizobajames21@gmail.com>
468
469
470
* es/oss-fuzz (2024-10-16) 3 commits
@@ -370,16 +504,19 @@ Release tarballs are available at:
504
505
Doc update.
506
507
+ Will merge to 'master'.
508
source: <20241011191150.825255-1-bence@ferdinandy.com>
509
510
376
-* bf/set-head-symref (2024-10-15) 6 commits
511
+* bf/set-head-symref (2024-10-21) 8 commits
512
+ . fetch set_head: handle mirrored bare repositories
513
. fetch: set remote/HEAD if it does not exist
378
- . refs: add create_only option to refs_update_symref
514
+ . refs: add create_only option to refs_update_symref_extended
515
. refs: add TRANSACTION_CREATE_EXISTS error
516
. remote set-head: better output for --auto
381
- . remote set-head: add new variable for readability
517
+ . remote set-head: refactor for readability
518
. refs: atomically record overwritten ref in update_symref
519
+ . t/t5505-remote: set default branch to main
520
521
When "git fetch $remote" notices that refs/remotes/$remote/HEAD is
522
missing and discovers what branch the other side points with its
@@ -387,7 +524,9 @@ Release tarballs are available at:
524
525
Needs to shed files backend dependency a bit more.
526
cf. <D4SUTJDV0Y04.3Q8YED2MVOKBL@ferdinandy.com>
390
- source: <20241014225431.1394565-1-bence@ferdinandy.com>
527
+ Appears to break CI.
528
+ cf. <ZxfjWnZF4EbtVH12@nand.local>
529
+ source: <20241021134354.705636-1-bence@ferdinandy.com>
530
531
532
* db/submodule-fetch-with-remote-name-fix (2024-10-09) 1 commit
@@ -398,41 +537,39 @@ Release tarballs are available at:
537
a wrong remote when the default remote names are set differently
538
between them.
539
540
+ Will merge to 'master'.
541
source: <20241009033257.1316690-1-daniel@mariadb.org>
542
543
404
-* ps/build (2024-10-09) 24 commits
544
+* ps/build (2024-10-18) 20 commits
545
. Introduce support for the Meson build system
546
. Documentation: add comparison of build systems
547
. t: allow overriding build dir
548
. t: better support for out-of-tree builds
549
. Makefile: simplify building of templates
550
. Makefile: allow "bin-wrappers/" directory to exist
411
- . Makefile: consistently use PERL_PATH
412
- . Makefile: consistently use @PLACEHOLDER@ to substitute
413
- . Makefile: use common template for GIT-BUILD-OPTIONS
551
. Makefile: refactor generators to be PWD-independent
552
. Makefile: refactor GIT-VERSION-GEN to be reusable
553
+ . Makefile: extract script to generate gitweb.cgi
554
+ . Makefile: extract script to massage Shell scripts
555
+ . Makefile: use "generate-perl.sh" to massage Perl library
556
. Makefile: extract script to massage Perl scripts
417
- . Makefile: extract script to generate clar declarations
418
- . http: fix build error on FreeBSD
419
- . builtin/credential-cache: fix missing parameter for stub function
420
- . t/unit-tests: update clar unit test framework
421
- . t7300: work around platform-specific behaviour with long paths on MinGW
422
- . t5500, t5601: skip tests which exercise paths with '[::1]' on Cygwin
423
- . t3404: work around platform-specific behaviour on macOS 10.15
424
- . t1401: make invocation of tar(1) work with Win32-provided one
425
- . t/lib-gpg: fix setup of GNUPGHOME in MinGW
426
- . t/lib-gitweb: test against the build version of gitweb
427
- . t/test-lib: wire up NO_ICONV prerequisite
428
- . t/test-lib: fix quoting of TEST_RESULTS_SAN_FILE
557
+ . Makefile: consistently use PERL_PATH
558
+ . Makefile: consistently use @PLACEHOLDER@ to substitute
559
+ . Makefile: use common template for GIT-BUILD-OPTIONS
560
+ . Merge branch 'ps/platform-compat-fixes' into ps/build
561
+ . Merge branch 'ps/upgrade-clar' into ps/build
562
+ . Makefile: adjust sed command for generating "clar-decls.h"
563
+ . t/unit-tests: update clar to 0810a36
564
+ . Merge branch 'ps/cmake-clar' into ps/build
565
+ (this branch uses ps/cmake-clar and ps/platform-compat-fixes.)
566
567
Build procedure update plus introduction of Mason based builds
568
569
Needs review.
570
Tentatively dropped from 'seen', for a circular dependency.
571
cf. https://github.com/git/git/actions/runs/11299216196
435
- source: <cover.1728485139.git.ps@pks.im>
572
+ source: <cover.1729254070.git.ps@pks.im>
573
574
575
* ps/ci-gitlab-windows (2024-10-09) 5 commits
@@ -445,6 +582,7 @@ Release tarballs are available at:
582
583
Enable Windows-based CI in GitLab.
584
585
+ Will merge to 'master'.
586
source: <cover.1728480039.git.ps@pks.im>
587
588
@@ -459,24 +597,10 @@ Release tarballs are available at:
597
598
Typofixes.
599
600
+ Will merge to 'master'.
601
source: <20241010151223.311719-1-algonell@gmail.com>
602
603
465
-* cw/worktree-relative (2024-10-08) 4 commits
466
- (merged to 'next' on 2024-10-18 at efc01c616e)
467
- + worktree: add test for path handling in linked worktrees
468
- + worktree: link worktrees with relative paths
469
- + worktree: refactor infer_backlink() to use *strbuf
470
- + Merge branch 'es/worktree-repair-copied' into cw/worktrees-relative
471
- (this branch uses es/worktree-repair-copied.)
472
-
473
- An extra worktree attached to a repository points at each other to
474
- allow finding the repository from the worktree and vice versa
475
- possible. Turn this linkage to relative paths.
476
-
477
- source: <20241007-wt_relative_paths-v3-0-622cf18c45eb@pm.me>
478
-
479
-
604
* ds/path-walk (2024-10-08) 17 commits
605
- pack-objects: thread the path-based compression
606
- pack-objects: refactor path-walk delta phase
@@ -524,23 +648,11 @@ Release tarballs are available at:
648
649
Build fix.
650
651
+ Will merge to 'master'.
652
source: <pull.1810.v2.git.1728667787227.gitgitgadget@gmail.com>
653
654
530
-* ps/cache-tree-w-broken-index-entry (2024-10-07) 3 commits
531
- (merged to 'next' on 2024-10-18 at 0048cdba0b)
532
- + unpack-trees: detect mismatching number of cache-tree/index entries
533
- + cache-tree: detect mismatching number of index entries
534
- + cache-tree: refactor verification to return error codes
535
-
536
- Fail gracefully instead of crashing when attempting to write the
537
- contents of a corrupt in-core index as a tree object.
538
-
539
- source: <cover.1728275640.git.ps@pks.im>
540
-
541
-
542
-* ua/t3404-cleanup (2024-10-14) 3 commits
543
- - parse: replace atoi() with strtoul_ui() and strtol_i()
655
+* ua/t3404-cleanup (2024-10-14) 2 commits
656
- t3404: replace test with test_line_count()
657
- t3404: avoid losing exit status with focus on `git show` and `git cat-file`
658
@@ -562,6 +674,7 @@ Release tarballs are available at:
674
variable in a few of them have been removed using the new calling
675
convention.
676
677
+ Will merge to 'master'.
678
source: <pull.1788.v4.git.git.1728594828.gitgitgadget@gmail.com>
679
680
@@ -580,19 +693,6 @@ Release tarballs are available at:
693
source: <20240926013856.35527-1-eric.peijian@gmail.com>
694
695
583
-* es/worktree-repair-copied (2024-09-23) 1 commit
584
- + worktree: repair copied repository and linked worktrees
585
- (this branch is used by cw/worktree-relative.)
586
-
587
- The heuristics in "git worktree repair" can be confused when a
588
- worktree and its repository are copied and break correctly
589
- configured worktree and repository that point at each other, which
590
- has been corrected.
591
-
592
- Needs review.
593
- source: <20240923075416.54289-1-ericsunshine@charter.net>
594
-
595
-
696
* cw/fix-reachable-in-repo-with-promisor (2024-09-19) 2 commits
697
- fetch-pack.c: do not declare local commits as "have" in partial repos
698
- packfile: split promisor objects oidset into two
@@ -611,6 +711,7 @@ Release tarballs are available at:
711
712
Describe the policy to introduce breaking changes.
713
714
+ Will merge to 'master'?
715
source: <xmqq1q0mcnt8.fsf@gitster.g>
716
717
@@ -643,15 +744,15 @@ Release tarballs are available at:
744
source: <20240910163000.1985723-1-christian.couder@gmail.com>
745
746
646
-* sj/ref-contents-check (2024-09-30) 9 commits
747
+* sj/ref-contents-check (2024-10-21) 9 commits
748
- ref: add symlink ref content check for files backend
648
- - t0602: add ref content checks for worktrees
649
- - ref: enhance escape situation for worktrees
650
- - ref: add escape check for the referent of symref
749
+ - ref: check whether the target of the symref is a ref
750
- ref: add basic symref content check for files backend
751
- ref: add more strict checks for regular refs
752
- ref: port git-fsck(1) regular refs check for files backend
654
- - builtin/refs: support multiple worktrees check for refs.
753
+ - ref: support multiple worktrees check for refs
754
+ - ref: initialize target name outside of check functions
755
+ - ref: check the full refname instead of basename
756
- ref: initialize "fsck_ref_report" with zero
757
758
"git fsck" learned to issue warnings on "curiously formatted" ref
@@ -660,8 +761,8 @@ Release tarballs are available at:
761
after the full object name).
762
763
Needs review.
663
- cf. <xmqqikud6kc0.fsf@gitster.g>
664
- source: <Zvj-DgHqtC30KjJe@ArchLinux>
764
+ cf. <ZxZ+xteOnm0im5vC@nand.local>
765
+ source: <ZxZX5HDdq_R0C77b@ArchLinux>
766
767
768
* tb/incremental-midx-part-2 (2024-10-04) 17 commits