What's cooking (2024/10 #11)

Taylor Blau committed Oct 25, 2024 at 15:37 UTC 2cb913ae1ddab053532c170dd75017c498df3e4d
1 file changed +251 -232
whats-cooking.txt
+251 -232
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Oct 2024, #10; Tue, 22)
3 -X-master-at: fd3785337beb285ed7fd67ce6fc3d3bed2097b40
4 -X-next-at: 0d6d43b58acc8d3aa85089b1bdf2e30d60228685
2 +Subject: What's cooking in git.git (Oct 2024, #11; Fri, 25)
3 +X-master-at: 6a11438f43469f3815f2f0fc997bd45792ff04c0
4 +X-next-at: 085561eb38e0fbe071c2f9c2c4d2d8fe946eb186
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Oct 2024, #10; Tue, 22)
7 +What's cooking in git.git (Oct 2024, #11; Fri, 25)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -17,12 +17,14 @@ 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 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.
20 +This is the fourth integration round from the interim maintainer. Some
21 +more topics have graduated onto 'master', and a handful of new ones
22 +have been picked up into 'next' and so on.
23 +
24 +There are still more topics waiting for discussion that are stuck and
25 +would benefit from review. I encourage you to please take a look at
26 +those topics if you have not reviewed them, and pay the benefit others
27 +have given you forward by reviewing topics that are awaiting feedback.
28
29 Copies of the source code to Git live in many repositories, and the
30 following is a list of the ones I push into or their mirrors. Some
@@ -59,47 +61,159 @@ Release tarballs are available at:
61 --------------------------------------------------
62 [Graduated to 'master']
63
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.)
64 +* ak/typofix (2024-10-17) 1 commit
65 + (merged to 'next' on 2024-10-18 at 83df4b3265)
66 + + t: fix typos
67 + (this branch is used by ak/t1016-cleanup.)
68 +
69 + More typofixes.
70 +
71 + source: <20241017112835.10100-1-algonell@gmail.com>
72 +
73 +
74 +* ak/typofixes (2024-10-10) 6 commits
75 + (merged to 'next' on 2024-10-18 at c45095cae5)
76 + + t: fix typos
77 + + t/helper: fix a typo
78 + + t/perf: fix typos
79 + + t/unit-tests: fix typos
80 + + contrib: fix typos
81 + + compat: fix typos
82 +
83 + Typofixes.
84 +
85 + source: <20241010151223.311719-1-algonell@gmail.com>
86 +
87 +
88 +* bf/t-readme-mention-reftable (2024-10-11) 1 commit
89 + (merged to 'next' on 2024-10-18 at b246cb10d4)
90 + + t/README: add missing value for GIT_TEST_DEFAULT_REF_FORMAT
91 +
92 + Doc update.
93 +
94 + source: <20241011191150.825255-1-bence@ferdinandy.com>
95 +
96
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>
97 +* db/submodule-fetch-with-remote-name-fix (2024-10-09) 1 commit
98 + (merged to 'next' on 2024-10-18 at a473d0df83)
99 + + submodule: correct remote name with fetch
100
101 + A "git fetch" from the superproject going down to a submodule used
102 + a wrong remote when the default remote names are set differently
103 + between them.
104
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.)
105 + source: <20241009033257.1316690-1-daniel@mariadb.org>
106
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.
107
85 - source: <20240923075416.54289-1-ericsunshine@charter.net>
108 +* jc/a-commands-without-the-repo (2024-10-11) 3 commits
109 + (merged to 'next' on 2024-10-18 at b428982db3)
110 + + archive: remove the_repository global variable
111 + + annotate: remove usage of the_repository global
112 + + git: pass in repo to builtin based on setup_git_directory_gently
113
114 + Commands that can also work outside Git have learned to take the
115 + repository instance "repo" when we know we are in a repository, and
116 + NULL when we are not, in a parameter. The uses of the_repository
117 + variable in a few of them have been removed using the new calling
118 + convention.
119
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
120 + source: <pull.1788.v4.git.git.1728594828.gitgitgadget@gmail.com>
121 +
122 +
123 +* pb/clar-build-fix (2024-10-11) 1 commit
124 + (merged to 'next' on 2024-10-18 at ae6e80b047)
125 + + Makefile: fix dependency for $(UNIT_TEST_DIR)/clar/clar.o
126 +
127 + Build fix.
128 +
129 + source: <pull.1810.v2.git.1728667787227.gitgitgadget@gmail.com>
130
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>
131 +
132 +* ps/ci-gitlab-windows (2024-10-09) 5 commits
133 + (merged to 'next' on 2024-10-18 at 58a3be436a)
134 + + gitlab-ci: exercise Git on Windows
135 + + gitlab-ci: introduce stages and dependencies
136 + + ci: handle Windows-based CI jobs in GitLab CI
137 + + ci: create script to set up Git for Windows SDK
138 + + t7300: work around platform-specific behaviour with long paths on MinGW
139 +
140 + Enable Windows-based CI in GitLab.
141 +
142 + source: <cover.1728480039.git.ps@pks.im>
143 +
144 +
145 +* sk/msvc-warnings (2024-10-17) 1 commit
146 + (merged to 'next' on 2024-10-18 at 954a1eb93d)
147 + + mingw.c: Fix complier warnings for a 64 bit msvc
148 +
149 + Fixes compile time warnings with 64-bit MSVC.
150 +
151 + source: <20241017171820.2679-2-soekkle@freenet.de>
152 +
153 +
154 +* wm/shortlog-hash (2024-10-17) 1 commit
155 + (merged to 'next' on 2024-10-18 at 25307069e9)
156 + + builtin/shortlog: explicitly set hash algo when there is no repo
157 +
158 + Teaches 'shortlog' to explicitly use SHA-1 when operating outside of
159 + a repository.
160 +
161 + source: <20241017093528.18157-1-wolf@oriole.systems>
162
163 --------------------------------------------------
164 [New Topics]
165
166 +* ak/more-typofixes (2024-10-24) 1 commit
167 + + t: fix typos
168 +
169 + More typofixes.
170 +
171 + source: <20241024114721.14270-1-algonell@gmail.com>
172 +
173 +
174 +* ps/mingw-rename (2024-10-24) 3 commits
175 + - compat/mingw: support POSIX semantics for atomic renames
176 + - compat/mingw: allow deletion of most opened files
177 + - compat/mingw: share file handles created via `CreateFileW()`
178 +
179 + Teaches the MinGW compatibility layer to support POSIX semantics for
180 + atomic renames when other process(es) have a file opened at the
181 + destination path.
182 +
183 + Will merge to 'next'?
184 + source: <cover.1729770140.git.ps@pks.im>
185 +
186 +
187 +* ps/reftable-detach (2024-10-23) 8 commits
188 + - reftable/system: provide thin wrapper for lockfile subsystem
189 + - reftable/stack: drop only use of `get_locked_file_path()`
190 + - reftable/system: provide thin wrapper for tempfile subsystem
191 + - reftable/stack: stop using `fsync_component()` directly
192 + - reftable/system: stop depending on "hash.h"
193 + - reftable: explicitly handle hash format IDs
194 + - reftable/system: move "dir.h" to its only user
195 + - Merge branch 'ps/reftable-strbuf' into ps/reftable-detach
196 + (this branch uses ps/reftable-strbuf.)
197 +
198 + Isolates the reftable subsystem from the rest of Git's codebase by
199 + using fewer pieces of Git's infrastructure.
200 +
201 + source: <cover.1729677003.git.ps@pks.im>
202 +
203 +
204 +* sk/t9101-cleanup (2024-10-23) 1 commit
205 + + t9101: ensure no whitespace after redirect
206 +
207 + Test cleanup.
208 +
209 + source: <20241023121113.915310-1-kuforiji98@gmail.com>
210 +
211 +--------------------------------------------------
212 +[Cooking]
213 +
214 * ak/t1016-cleanup (2024-10-22) 1 commit
102 - - t1016: clean up style
215 + (merged to 'next' on 2024-10-22 at 1dd1717591)
216 + + t1016: clean up style
217 (this branch uses ak/typofix.)
218
219 Test cleanup.
@@ -112,16 +226,19 @@ Release tarballs are available at:
226 - doc: consolidate extensions in git-config documentation
227
228 Centralize documentation for repository extensions into a single place.
229 +
230 + Will merge to 'next'?
231 source: <20241021-cleanup-extension-docs-v1-1-ab02cece3132@pm.me>
232
233
118 -* kh/mv-breakage (2024-10-21) 1 commit
119 - - t7001: add' failure test which triggers assertion
234 +* kh/mv-breakage (2024-10-23) 1 commit
235 + (merged to 'next' on 2024-10-25 at db92c3efa1)
236 + + t7001: add failure test which triggers assertion
237
238 Demonstrate an assertion failure in 'git mv'.
239
123 - Will merge to 'next'?
124 - source: <29d71db280c972c91174bd0a501af66be72643af.1729462326.git.code@khaugsbakk.name>
240 + Will merge to 'master'?
241 + source: <c4ada0b787736ecd5aee986b1b8a4f90ccb84e21.1729631436.git.code@khaugsbakk.name>
242
243
244 * kh/submitting-patches (2024-10-21) 1 commit
@@ -144,14 +261,14 @@ Release tarballs are available at:
261 source: <20241020173216.40852-2-ken@kmatsui.me>
262
263
147 -* kn/arbitrary-suffixes (2024-10-21) 1 commit
264 +* kn/arbitrary-suffixes (2024-10-24) 1 commit
265 - CodingGuidelines: discourage arbitrary suffixes in function names
266
150 - Update the project's CodingGuidelines to discourage naming functions
151 - with a "_1()" suffix.
267 + Update the project's CodingGuidelines to discourage naming functions
268 + with a "_1()" suffix.
269
153 - Under discussion.
154 - source: <20241021124145.636561-1-karthik.188@gmail.com>
270 + Will merge to 'next'?
271 + source: <20241024105357.2605168-1-karthik.188@gmail.com>
272
273
274 * ks/t4205-fixup (2024-10-21) 1 commit
@@ -195,44 +312,48 @@ Release tarballs are available at:
312
313
314 * ps/upload-pack-doc (2024-10-21) 1 commit
198 - - doc: document how uploadpack.allowAnySHA1InWant impact other allow options
315 + (merged to 'next' on 2024-10-25 at ede395593c)
316 + + doc: document how uploadpack.allowAnySHA1InWant impact other allow options
317
318 Documentation update to clarify that 'uploadpack.allowAnySHA1InWant'
319 implies both 'allowTipSHA1InWant' and 'allowReachableSHA1InWant'.
320
203 - Will merge to 'next'?
321 + Will merge to 'master'?
322 source: <pull.1814.v2.git.git.1729355997353.gitgitgadget@gmail.com>
323
324
325 * rj/cygwin-exit (2024-10-18) 1 commit
208 - - credential-cache: treat ECONNABORTED like ECONNRESET
326 + (merged to 'next' on 2024-10-25 at a3acd18921)
327 + + credential-cache: treat ECONNABORTED like ECONNRESET
328
329 Treat ECONNABORTED the same as ECONNRESET in 'git credential-cache' to
330 work around a possible Cygwin regression. This resolves a race condition
331 caused by changes in Cygwin's handling of socket closures, allowing the
332 client to exit cleanly when encountering ECONNABORTED.
333
215 - Will merge to 'next'?
334 + Will merge to 'master'?
335 source: <20241018052952.GE2408674@coredump.intra.peff.net>
336
337
338 * rs/grep-lookahead (2024-10-22) 1 commit
220 - - grep: disable lookahead on error
339 + (merged to 'next' on 2024-10-25 at 44fc090a5e)
340 + + grep: disable lookahead on error
341
342 Fix 'git grep' regression on macOS by disabling lookahead when
343 encountering invalid UTF-8 byte sequences.
344
225 - Will merge to 'next'.
345 + Will merge to 'master'.
346 source: <7a51a68e-5f9d-4444-a568-9ca180bc4c6b@web.de>
347
348
349 * sa/notes-edit (2024-10-21) 1 commit
230 - - notes: teach the -e option to edit messages in editor
350 + (merged to 'next on 2024-10-25 at 29b26e5ca6)
351 + + notes: teach the -e option to edit messages in editor
352
353 Teach 'git notes add' and 'git notes append' a new '-e' flag,
354 instructing them to open the note in $GIT_EDITOR before saving.
355
235 - Needs review.
356 + Will merge to 'master'?
357 source: <pull.1817.v4.git.1729534340786.gitgitgadget@gmail.com>
358
359
@@ -241,28 +362,32 @@ Release tarballs are available at:
362 + t7011: ensure no whitespace after redirect
363
364 Test cleanup.
244 - source: <20241018191744.209746-1-kuforiji98@gmail.com>
365 +
366 + Will merge to 'master'.
367 + source: <20241019163439.274656-1-kuforiji98@gmail.com>
368
369
370 * ss/duplicate-typos (2024-10-21) 1 commit
248 - - global: Fix duplicate word typos
371 + (merged to 'next' on 2024-10-25 at a55ee8bc52)
372 + + global: Fix duplicate word typos
373
374 Typofixes.
375
252 - Will merge to 'next'?
376 + Will merge to 'master'.
377 source: <6ce47185-690d-415e-95c9-06a3b828be29e@cs-ware.de>
378
379
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()
380 +* ua/atoi (2024-10-24) 3 commits
381 + (merged to 'next' on 2024-10-25 at ecd980f7eb)
382 + + imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing
383 + + merge: replace atoi() with strtol_i() for marker size validation
384 + + daemon: replace atoi() with strtoul_ui() and strtol_i()
385
386 Replace various calls to atoi() with strtol_i() and strtoul_ui(), and
387 add improved error handling.
388
264 - Under review.
265 - source: <pull.1810.v3.git.git.1729574624.gitgitgadget@gmail.com>
389 + Will merge to 'master'?
390 + source: <pull.1810.v6.git.git.1729729499.gitgitgadget@gmail.com>
391
392
393 * y5/diff-pager (2024-10-21) 1 commit
@@ -271,22 +396,9 @@ Release tarballs are available at:
396 Delay setting up the pager in 'git diff' until after the diff contents
397 itself is fully prepared.
398
274 - Under review.
399 + Needs review.
400 source: <pull.1817.git.git.1729370390416.gitgitgadget@gmail.com>
401
277 ---------------------------------------------------
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 -
402
403 * jc/optional-path (2024-10-14) 3 commits
404 - parseopt: values of pathname type can be prefixed with :(optional)
@@ -301,12 +413,13 @@ Release tarballs are available at:
413
414
415 * 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”
416 + (merged to 'next' on 2024-10-25 at 317cc41dd3)
417 + + Documentation: mutually link update-ref and symbolic-ref
418 + + Documentation/git-update-ref.txt: discuss symbolic refs
419 + + Documentation/git-update-ref.txt: remove confusing paragraph
420 + + Documentation/git-update-ref.txt: demote symlink to last section
421 + + Documentation/git-update-ref.txt: remove safety paragraphs
422 + + Documentation/git-update-ref.txt: drop “flag”
423
424 Documentation updates to 'git-update-ref(1)'.
425
@@ -321,17 +434,8 @@ Release tarballs are available at:
434 Teaches the ref-filter machinery to recognize and avoid cases where
435 sorting would be redundant.
436
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 -
437 Will merge to 'master'.
334 - source: <20241017171820.2679-2-soekkle@freenet.de>
438 + source: <d23c3e3ee7fdb49fcd05b4f2e52dd2a1cfdc10f2.1729510342.git.ps@pks.im>
439
440
441 * am/git-blame-ignore-revs-by-default (2024-10-14) 2 commits
@@ -351,7 +455,7 @@ Release tarballs are available at:
455
456 Updates the '.clang-format' to match project conventions.
457
354 - Needs review.
458 + Will merge to 'next'?
459 source: <cover.1729241030.git.karthik.188@gmail.com>
460
461
@@ -381,6 +485,7 @@ Release tarballs are available at:
485 Various platform compatibility fixes split out of the larger effort
486 to use Meson as the primary build tool.
487
488 + Will merge to 'master'.
489 source: <cover.1729060405.git.ps@pks.im>
490
491
@@ -396,10 +501,12 @@ Release tarballs are available at:
501 + reftable/basics: provide new `reftable_buf` interface
502 + reftable: stop using `strbuf_addf()`
503 + reftable: stop using `strbuf_addbuf()`
504 + (this branch is used by ps/reftable-detach.)
505
506 Implements a new reftable-specific strbuf replacement to reduce
507 reftable's dependency on Git-specific data structures.
508
509 + Will merge to 'master'.
510 source: <cover.1729140565.git.ps@pks.im>
511
512
@@ -409,6 +516,7 @@ Release tarballs are available at:
516 - Makefile: extract script to generate clar declarations
517 - Makefile: adjust sed command for generating "clar-decls.h"
518 - t/unit-tests: update clar to 206accb
519 + (this branch is used by ps/build.)
520
521 Buildfix and upgrade of Clar to a newer version.
522
@@ -425,20 +533,8 @@ Release tarballs are available at:
533 source: <pull.938.v3.git.git.1728764613835.gitgitgadget@gmail.com>
534
535
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 -
435 - Will merge to 'master'.
436 - source: <20241017093528.18157-1-wolf@oriole.systems>
437 -
438 -
439 -* bc/drop-ancient-libcurl-and-perl (2024-10-11) 13 commits
536 +* bc/drop-ancient-libcurl-and-perl (2024-10-23) 12 commits
537 - gitweb: make use of s///r
441 - - INSTALL: require Perl 5.26.0
538 - Require Perl 5.26.0
539 - INSTALL: document requirement for libcurl 7.61.0
540 - git-curl-compat: remove check for curl 7.56.0
@@ -454,7 +550,7 @@ Release tarballs are available at:
550 Drop support for older libcURL and Perl.
551
552 Under discussion.
457 - source: <20241010235621.738239-1-sandals@crustytoothpaste.net>
553 + source: <20241023004600.1645313-1-sandals@crustytoothpaste.net>
554
555
556 * co/t6050-pipefix (2024-10-22) 1 commit
@@ -464,6 +560,7 @@ Release tarballs are available at:
560 Avoid losing exit status by having Git command being tested on the
561 upstream side of a pipe.
562
563 + Will merge to 'master'.
564 source: <20241022012701.8959-1-chizobajames21@gmail.com>
565
566
@@ -498,107 +595,52 @@ Release tarballs are available at:
595 source: <cover.1728505840.git.me@ttaylorr.com>
596
597
501 -* bf/t-readme-mention-reftable (2024-10-11) 1 commit
502 - (merged to 'next' on 2024-10-18 at b246cb10d4)
503 - + t/README: add missing value for GIT_TEST_DEFAULT_REF_FORMAT
504 -
505 - Doc update.
506 -
507 - Will merge to 'master'.
508 - source: <20241011191150.825255-1-bence@ferdinandy.com>
509 -
510 -
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
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
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
598 +* bf/set-head-symref (2024-10-23) 8 commits
599 + - fetch set_head: handle mirrored bare repositories
600 + - fetch: set remote/HEAD if it does not exist
601 + - refs: add create_only option to refs_update_symref_extended
602 + - refs: add TRANSACTION_CREATE_EXISTS error
603 + - remote set-head: better output for --auto
604 + - remote set-head: refactor for readability
605 + - refs: atomically record overwritten ref in update_symref
606 + - t/t5505-remote: set default branch to main
607
608 When "git fetch $remote" notices that refs/remotes/$remote/HEAD is
609 missing and discovers what branch the other side points with its
610 HEAD, refs/remotes/$remote/HEAD is updated to point to it.
611
525 - Needs to shed files backend dependency a bit more.
526 - cf. <D4SUTJDV0Y04.3Q8YED2MVOKBL@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
533 - (merged to 'next' on 2024-10-18 at a473d0df83)
534 - + submodule: correct remote name with fetch
535 -
536 - A "git fetch" from the superproject going down to a submodule used
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 -
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
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
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.)
612 + Needs review.
613 + source: <20241023153736.257733-1-bence@ferdinandy.com>
614 +
615 +
616 +* ps/build (2024-10-24) 21 commits
617 + - meson: fix conflicts with in-flight topics
618 + - Introduce support for the Meson build system
619 + - Documentation: add comparison of build systems
620 + - t: allow overriding build dir
621 + - t: better support for out-of-tree builds
622 + - Documentation: extract script to generate a list of mergetools
623 + - Documentation: teach "cmd-list.perl" about out-of-tree builds
624 + - Documentation: allow sourcing generated includes from separate dir
625 + - Makefile: simplify building of templates
626 + - Makefile: allow "bin-wrappers/" directory to exist
627 + - Makefile: refactor generators to be PWD-independent
628 + - Makefile: refactor GIT-VERSION-GEN to be reusable
629 + - Makefile: extract script to generate gitweb.cgi
630 + - Makefile: extract script to massage Shell scripts
631 + - Makefile: use "generate-perl.sh" to massage Perl library
632 + - Makefile: extract script to massage Perl scripts
633 + - Makefile: consistently use PERL_PATH
634 + - Makefile: consistently use @PLACEHOLDER@ to substitute
635 + - Makefile: use common template for GIT-BUILD-OPTIONS
636 + - Merge branch 'ps/platform-compat-fixes' into ps/build
637 + - Merge branch 'ps/upgrade-clar' into ps/build
638 + (this branch uses ps/platform-compat-fixes and ps/upgrade-clar.)
639
640 Build procedure update plus introduction of Mason based builds
641
642 Needs review.
570 - Tentatively dropped from 'seen', for a circular dependency.
571 - cf. https://github.com/git/git/actions/runs/11299216196
572 - source: <cover.1729254070.git.ps@pks.im>
573 -
574 -
575 -* ps/ci-gitlab-windows (2024-10-09) 5 commits
576 - (merged to 'next' on 2024-10-18 at 58a3be436a)
577 - + gitlab-ci: exercise Git on Windows
578 - + gitlab-ci: introduce stages and dependencies
579 - + ci: handle Windows-based CI jobs in GitLab CI
580 - + ci: create script to set up Git for Windows SDK
581 - + t7300: work around platform-specific behaviour with long paths on MinGW
582 -
583 - Enable Windows-based CI in GitLab.
584 -
585 - Will merge to 'master'.
586 - source: <cover.1728480039.git.ps@pks.im>
587 -
588 -
589 -* ak/typofixes (2024-10-10) 6 commits
590 - (merged to 'next' on 2024-10-18 at c45095cae5)
591 - + t: fix typos
592 - + t/helper: fix a typo
593 - + t/perf: fix typos
594 - + t/unit-tests: fix typos
595 - + contrib: fix typos
596 - + compat: fix typos
597 -
598 - Typofixes.
599 -
600 - Will merge to 'master'.
601 - source: <20241010151223.311719-1-algonell@gmail.com>
643 + source: <cover.1729771605.git.ps@pks.im>
644
645
646 * ds/path-walk (2024-10-08) 17 commits
@@ -625,7 +667,8 @@ Release tarballs are available at:
667 objects that are different between trees as we walk commit
668 histories) is introduced to optimize object packing.
669
628 - Needs review.
670 + Expecting a reroll.
671 + cf. <dd18a858-31bf-497d-bb19-d371102dfa2a@gmail.com>
672 source: <pull.1813.git.1728396723.gitgitgadget@gmail.com>
673
674
@@ -642,42 +685,17 @@ Release tarballs are available at:
685 source: <20241014032546.68427-1-hanyang.tony@bytedance.com>
686
687
645 -* pb/clar-build-fix (2024-10-11) 1 commit
646 - (merged to 'next' on 2024-10-18 at ae6e80b047)
647 - + Makefile: fix dependency for $(UNIT_TEST_DIR)/clar/clar.o
648 -
649 - Build fix.
650 -
651 - Will merge to 'master'.
652 - source: <pull.1810.v2.git.1728667787227.gitgitgadget@gmail.com>
653 -
654 -
688 * 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`
689 + (merged to 'next' on 2024-10-25 at 26b7b76329)
690 + + t3404: replace test with test_line_count()
691 + + t3404: avoid losing exit status with focus on `git show` and `git cat-file`
692
693 Test update.
694
661 - Will merge to 'next'?
695 + Will merge to 'master'?
696 source: <pull.1810.git.git.1728774574.gitgitgadget@gmail.com>
697
698
665 -* jc/a-commands-without-the-repo (2024-10-11) 3 commits
666 - (merged to 'next' on 2024-10-18 at b428982db3)
667 - + archive: remove the_repository global variable
668 - + annotate: remove usage of the_repository global
669 - + git: pass in repo to builtin based on setup_git_directory_gently
670 -
671 - Commands that can also work outside Git have learned to take the
672 - repository instance "repo" when we know we are in a repository, and
673 - NULL when we are not, in a parameter. The uses of the_repository
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 -
699 * ej/cat-file-remote-object-info (2024-09-27) 6 commits
700 - cat-file: add remote-object-info to batch-command
701 - cat-file: add declaration of variable i inside its for loop
@@ -701,7 +719,8 @@ Release tarballs are available at:
719 lazily fetched from promisor remotes) collected more than objects
720 that promisor-remote can give.
721
704 - Needs review.
722 + Appears to break CI.
723 + cf. https://github.com/ttaylorr/git/actions/runs/11523538245
724 source: <20240802073143.56731-1-hanyang.tony@bytedance.com>
725
726