What's cooking (2025/05 #05)

Junio C Hamano committed May 16, 2025 at 14:51 UTC 29a449c2cb8e4a0a0d4d9afcbb8a3a2ddb2f43c6
1 file changed +389 -251
whats-cooking.txt
+389 -251
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (May 2025, #04; Mon, 12)
3 -X-master-at: 38af977b81bbf8ce8c0004d3f4046a823ecb30a1
4 -X-next-at: 889b7c5bd859a31843b9239d3c69e5b8f543ef47
2 +Subject: What's cooking in git.git (May 2025, #05; Fri, 16)
3 +X-master-at: cb96e1697ad6e54d11fc920c95f82977f8e438f8
4 +X-next-at: a128411c76f198ba255c81c140d7ab23f1cc5b8d
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (May 2025, #04; Mon, 12)
7 +What's cooking in git.git (May 2025, #05; Fri, 16)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -48,115 +48,309 @@ Release tarballs are available at:
48 --------------------------------------------------
49 [Graduated to 'master']
50
51 -* ag/send-email-outlook (2025-04-29) 2 commits
52 - (merged to 'next' on 2025-05-05 at c85e7a2e65)
53 - + send-email: add --[no-]outlook-id-fix option
54 - + send-email: retrieve Message-ID from outlook SMTP server
51 +* cf/wrapper-bsd-eloop (2025-05-06) 1 commit
52 + (merged to 'next' on 2025-05-08 at 7b1e21b252)
53 + + wrapper: NetBSD gives EFTYPE and FreeBSD gives EMFILE where POSIX uses ELOOP
54
56 - Update send-email to work better with Outlook's smtp server.
55 + The fallback implementation of open_nofollow() depended on
56 + open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD
57 + derived systems use different errno, which has been worked around.
58
58 - source: <PN3PR01MB95973F4B26A8CE2BF17A3AB1B8842@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
59 - source: <PN3PR01MB9597DA8661D1AFDF4C927A11B8812@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
59 + source: <20250506010946.212068-1-collin.funk1@gmail.com>
60
61
62 -* ds/fix-thin-fix (2025-04-28) 3 commits
63 - (merged to 'next' on 2025-05-05 at 200a988f98)
64 - + index-pack: allow revisiting REF_DELTA chains
65 - + t5309: create failing test for 'git index-pack'
66 - + test-tool: add pack-deltas helper
62 +* dd/meson-perl-custom-path (2025-05-08) 1 commit
63 + (merged to 'next' on 2025-05-09 at 3e4d3f1d59)
64 + + meson: allow customize perl installation path
65
68 - "git index-pack --fix-thin" used to abort to prevent a cycle in
69 - delta chains from forming in a corner case even when there is no
70 - such cycle.
66 + Meson-based build framework update.
67
72 - source: <pull.1906.v2.git.1745871885.gitgitgadget@gmail.com>
68 + source: <a9d431944b6d94e0eb25535c061fc226a7fefa9e.1746692662.git.congdanhqx@gmail.com>
69
70
75 -* en/hashmap-clear-fix (2025-04-29) 1 commit
76 - (merged to 'next' on 2025-04-30 at b0cdbeb28e)
77 - + hashmap: ensure hashmaps are reusable after hashmap_clear()
71 +* en/get-tree-entry-doc (2025-05-02) 1 commit
72 + (merged to 'next' on 2025-05-06 at cddf407919)
73 + + tree-walk.h: fix incorrect API comment
74
79 - hashmap API clean-up to ensure hashmap_clear() leaves a cleared map
80 - in a reusable state.
81 -
82 - source: <pull.1911.git.1745941663160.gitgitgadget@gmail.com>
75 + Doc update.
76 + source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>
77
78
85 -* jc/ci-skip-unavailable-external-software (2025-04-25) 2 commits
86 - (merged to 'next' on 2025-05-05 at a13d958c1b)
87 - + ci: download JGit from maven, not eclipse.org
88 - + ci: update the message for unavailble third-party software
79 +* jc/t6011-mv-ro-fix (2025-05-07) 1 commit
80 + (merged to 'next' on 2025-05-09 at 6168793ae5)
81 + + t6011: fix misconversion from perl to sed
82
90 - Further refinement on CI messages when an optional external
91 - software is unavailable (e.g. due to third-party service outage).
83 + Test fix.
84
93 - source: <20250425153827.147585-1-gitster@pobox.com>
85 + source: <xmqq8qn9fj8o.fsf@gitster.g>
86
87
96 -* js/diff-codeql-false-positive-workaround (2025-04-29) 1 commit
97 - (merged to 'next' on 2025-05-01 at a840276032)
98 - + diff: check range before dereferencing an array element
88 +* js/ci-buildsystems-cleanup (2025-05-05) 3 commits
89 + (merged to 'next' on 2025-05-06 at b2038f9a91)
90 + + config.mak.uname: drop the `vcxproj` target
91 + + contrib/buildsystems: drop support for building . vcproj/.vcxproj files
92 + + ci: stop linking the `prove` cache
93
100 - Work around false positive given by CodeQL.
101 -
102 - source: <pull.1887.v3.git.1745926679028.gitgitgadget@gmail.com>
94 + Code clean-up around stale CI elements and building with Visual Studio.
95 + source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>
96
97
105 -* ng/xdiff-truly-minimal (2025-04-29) 1 commit
106 - (merged to 'next' on 2025-05-05 at 62e0c33153)
107 - + xdiff: disable cleanup_records heuristic with --minimal
98 +* kh/docfixes (2025-05-05) 2 commits
99 + (merged to 'next' on 2025-05-06 at 6cd8af0fa1)
100 + + doc: branch: fix inline-verbatim
101 + + doc: reflog: fix `drop` subheading
102
109 - "git diff --minimal" used to give non-minimal output when its
110 - optimization kicked in, which has been disabled.
111 -
112 - source: <20250429140949.2634935-1-n.glodny@campus.lmu.de>
103 + Docfixes.
104 + source: <cover.1746299135.git.code@khaugsbakk.name>
105
106
115 -* ps/meson-bin-sh (2025-04-25) 2 commits
116 - (merged to 'next' on 2025-05-05 at 546cdf31bf)
117 - + meson: prefer shell at "/bin/sh"
118 - + meson: report detected runtime executable paths
107 +* kj/glob-path-with-special-char (2025-05-05) 1 commit
108 + (merged to 'next' on 2025-05-06 at 629a3ecd64)
109 + + dir.c: literal match with wildcard in pathspec should still glob
110
120 - Meson-based build framework update.
121 -
122 - source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
111 + "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname,
112 + also existed on the working tree, which has been corrected.
113 + source: <20250503060736.587286-1-jayatheerthkulkarni2005@gmail.com>
114
115
125 -* ps/mv-contradiction-fix (2025-04-30) 2 commits
126 - (merged to 'next' on 2025-05-01 at 5c27b05f45)
127 - + builtin/mv: convert assert(3p) into `BUG()`
128 - + builtin/mv: bail out when trying to move child and its parent
116 +* ps/ci-test-aggreg-fix-for-meson (2025-05-05) 1 commit
117 + (merged to 'next' on 2025-05-06 at 40306a837b)
118 + + ci: fix aggregation of test results with Meson
119 +
120 + Test result aggregation did not work in Meson based CI jobs.
121 + source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>
122 +
123 +
124 +* ps/maintenance-missing-tasks (2025-05-07) 6 commits
125 + (merged to 'next' on 2025-05-08 at 2da78b0ef1)
126 + + builtin/maintenance: introduce "rerere-gc" task
127 + + builtin/gc: move rerere garbage collection into separate function
128 + + builtin/maintenance: introduce "worktree-prune" task
129 + + builtin/gc: move pruning of worktrees into a separate function
130 + + builtin/gc: remove global variables where it is trivial to do
131 + + builtin/gc: fix indentation of `cmd_gc()` parameters
132
130 - "git mv a a/b dst" would ask to move the directory 'a' itself, as
131 - well as its contents, in a single destination directory, which is
132 - a contradicting request that is impossible to satisfy. This case is
133 - now detected and the command errors out.
133 + Make repository clean-up tasks "gc" can do available to "git
134 + maintenance" front-end.
135
135 - source: <20250430-pks-mv-parent-child-conflict-v1-0-11a87c55ffb9@pks.im>
136 -
137 -
138 -* ps/object-store-cleanup (2025-04-29) 8 commits
139 - (merged to 'next' on 2025-05-05 at f91eca32c9)
140 - + object-store: drop `repo_has_object_file()`
141 - + treewide: convert users of `repo_has_object_file()` to `has_object()`
142 - + object-store: allow fetching objects via `has_object()`
143 - + object-store: move function declarations to their respective subsystems
144 - + object-store: move and rename `odb_pack_keep()`
145 - + object-store: drop `loose_object_path()`
146 - + object-store: move `struct packed_git` into "packfile.h"
147 - + Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
148 - (this branch is used by ps/object-store.)
149 -
150 - Further code clean-up in the object-store layer.
136 + source: <20250507-pks-maintenance-missing-tasks-v5-0-aa5fdfb82891@pks.im>
137 +
138 +
139 +* tb/macos-false-but-the-compiler-does-not-know-it-fix (2025-05-07) 1 commit
140 + (merged to 'next' on 2025-05-09 at d8fb9874ef)
141 + + intialize false_but_the_compiler_does_not_know_it_
142 +
143 + Workaround for older macOS ld.
144
152 - source: <20250429-pks-object-store-cleanups-v3-0-42902bad09a1@pks.im>
145 + source: <20250506120644.186968-1-tboegi@web.de>
146
147 --------------------------------------------------
148 [New Topics]
149
150 +* ps/ci-gitlab-enable-msvc-meson-job (2025-05-13) 1 commit
151 + - gitlab-ci: always run MSVC-based Meson job
152 +
153 + CI settings at GitLab has been updated to run MSVC based Meson job
154 + automatically (as opposed to be done only upon manual request).
155 +
156 + Will merge to 'next'.
157 + source: <20250428-pks-gitlab-ci-execute-win-meson-v1-1-f68683552b9e@pks.im>
158 +
159 +
160 +* ag/send-email-hostname-f (2025-05-13) 1 commit
161 + - send-email: try to get fqdn by running hostname -f on Linux and macOS
162 +
163 + Teach "git send-email" to also consult `hostname -f` for mail
164 + domain to compute the identity given to SMTP servers.
165 +
166 + Will merge to 'next'.
167 + source: <PN3PR01MB959701F40F805351472EA4CCB897A@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
168 +
169 +
170 +* kn/fetch-push-bulk-ref-update (2025-05-15) 4 commits
171 + - receive-pack: use batched reference updates
172 + - send-pack: fix memory leak around duplicate refs
173 + - fetch: use batched reference updates
174 + - refs: add function to translate errors to strings
175 +
176 + "git push" and "git fetch" are taught to update refs in batches to
177 + gain performance.
178 +
179 + Expecting a reroll.
180 + cf. <CAOLa=ZQHR5Xt3yP4FM4gAbFVRM-dXVPpQHS0tObeoz45T89X7w@mail.gmail.com>
181 + source: <20250515-501-update-git-fetch-1-to-use-partial-transactions-v2-0-80cbaaa55d2e@gmail.com>
182 +
183 +
184 +* en/replay-wo-the-repository (2025-05-14) 1 commit
185 + - replay: replace the_repository with repo parameter passed to cmd_replay ()
186 +
187 + The dependency on the_repository variable has been reduced from the
188 + code paths in "git replay".
189 +
190 + Will merge to 'next'.
191 + source: <pull.1921.git.1747254806067.gitgitgadget@gmail.com>
192 +
193 +
194 +* js/misc-defensive (2025-05-15) 14 commits
195 + - shallow: handle missing shallow commits gracefully
196 + - test-tool repository: check return value of `lookup_commit()`
197 + - submodule: check return value of `submodule_from_path()`
198 + - inherit_tracking(): defensive programming
199 + - describe: defensive programming
200 + - fetch: defensive programming
201 + - push: defensive programming
202 + - stash: defensive programming
203 + - stash: defensive programming
204 + - verify_commit_graph(): defensive programming
205 + - unparse_commit(): defensive programming
206 + - fetch-pack: defensive programming
207 + - get_parent(): defensive programming
208 + - revision: defensive programming
209 +
210 + Assorted changes that please CodeQL.
211 +
212 + Comments?
213 + source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
214 +
215 +
216 +* js/misc-fixes (2025-05-15) 11 commits
217 + - sequencer: stop pretending that an assignment is a condition
218 + - bundle-uri: avoid using undefined output of `sscanf()`
219 + - commit-graph: avoid using stale stack addresses
220 + - trace2: avoid "futile conditional"
221 + - Avoid redundant conditions
222 + - fetch: avoid unnecessary work when there is no current branch
223 + - has_dir_name(): make code more obvious
224 + - upload-pack: rename `enum` to reflect the operation
225 + - commit-graph: avoid malloc'ing a local variable
226 + - fetch: carefully clear local variable's address after use
227 + - commit: simplify code
228 +
229 + Assorted fixes for issues found with CodeQL.
230 +
231 + Will merge to 'next'?
232 + source: <pull.1891.git.1747314709.gitgitgadget@gmail.com>
233 +
234 +
235 +* ly/commit-graph-fill-oids-leakfix (2025-05-15) 1 commit
236 + - commit-graph: fix memory leak when `fill_oids_from_packs()` fails
237 +
238 + Leakfix.
239 +
240 + Will merge to 'next'.
241 + source: <pull.1957.v3.git.git.1746779435536.gitgitgadget@gmail.com>
242 +
243 +
244 +* ly/mailinfo-decode-header-leakfix (2025-05-15) 1 commit
245 + - mailinfo: fix pointential memory leak if `decode_header` failed
246 +
247 + Leakfix.
248 +
249 + Will merge to 'next'.
250 + source: <pull.1956.v4.git.git.1747104551204.gitgitgadget@gmail.com>
251 +
252 +
253 +* ly/sequencer-rearrange-leakfix (2025-05-15) 1 commit
254 + - sequencer: fix memory leak if `todo_list_rearrange_squash()` failed
255 +
256 + Leakfix.
257 +
258 + Will merge to 'next'.
259 + source: <pull.1965.git.git.1747230808770.gitgitgadget@gmail.com>
260 +
261 +
262 +* en/sequencer-comment-messages (2025-05-16) 1 commit
263 + - sequencer: make it clearer that commit descriptions are just comments
264 +
265 + Prefix '#' to the commit title in the "rebase -i" todo file, just
266 + like a merge commit being replayed.
267 +
268 + Will merge to 'next'?
269 + source: <pull.1923.v2.git.1747412786573.gitgitgadget@gmail.com>
270 +
271 +
272 +* jk/no-funny-object-types (2025-05-16) 13 commits
273 + - object-file: drop support for writing objects with unknown types
274 + - hash-object: handle --literally with OPT_NEGBIT
275 + - hash-object: merge HASH_* and INDEX_* flags
276 + - hash-object: stop allowing unknown types
277 + - t: add lib-loose.sh
278 + - t/helper: add zlib test-tool
279 + - oid_object_info(): drop type_name strbuf
280 + - fsck: stop using object_info->type_name strbuf
281 + - oid_object_info_convert(): stop using string for object type
282 + - cat-file: use type enum instead of buffer for -t option
283 + - object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag
284 + - cat-file: make --allow-unknown-type a noop
285 + - object-file.h: fix typo in variable declaration
286 +
287 + Support to create a loose object file with unknown object type has
288 + been dropped.
289 +
290 + Will merge to 'next'.
291 + source: <20250516044916.GA21985@coredump.intra.peff.net>
292 +
293 +
294 +* kj/my-first-contribution-updates (2025-05-16) 4 commits
295 + - cmd_psuh: Prefer repo_config for config lookup
296 + - Docs: Add cmd_psuh with repo and UNUSED removal
297 + - Docs: Correct cmd_psuh and Explain UNUSED macro
298 + - Remove unused git-mentoring mailing list
299 +
300 + Doc updates.
301 +
302 + source: <20250416061450.25695-1-jayatheerthkulkarni2005@gmail.com>
303 +
304 +
305 +* kj/renamed-submodule (2025-05-16) 1 commit
306 + - submodule: prevent overwriting .gitmodules entry on path reuse
307 +
308 + The case where a new submodule takes a path where used to be a
309 + completely different subproject is now dealt a bit better than
310 + before.
311 +
312 + Comments?
313 + source: <20250516174934.45008-1-jayatheerthkulkarni2005@gmail.com>
314 +
315 +
316 +* lo/json-writer-docs (2025-05-16) 2 commits
317 + - json-writer: describe the usage of jw_* functions
318 + - json-writer: add docstrings to jw_* functions
319 +
320 + In-code docstring updates.
321 +
322 + Will merge to 'next'.
323 + source: <20250516010159.27042-1-lucasseikioshiro@gmail.com>
324 +
325 +
326 +* ps/pack-check-pack-first (2025-05-16) 1 commit
327 + - packfile: avoid access(3p) calls for missing packs
328 +
329 + The packfile registration code used to check ".pack" file the last
330 + after checking ".keep" and other files; the ordering is reversed.
331 +
332 + source: <20250516-pks-pack-avoid-stats-on-missing-v1-1-e2ef4d8798a3@pks.im>
333 +
334 +
335 +* pw/update-thunderbird-patch-inline (2025-05-16) 1 commit
336 + - contrib: update thunderbird-patch-inline
337 +
338 + Update bitrotten instruction for sending patches via Thunderbird
339 + (in contrib/).
340 +
341 + Comments?
342 + source: <20250516135540.218937-1-phillip.wood123@gmail.com>
343 +
344 +--------------------------------------------------
345 +[Cooking]
346 +
347 * bc/make-avoid-unneeded-rebuild-with-compdb-dir (2025-05-09) 1 commit
158 - - Makefile: avoid constant rebuilds with compilation database
348 + (merged to 'next' on 2025-05-13 at c36a91ba22)
349 + + Makefile: avoid constant rebuilds with compilation database
350
351 + Build performance fix.
352 +
353 + Will merge to 'master'.
354 source: <20250509211202.3910761-1-sandals@crustytoothpaste.net>
355
356
@@ -166,30 +360,47 @@ Release tarballs are available at:
360 - builtin/stash: factor out revision parsing into a function
361 - object-name: make get_oid quietly return an error
362
363 + An interchange format for stash entries is defined, and subcommand
364 + of "git stash" to import/export has been added.
365 +
366 + Comments?
367 source: <20250508234458.3665894-1-sandals@crustytoothpaste.net>
368
369
172 -* ds/sparse-apply-add-p (2025-05-08) 3 commits
173 - (merged to 'next' on 2025-05-09 at 11ce4306b9)
174 - + p2000: add performance test for 'git add -p'
175 - + git add: make -p/-i aware of sparse index
176 - + apply: integrate with the sparse index
370 +* ds/sparse-apply-add-p (2025-05-16) 4 commits
371 + - p2000: add performance test for patch-mode commands
372 + - reset: integrate sparse index with --patch
373 + - git add: make -p/-i aware of sparse index
374 + - apply: integrate with the sparse index
375
178 - source: <pull.1914.git.1746579320.gitgitgadget@gmail.com>
376 + "git apply" and "git add -i/-p" code paths no longer unnecessarily
377 + expand sparse-index while working.
378 +
379 + Will merge to 'next'?
380 + Kicked out of next and then is about to come back.
381 + source: <pull.1914.v2.git.1747407330.gitgitgadget@gmail.com>
382
383
181 -* en/merge-tree-check (2025-05-12) 2 commits
182 - - merge-tree: add a new --mergeability-only flag
384 +* en/merge-tree-check (2025-05-14) 2 commits
385 + - merge-tree: add a new --dry-run flag
386 - merge-ort: add a new mergeability_only option
387
185 - source: <pull.1920.git.1746914561.gitgitgadget@gmail.com>
388 + "git merge-tree" learned an option to see if it resolves cleanly
389 + without actually creating a result.
390 +
391 + Will merge to 'next'.
392 + source: <pull.1920.v3.git.1747182287.gitgitgadget@gmail.com>
393
394
395 * jk/oidmap-cleanup (2025-05-12) 3 commits
189 - - raw_object_store: drop extra pointer to replace_map
190 - - oidmap: add size function
191 - - oidmap: rename oidmap_free() to oidmap_clear()
396 + (merged to 'next' on 2025-05-13 at 93bc7b6ab1)
397 + + raw_object_store: drop extra pointer to replace_map
398 + + oidmap: add size function
399 + + oidmap: rename oidmap_free() to oidmap_clear()
400 +
401 + Code cleanup.
402
403 + Will merge to 'master'.
404 source: <20250512185006.GA1275914@coredump.intra.peff.net>
405
406
@@ -199,29 +410,46 @@ Release tarballs are available at:
410 - test: refactor to use "test_config"
411 - test: refactor to use "test_grep"
412
413 + "git add/etc -p" now honors diff.context configuration variable,
414 + and learns to honor -U<n> option.
415 +
416 + Comments?
417 source: <pull.1915.v2.git.1746884789.gitgitgadget@gmail.com>
418
419
420 * ly/am-split-stgit-leakfix (2025-05-12) 1 commit
206 - - builtin/am: fix memory leak in `split_mail_stgit_series`
421 + (merged to 'next' on 2025-05-13 at 6966c2adc1)
422 + + builtin/am: fix memory leak in `split_mail_stgit_series`
423
424 + Leakfix.
425 +
426 + Will merge to 'master'.
427 source: <pull.1961.git.git.1747015647505.gitgitgadget@gmail.com>
428
429
430 * ly/pack-bitmap-load-leakfix (2025-05-12) 1 commit
212 - - pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed
431 + (merged to 'next' on 2025-05-14 at 0be31eac6b)
432 + + pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed
433
434 + Leakfix.
435 +
436 + Will merge to 'master'.
437 source: <pull.1962.git.git.1747052530271.gitgitgadget@gmail.com>
438
439
440 * ly/reftable-writer-leakfix (2025-05-12) 2 commits
218 - - reftable/writer: fix memory leak when `writer_index_hash()` fails
219 - - reftable/writer: fix memory leak when `padded_write()` fails
441 + (merged to 'next' on 2025-05-13 at 57c58b60e8)
442 + + reftable/writer: fix memory leak when `writer_index_hash()` fails
443 + + reftable/writer: fix memory leak when `padded_write()` fails
444 +
445 + Leakfix.
446
447 + Will merge to 'master'.
448 source: <pull.1958.v3.git.git.1747054145.gitgitgadget@gmail.com>
449
450
224 -* ps/contrib-sweep (2025-05-12) 11 commits
451 +* ps/contrib-sweep (2025-05-16) 12 commits
452 + - Revert "contrib: remove "thunderbird-patch-inline""
453 - contrib: remove some scripts in "stats" directory
454 - contrib: remove "git-new-workdir"
455 - contrib: remove "emacs" directory
@@ -234,12 +462,19 @@ Release tarballs are available at:
462 - contrib: remove "examples" directory
463 - contrib: remove "remotes2config.sh"
464
465 + Remove bunch of stuff from contrib/ hierarchy.
466 +
467 + I've reverted the thunderbird thing for now.
468 source: <20250512-pks-contrib-spring-cleanup-v3-0-32e151b0bfb0@pks.im>
469
470
471 * ps/reftable-read-block-perffix (2025-05-12) 1 commit
241 - - reftable: fix perf regression when reading blocks of unwanted type
472 + (merged to 'next' on 2025-05-13 at 3c150c7422)
473 + + reftable: fix perf regression when reading blocks of unwanted type
474
475 + Performance regression in not-yet-released code has been corrected.
476 +
477 + Will merge to 'master'.
478 source: <20250512-pks-reftable-perf-fix-v1-1-002cab9fdb08@pks.im>
479
480
@@ -248,50 +483,50 @@ Release tarballs are available at:
483 + sequencer: rework reflog message handling
484 + sequencer: move reflog message functions
485
486 + Use-after-free fix in the sequencer.
487 +
488 + Will merge to 'master'.
489 source: <pull.1919.git.1746807747.gitgitgadget@gmail.com>
490
491
492 * rc/t1001-test-path-is-file (2025-05-12) 1 commit
255 - - t1001: replace 'test -f' with 'test_path_is_file'
493 + (merged to 'next' on 2025-05-13 at bc67be09c3)
494 + + t1001: replace 'test -f' with 'test_path_is_file'
495
496 + Test update.
497 +
498 + Will merge to 'master'.
499 source: <20250510230909.65519-1-rodrigorsdc@gmail.com>
500
501
260 -* rj/build-tweaks-part2 (2025-05-08) 5 commits
502 +* rj/build-tweaks-part2 (2025-05-13) 5 commits
503 - configure.ac: upgrade to a compilation check for sysinfo
504 - meson.build: correct setting of GIT_EXEC_PATH
505 - meson: correct path to system config/attribute files
506 - meson: correct install location of YAML.pm
507 - meson.build: quote the GITWEBDIR build configuration
508
267 - source: <20250508164443.1506440-1-ramsay@ramsayjones.plus.com>
509 + Updates to meson-based build procedure.
510 +
511 + Expecting a reroll?
512 + cf. <a163d515-2e71-4a42-b843-26d5d2ccdc59@ramsayjones.plus.com>
513 + source: <20250513191739.1513460-1-ramsay@ramsayjones.plus.com>
514
269 ---------------------------------------------------
270 -[Cooking]
515
516 * ag/doc-send-email (2025-05-08) 3 commits
273 - - docs: add credential helper for outlook and gmail in OAuth list of helpers
274 - - docs: improve send-email documentation
275 - - send-mail: improve checks for valid_fqdn
517 + (merged to 'next' on 2025-05-13 at 6eb746c6c2)
518 + + docs: add credential helper for outlook and gmail in OAuth list of helpers
519 + + docs: improve send-email documentation
520 + + send-mail: improve checks for valid_fqdn
521
522 The `send-email` documentation has been updated with OAuth2.0
523 related examples.
524
280 - Will merge to 'next'.
281 - source: <PN0PR01MB95882173451A6A7C28AD7BE7B88BA@PN0PR01MB9588.INDPRD01.PROD.OUTLOOK.COM>
282 -
283 -
284 -* jc/t6011-mv-ro-fix (2025-05-07) 1 commit
285 - (merged to 'next' on 2025-05-09 at 6168793ae5)
286 - + t6011: fix misconversion from perl to sed
287 -
288 - Test fix.
289 -
525 Will merge to 'master'.
291 - source: <xmqq8qn9fj8o.fsf@gitster.g>
526 + source: <PN0PR01MB95882173451A6A7C28AD7BE7B88BA@PN0PR01MB9588.INDPRD01.PROD.OUTLOOK.COM>
527
528
294 -* ps/object-store (2025-05-09) 18 commits
529 +* ps/object-store (2025-05-14) 18 commits
530 - odb: rename `read_object_with_reference()`
531 - odb: rename `pretend_object_file()`
532 - odb: rename `has_object()`
@@ -312,44 +547,22 @@ Release tarballs are available at:
547 - Merge branch 'ps/object-store-cleanup' into ps/object-store
548
549 Code clean-up around object access API.
315 - source: <20250509-pks-object-store-wo-the-repository-v2-0-103f59bf8e28@pks.im>
550 +
551 + Comments?
552 + source: <20250514-pks-object-store-wo-the-repository-v3-0-47df1d4ead22@pks.im>
553
554
318 -* sj/use-mmap-to-check-packed-refs (2025-05-07) 4 commits
555 +* sj/use-mmap-to-check-packed-refs (2025-05-14) 3 commits
556 - packed-backend: mmap large "packed-refs" file during fsck
320 - - packed-backend: extract munmap operation for `MMAP_TEMPORARY`
557 - packed-backend: extract snapshot allocation in `load_contents`
322 - - packed-backend: fsck should allow an empty "packed-refs" file
558 + - packed-backend: fsck should warn when "packed-refs" file is empty
559
560 The code path to access the "packed-refs" file while "fsck" is
561 taught to mmap the file, instead of reading the whole file in the
562 memory.
563
328 - Expecting a reroll.
329 - cf. <20250508200802.GC18229@coredump.intra.peff.net>
330 - source: <aBtzn4nwLsI9p5Cp@ArchLinux>
331 -
332 -
333 -* tb/macos-false-but-the-compiler-does-not-know-it-fix (2025-05-07) 1 commit
334 - (merged to 'next' on 2025-05-09 at d8fb9874ef)
335 - + intialize false_but_the_compiler_does_not_know_it_
336 -
337 - Workaround for older macOS ld.
338 -
339 - Will merge to 'master'.
340 - source: <20250506120644.186968-1-tboegi@web.de>
341 -
342 -
343 -* cf/wrapper-bsd-eloop (2025-05-06) 1 commit
344 - (merged to 'next' on 2025-05-08 at 7b1e21b252)
345 - + wrapper: NetBSD gives EFTYPE and FreeBSD gives EMFILE where POSIX uses ELOOP
346 -
347 - The fallback implementation of open_nofollow() depended on
348 - open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD
349 - derived systems use different errno, which has been worked around.
350 -
351 - Will merge to 'master'.
352 - source: <20250506010946.212068-1-collin.funk1@gmail.com>
564 + Will merge to 'next'?
565 + source: <aCS7O8tNekg_u9Wp@ArchLinux>
566
567
568 * js/ci-build-win-in-release-mode (2025-05-05) 1 commit
@@ -363,50 +576,6 @@ Release tarballs are available at:
576 source: <pull.1908.v2.git.1746282346370.gitgitgadget@gmail.com>
577
578
366 -* js/ci-buildsystems-cleanup (2025-05-05) 3 commits
367 - (merged to 'next' on 2025-05-06 at b2038f9a91)
368 - + config.mak.uname: drop the `vcxproj` target
369 - + contrib/buildsystems: drop support for building . vcproj/.vcxproj files
370 - + ci: stop linking the `prove` cache
371 -
372 - Code clean-up around stale CI elements and building with Visual Studio.
373 -
374 - Will merge to 'master'.
375 - source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>
376 -
377 -
378 -* kh/docfixes (2025-05-05) 2 commits
379 - (merged to 'next' on 2025-05-06 at 6cd8af0fa1)
380 - + doc: branch: fix inline-verbatim
381 - + doc: reflog: fix `drop` subheading
382 -
383 - Docfixes.
384 -
385 - Will merge to 'master'.
386 - source: <cover.1746299135.git.code@khaugsbakk.name>
387 -
388 -
389 -* kj/glob-path-with-special-char (2025-05-05) 1 commit
390 - (merged to 'next' on 2025-05-06 at 629a3ecd64)
391 - + dir.c: literal match with wildcard in pathspec should still glob
392 -
393 - "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname,
394 - also existed on the working tree, which has been corrected.
395 -
396 - Will merge to 'master'.
397 - source: <20250503060736.587286-1-jayatheerthkulkarni2005@gmail.com>
398 -
399 -
400 -* ps/ci-test-aggreg-fix-for-meson (2025-05-05) 1 commit
401 - (merged to 'next' on 2025-05-06 at 40306a837b)
402 - + ci: fix aggregation of test results with Meson
403 -
404 - Test result aggregation did not work in Meson based CI jobs.
405 -
406 - Will merge to 'master'.
407 - source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>
408 -
409 -
579 * cc/promisor-remote-capability (2025-04-29) 3 commits
580 - promisor-remote: allow a client to check fields
581 - promisor-remote: allow a server to advertise more fields
@@ -417,7 +586,8 @@ Release tarballs are available at:
586 source: <20250429145243.992252-1-christian.couder@gmail.com>
587
588
420 -* ds/scalar-no-maintenance (2025-05-07) 4 commits
589 +* ds/scalar-no-maintenance (2025-05-14) 5 commits
590 + - scalar reconfigure: improve --maintenance docs
591 (merged to 'next' on 2025-05-08 at 1006cdd399)
592 + scalar reconfigure: add --maintenance=<mode> option
593 + scalar clone: add --no-maintenance option
@@ -428,20 +598,10 @@ Release tarballs are available at:
598 under "scalar"'s control are taught an option not to enable the
599 scheduled maintenance on it.
600
431 - Will merge to 'master'.
601 + Will merge to 'next' and then to 'master'.
602 source: <pull.1913.v3.git.1746582637.gitgitgadget@gmail.com>
603
604
435 -* en/get-tree-entry-doc (2025-05-02) 1 commit
436 - (merged to 'next' on 2025-05-06 at cddf407919)
437 - + tree-walk.h: fix incorrect API comment
438 -
439 - Doc update.
440 -
441 - Will merge to 'master'.
442 - source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>
443 -
444 -
605 * jc/doc-synopsis-option-markup (2025-05-12) 4 commits
606 - git-var doc: fix usage of $ENV_VAR vs ENV_VAR
607 - git-verify-* doc: update mark-up of synopsis option descriptions
@@ -470,22 +630,6 @@ Release tarballs are available at:
630 source: <20250512190311.1451556-1-gitster@pobox.com>
631
632
473 -* ps/maintenance-missing-tasks (2025-05-07) 6 commits
474 - (merged to 'next' on 2025-05-08 at 2da78b0ef1)
475 - + builtin/maintenance: introduce "rerere-gc" task
476 - + builtin/gc: move rerere garbage collection into separate function
477 - + builtin/maintenance: introduce "worktree-prune" task
478 - + builtin/gc: move pruning of worktrees into a separate function
479 - + builtin/gc: remove global variables where it is trivial to do
480 - + builtin/gc: fix indentation of `cmd_gc()` parameters
481 -
482 - Make repository clean-up tasks "gc" can do available to "git
483 - maintenance" front-end.
484 -
485 - Will merge to 'master'.
486 - source: <20250507-pks-maintenance-missing-tasks-v5-0-aa5fdfb82891@pks.im>
487 -
488 -
633 * cc/fast-import-export-signature-names (2025-04-24) 1 commit
634 . fast-(import|export): improve on the signature algorithm name
635
@@ -498,16 +642,6 @@ Release tarballs are available at:
642 source: <20250424203904.909777-1-christian.couder@gmail.com>
643
644
501 -* dd/meson-perl-custom-path (2025-05-08) 1 commit
502 - (merged to 'next' on 2025-05-09 at 3e4d3f1d59)
503 - + meson: allow customize perl installation path
504 -
505 - Meson-based build framework update.
506 -
507 - Will merge to 'master'.
508 - source: <a9d431944b6d94e0eb25535c061fc226a7fefa9e.1746692662.git.congdanhqx@gmail.com>
509 -
510 -
645 * sj/string-list-typefix (2025-04-22) 5 commits
646 - u-string-list: move "remove duplicates" test to "u-string-list.c"
647 - u-string-list: move "filter string" test to "u-string-list.c"
@@ -536,7 +670,8 @@ Release tarballs are available at:
670 "pack-objects" has been taught to avoid pointing into objects in
671 cruft packs from midx.
672
539 - Comments?
673 + Expecting a (hopefully small and final) reroll?
674 + cf.<CABPp-BEukTWwsuC7MMR8D5_UAhyw-LgT=DsPKAWeR_ZmVVhjzQ@mail.gmail.com>
675 source: <cover.1744757204.git.me@ttaylorr.com>
676
677
@@ -568,29 +703,31 @@ Release tarballs are available at:
703 source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
704
705
571 -* md/userdiff-bash-shell-function (2025-04-01) 1 commit
706 +* md/userdiff-bash-shell-function (2025-05-16) 1 commit
707 - userdiff: extend Bash pattern to cover more shell function forms
708
709 The userdiff pattern for shell scripts has been updated to cope
710 with more bash-isms.
711
577 - Comments?
578 - source: <20250330134018.9662-2-dhar61595@gmail.com>
712 + Will merge to 'next'.
713 + cf. <a72235c1-625a-4b90-8111-629b5a6ee7c2@kdbg.org>
714 + source: <20250516144515.49514-2-dhar61595@gmail.com>
715
716
717 * sc/bundle-uri-use-all-refs-in-bundle (2025-04-25) 2 commits
582 - - bundle-uri: add test for bundle-uri clones with tags
583 - - bundle-uri: copy all bundle references ino the refs/bundle space
718 + (merged to 'next' on 2025-05-13 at df93f99c2b)
719 + + bundle-uri: add test for bundle-uri clones with tags
720 + + bundle-uri: copy all bundle references ino the refs/bundle space
721
722 Bundle-URI feature did not use refs recorded in the bundle other
723 than normal branches as anchoring points to optimize the follow-up
724 fetch during "git clone"; now it is told to utilize all.
725
589 - Will merge to 'next'.
590 - source: <pull.1897.v4.git.git.1745587067.gitgitgadget@gmail.com>
726 + Will merge to 'master'.
727 + source: <pull.1897.v7.git.git.1745609589.gitgitgadget@gmail.com>
728
729
593 -* ds/path-walk-2 (2025-03-25) 13 commits
730 +* ds/path-walk-2 (2025-05-16) 13 commits
731 - pack-objects: allow --shallow and --path-walk
732 - path-walk: add new 'edge_aggressive' option
733 - pack-objects: thread the path-based compression
@@ -608,10 +745,8 @@ Release tarballs are available at:
745 "git pack-objects" learns to find delta bases from blobs at the
746 same path, using the --path-walk API.
747
611 - Waiting for review responses.
612 - cf. <aBVLC57bMJKjygyi@nand.local>
613 - cf. <aBq48Dog53bn5bJb@nand.local>
614 - source: <pull.1819.v2.git.1742829769.gitgitgadget@gmail.com>
748 + Comments?
749 + source: <pull.1819.v3.git.1747419124.gitgitgadget@gmail.com>
750
751
752 * ib/diff-S-G-with-longhand (2025-02-12) 10 commits
@@ -632,20 +767,23 @@ Release tarballs are available at:
767 Expecting a reroll.
768 source: <20250212032657.1807939-1-illia.bobyr@gmail.com>
769
770 +--------------------------------------------------
771 +[Discarded]
772
773 * ej/cat-file-remote-object-info (2025-02-24) 8 commits
637 - - cat-file: add remote-object-info to batch-command
638 - - transport: add client support for object-info
639 - - serve: advertise object-info feature
640 - - fetch-pack: move fetch initialization
641 - - fetch-pack: refactor packet writing
642 - - t1006: split test utility functions into new "lib-cat-file.sh"
643 - - cat-file: add declaration of variable i inside its for loop
644 - - git-compat-util: add strtoul_ul() with error handling
774 + . cat-file: add remote-object-info to batch-command
775 + . transport: add client support for object-info
776 + . serve: advertise object-info feature
777 + . fetch-pack: move fetch initialization
778 + . fetch-pack: refactor packet writing
779 + . t1006: split test utility functions into new "lib-cat-file.sh"
780 + . cat-file: add declaration of variable i inside its for loop
781 + . git-compat-util: add strtoul_ul() with error handling
782
783 "git cat-file --batch" and friends can optionally ask a remote
784 server about objects it does not have.
785
649 - Expecting a reroll.
786 + Has been in "Expecting a reroll" state for too long,
787 + and causes conflicts with the ps/object-store topic.
788 cf. <CAN2LT1Cc-UaUpabqcGascicR3nk6ZdFythamKje33Orhy5WoNA@mail.gmail.com>
789 source: <20250221190451.12536-1-eric.peijian@gmail.com>