What's cooking (2025/01 #06)

Junio C Hamano committed Jan 22, 2025 at 14:02 UTC fea214e48d5f406a20433da975a52d9d0e472aec
1 file changed +241 -278
whats-cooking.txt
+241 -278
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jan 2025, #05; Fri, 17)
3 -X-master-at: efff4a85a4fce58b2aa850c6fbf4d8828329f51d
4 -X-next-at: 71f41b00d8cac733315206fddf476d8bed484a36
2 +Subject: What's cooking in git.git (Jan 2025, #06; Wed, 22)
3 +X-master-at: 4e746b1a31f9f0036032b6f94279cf16fb363203
4 +X-next-at: 3171845b731fb90dfa49d89be174ccc6dfbf5729
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Jan 2025, #05; Fri, 17)
7 +What's cooking in git.git (Jan 2025, #06; Wed, 22)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -17,14 +17,11 @@ 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 -Git 2.48.1 and other maintenance releases have been tagged and
21 -released. A handful of topics that were marked with "Will discard?"
22 -without seeing any further activity have been discarded.
23 -
20 There are quite a few topics that are listed here but without much
25 -review activities. I'll review the notes below with list archive
26 -myself to see which ones are truly stale and discard them, maybe
27 -later next week.
21 +review activities. I earlier said that I'll review the notes below
22 +with list archive myself to see which ones are truly stale and
23 +discard them, but this is progressing a lot slower than my liking.
24 +Help is greatly appreciated.
25
26 Copies of the source code to Git live in many repositories, and the
27 following is a list of the ones I push into or their mirrors. Some
@@ -57,89 +54,146 @@ Release tarballs are available at:
54 --------------------------------------------------
55 [Graduated to 'master']
56
60 -* as/long-option-help-i18n (2024-12-30) 1 commit
61 - (merged to 'next' on 2024-12-30 at 900c79808f)
62 - + parse-options: localize mark-up of placeholder text in the short help
63 -
64 - Tweak the help text used for the option value placeholders by
65 - parse-options API so that translations can customize the "<>"
66 - placeholder signal (e.g. "--option=<value>").
67 - source: <20241228114221.10351-4-ash@kambanaria.org>
68 -
69 -
70 -* mb/t7110-use-test-path-helper (2025-01-03) 1 commit
71 - (merged to 'next' on 2025-01-06 at cd96b0ac82)
72 - + t7110: replace `test -f` with `test_path_is_*` helpers
73 -
74 - Test modernization.
75 - source: <20250103130035.79376-1-matteobagnolini2003@gmail.com>
76 -
77 -
78 -* ps/meson-weak-sha1-build (2024-12-30) 8 commits
79 - (merged to 'next' on 2025-01-01 at e01db872e4)
80 - + meson: provide a summary of configured backends
81 - + meson: wire up unsafe SHA1 backend
82 - + meson: add missing dots for build options
83 - + meson: simplify conditions for HTTPS and SHA1 dependencies
84 - + meson: require SecurityFramework when it's used as SHA1 backend
85 - + meson: deduplicate access to SHA1/SHA256 backend options
86 - + meson: consistenlty spell 'CommonCrypto'
87 - + Merge branch 'ps/weak-sha1-for-tail-sum-fix' into ps/meson-weak-sha1-build
88 - (this branch is used by ps/build-meson-fixes and ps/zlib-ng.)
89 -
90 - meson-based build now supports the unsafe-sha1 build knob.
91 - source: <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
92 -
93 -
94 -* ps/more-sign-compare (2024-12-27) 10 commits
95 - (merged to 'next' on 2025-01-01 at 41c78cf690)
96 - + sign-compare: avoid comparing ptrdiff with an int/unsigned
97 - + commit-reach: use `size_t` to track indices when computing merge bases
98 - + shallow: fix -Wsign-compare warnings
99 - + builtin/log: fix remaining -Wsign-compare warnings
100 - + builtin/log: use `size_t` to track indices
101 - + commit-reach: use `size_t` to track indices in `get_reachable_subset()`
102 - + commit-reach: use `size_t` to track indices in `remove_redundant()`
103 - + commit-reach: fix type of `min_commit_date`
104 - + commit-reach: fix index used to loop through unsigned integer
105 - + prio-queue: fix type of `insertion_ctr`
106 -
107 - More -Wsign-compare fixes.
108 - cf. https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/
109 - source: <20241227-b4-pks-commit-reach-sign-compare-v1-0-07c59c2aa632@pks.im>
110 -
111 -
112 -* ps/object-collision-check (2025-01-06) 4 commits
113 - (merged to 'next' on 2025-01-06 at 540e2bae11)
114 - + object-file: retry linking file into place when occluding file vanishes
115 - + object-file: don't special-case missing source file in collision check
116 - + object-file: rename variables in `check_collision()`
117 - (merged to 'next' on 2024-12-30 at e083ea3154)
118 - + object-file: fix race in object collision check
119 -
120 - CI jobs gave sporadic failures, which turns out that that the
121 - object finalization code was giving an error when it did not have
122 - to.
123 - source: <20250106-b4-pks-object-file-racy-collision-check-v2-0-8b3984ecbb18@pks.im>
124 -
125 -
126 -* re/submodule-parse-opt (2024-12-11) 7 commits
127 - (merged to 'next' on 2024-12-21 at 9e65a56a63)
128 - + git-submodule.sh: rename some variables
129 - + git-submodule.sh: improve variables readability
130 - + git-submodule.sh: add some comments
131 - + git-submodule.sh: get rid of unused variable
132 - + git-submodule.sh: get rid of isnumber
133 - + git-submodule.sh: improve parsing of short options
134 - + git-submodule.sh: improve parsing of some long options
135 -
136 - "git submodule" learned various ways to spell the same option,
137 - e.g. "--branch=B" can be spelled "--branch B" or "-bB".
138 - source: <20241211063234.7610-1-royeldar0@gmail.com>
57 +* aj/difftool-config-doc-fix (2025-01-09) 1 commit
58 + (merged to 'next' on 2025-01-10 at b8902a53d1)
59 + + difftool docs: restore correct position of tool list
60 +
61 + Docfix.
62 + source: <pull.1849.git.1736379323427.gitgitgadget@gmail.com>
63 +
64 +
65 +* dk/zsh-config-completion-fix (2025-01-06) 1 commit
66 + (merged to 'next' on 2025-01-10 at efba7d534c)
67 + + completion: repair config completion for Zsh
68 +
69 + Completion script updates for zsh
70 + source: <pull.1860.v3.git.git.1736200026899.gitgitgadget@gmail.com>
71 +
72 +
73 +* jk/lsan-race-ignore-false-positive (2025-01-07) 3 commits
74 + (merged to 'next' on 2025-01-09 at 3d7cd910b5)
75 + + test-lib: add a few comments to LSan log checking
76 + + test-lib: simplify lsan results check
77 + + test-lib: invert return value of check_test_results_san_file_empty
78 +
79 + The code to check LSan results has been simplified and made more
80 + robust.
81 + source: <20250107070409.GA584456@coredump.intra.peff.net>
82 +
83 +
84 +* jk/t7407-use-test-grep (2025-01-07) 1 commit
85 + (merged to 'next' on 2025-01-09 at 1d584ee42d)
86 + + t7407: use test_grep
87 +
88 + Test clean-up.
89 + source: <20250107071824.GA594237@coredump.intra.peff.net>
90 +
91 +
92 +* jt/fsck-skiplist-parse-fix (2025-01-07) 1 commit
93 + (merged to 'next' on 2025-01-09 at d08b30fd78)
94 + + fsck: reject misconfigured fsck.skipList
95 +
96 + A misconfigured "fsck.skiplist" configuration variable was not
97 + diagnosed as an error, which has been corrected.
98 + source: <20250107162914.3756968-2-jltobler@gmail.com>
99 +
100 +
101 +* mh/gitattr-doc-markup-fix (2025-01-07) 1 commit
102 + (merged to 'next' on 2025-01-10 at 9b8f84ebe2)
103 + + docs: fix typesetting of merge driver placeholders
104 +
105 + Doc markup fix.
106 + source: <20250107212421.7yyvuzw4uqxnqv7t@archP14s>
107 +
108 +
109 +* ps/reftable-get-random-fix (2025-01-07) 2 commits
110 + (merged to 'next' on 2025-01-09 at bc024b7a45)
111 + + reftable/stack: accept insecure random bytes
112 + + wrapper: allow generating insecure random bytes
113 +
114 + The code to compute "unique" name used git_rand() which can fail or
115 + get stuck; the callsite does not require cryptographic security.
116 + Introduce the "insecure" mode and use it appropriately.
117 + source: <20250107-b4-pks-reftable-csprng-v1-0-6109a54a8756@pks.im>
118 +
119 +
120 +* ps/the-repository (2024-12-18) 15 commits
121 + (merged to 'next' on 2025-01-09 at 1de40edade)
122 + + match-trees: stop using `the_repository`
123 + + graph: stop using `the_repository`
124 + + add-interactive: stop using `the_repository`
125 + + tmp-objdir: stop using `the_repository`
126 + + resolve-undo: stop using `the_repository`
127 + + credential: stop using `the_repository`
128 + + mailinfo: stop using `the_repository`
129 + + diagnose: stop using `the_repository`
130 + + server-info: stop using `the_repository`
131 + + send-pack: stop using `the_repository`
132 + + serve: stop using `the_repository`
133 + + trace: stop using `the_repository`
134 + + pager: stop using `the_repository`
135 + + progress: stop using `the_repository`
136 + + Merge branch 'ps/build-sign-compare' into ps/the-repository
137 +
138 + More code paths have a repository passed through the callchain,
139 + instead of assuming the primary the_repository object.
140 + source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
141 +
142 +
143 +* sk/unit-test-hash (2025-01-09) 1 commit
144 + (merged to 'next' on 2025-01-13 at 865b121824)
145 + + t/unit-tests: convert hash to use clar test framework
146 +
147 + Test update.
148 + source: <20250109140952.5267-1-kuforiji98@gmail.com>
149
150 --------------------------------------------------
151 [New Topics]
152
153 +* bc/doc-adoc-not-txt (2025-01-21) 5 commits
154 + - Remove obsolete ".txt" extensions for AsciiDoc files
155 + - doc: use .adoc extension for AsciiDoc files
156 + - gitattributes: mark AsciiDoc files as LF-only
157 + - editorconfig: add .adoc extension
158 + - doc: update gitignore for .adoc extension
159 +
160 + All the documentation .txt files have been renamed to .adoc to help
161 + content aware editors.
162 +
163 + Will merge to 'next' and keep it there for at least 3 weeks.
164 + source: <20250120015603.1980991-1-sandals@crustytoothpaste.net>
165 +
166 +
167 +* jp/t8002-printf-fix (2025-01-21) 1 commit
168 + (merged to 'next' on 2025-01-22 at 20bc202378)
169 + + t8002: fix ambiguous printf conversion specifications
170 +
171 + Test fix.
172 +
173 + Will merge to 'master'.
174 + source: <20250120114106.2844157-1-jpalus@fastmail.com>
175 +
176 +
177 +* am/trace2-with-valueless-true (2025-01-22) 1 commit
178 + - trace2: prevent segfault on config collection with valueless true
179 +
180 + source: <pull.1814.v2.git.1736494100622.gitgitgadget@gmail.com>
181 +
182 +
183 +* kn/reflog-symref-fix (2025-01-22) 1 commit
184 + - refs: fix creation of corrupted reflogs for symrefs
185 +
186 + source: <20250122100319.2280647-1-karthik.188@gmail.com>
187 +
188 +
189 +* ps/reflog-migration-with-logall-fix (2025-01-22) 1 commit
190 + - refs: fix migration of reflogs respecting "core.logAllRefUpdates"
191 +
192 + source: <20250122-b4-pks-reflog-migration-fix-stash-v1-1-27dbae4602f7@pks.im>
193 +
194 +--------------------------------------------------
195 +[Cooking]
196 +
197 * sj/meson-doc-technical-dependency-fix (2025-01-14) 1 commit
198 (merged to 'next' on 2025-01-16 at 3ec55e0703)
199 + meson: fix missing deps for technical articles
@@ -172,8 +226,10 @@ Release tarballs are available at:
226
227 Foreign language interface for Rust into our code base has been added.
228
175 - Needs to be aware of meson build?
229 + Expecting a reroll.
230 cf. <xmqqtt9ypj4m.fsf@gitster.g>
231 + cf. <Z47jgK-oMjFRSslr@tapette.crustytoothpaste.net>
232 + cf. <Z47kr0_fYYdaMWyA@tapette.crustytoothpaste.net>
233 source: <cover.1736971328.git.steadmon@google.com>
234
235
@@ -184,28 +240,31 @@ Release tarballs are available at:
240
241 "git refs migrate" for migrating reflog data was broken.
242
187 - Will merge to 'master'.
243 + On Hold.
244 cf. <Z4mUizLNUdq_1BgY@tapette.crustytoothpaste.net>
245 + cf. <CAOLa=ZT4nws0irdZKUuWc70Rv9RUNQuSXnGAt1SnE1O+umSReg@mail.gmail.com>
246 source: <CAOLa=ZTL9n_DPhNr49XAd6bT838kc09oVx_AH7Pb4o8VK_xQ9w@mail.gmail.com>
247
248
249 * jc/show-usage-help (2025-01-17) 6 commits
193 - - builtin: send usage() help text to standard output
194 - - oddballs: send usage() help text to standard output
195 - - builtins: send usage_with_options() help text to standard output
196 - - usage: add show_usage_if_asked()
197 - - parse-options: add show_usage_with_options_if_asked()
198 - - t0012: optionally check that "-h" output goes to stdout
250 + (merged to 'next' on 2025-01-21 at 5a17181a32)
251 + + builtin: send usage() help text to standard output
252 + + oddballs: send usage() help text to standard output
253 + + builtins: send usage_with_options() help text to standard output
254 + + usage: add show_usage_if_asked()
255 + + parse-options: add show_usage_with_options_if_asked()
256 + + t0012: optionally check that "-h" output goes to stdout
257
258 The help text from "git $cmd -h" appear on the standard output for
259 some $cmd and the standard error for others. The built-in commands
260 have been fixed to show them on the standard output consistently.
261
204 - Will merge to 'next'.
262 + Will merge to 'master'.
263 cf. <20250117114123.GA2356746@coredump.intra.peff.net>
264 + source: <20250117213148.3974552-1-gitster@pobox.com>
265
266
208 -* kn/pack-write-with-reduced-globals (2025-01-17) 5 commits
267 +* kn/pack-write-with-reduced-globals (2025-01-21) 5 commits
268 - pack-write: pass hash_algo to internal functions
269 - pack-write: pass hash_algo to `write_rev_file()`
270 - pack-write: pass hash_algo to `write_idx_file()`
@@ -215,37 +274,38 @@ Release tarballs are available at:
274 Code clean-up.
275
276 Well merge to 'next'?
218 - cf. <Z4kIg8ihbgPPb3C_@pks.im>
219 - source: <20250117-kn-the-repo-cleanup-v2-0-a7fdc19688f5@gmail.com>
220 -
221 -
222 -* ps/reftable-sign-compare (2025-01-16) 10 commits
223 - - reftable: address trivial -Wsign-compare warnings
224 - - reftable/blocksource: adjust `read_block()` to return `ssize_t`
225 - - reftable/blocksource: adjust type of the block length
226 - - reftable/block: adjust type of the restart length
227 - - reftable/block: adapt header and footer size to return a `size_t`
228 - - reftable/basics: adjust `hash_size()` to return `uint32_t`
229 - - reftable/basics: adjust `common_prefix_size()` to return `size_t`
230 - - reftable/record: handle overflows when decoding varints
231 - - reftable/record: drop unused `print` function pointer
232 - - meson: stop disabling -Wsign-compare
277 + source: <20250119-kn-the-repo-cleanup-v3-0-a495fce08d71@gmail.com>
278 +
279 +
280 +* ps/reftable-sign-compare (2025-01-21) 10 commits
281 + (merged to 'next' on 2025-01-22 at a5ae1ce801)
282 + + reftable: address trivial -Wsign-compare warnings
283 + + reftable/blocksource: adjust `read_block()` to return `ssize_t`
284 + + reftable/blocksource: adjust type of the block length
285 + + reftable/block: adjust type of the restart length
286 + + reftable/block: adapt header and footer size to return a `size_t`
287 + + reftable/basics: adjust `hash_size()` to return `uint32_t`
288 + + reftable/basics: adjust `common_prefix_size()` to return `size_t`
289 + + reftable/record: handle overflows when decoding varints
290 + + reftable/record: drop unused `print` function pointer
291 + + meson: stop disabling -Wsign-compare
292
293 THe reftable/ library code has been made -Wsign-compare clean.
294
236 - Will merge to 'next'?
237 - source: <20250116-b4-pks-reftable-sign-compare-v1-0-bd30e2ee96e7@pks.im>
295 + Will merge to 'master'.
296 + source: <20250120-b4-pks-reftable-sign-compare-v2-0-b4566d02e4a5@pks.im>
297
298
299 * sk/unit-tests (2025-01-17) 4 commits
241 - - t/unit-tests: convert reftable tree test to use clar test framework
242 - - t/unit-tests: adapt priority queue test to use clar test framework
243 - - t/unit-tests: convert mem-pool test to use clar test framework
244 - - t/unit-tests: handle dashes in test suite filenames
300 + (merged to 'next' on 2025-01-21 at 799bbc6b82)
301 + + t/unit-tests: convert reftable tree test to use clar test framework
302 + + t/unit-tests: adapt priority queue test to use clar test framework
303 + + t/unit-tests: convert mem-pool test to use clar test framework
304 + + t/unit-tests: handle dashes in test suite filenames
305
306 Move a few more unit tests to the clar test framework.
307
248 - Will merge to 'next'.
308 + Will merge to 'master'.
309 source: <20250117122926.101749-1-kuforiji98@gmail.com>
310
311
@@ -269,20 +329,23 @@ Release tarballs are available at:
329 source: <xmqqzfjqmbza.fsf@gitster.g>
330
331
272 -* jk/pack-header-parse-alignment-fix (2025-01-17) 3 commits
273 - - index-pack, unpack-objects: use skip_prefix to avoid magic number
274 - - parse_pack_header_option(): avoid unaligned memory writes
275 - - packfile: factor out --pack_header argument parsing
332 +* jk/pack-header-parse-alignment-fix (2025-01-21) 5 commits
333 + (merged to 'next' on 2025-01-21 at 60017ef61a)
334 + + index-pack, unpack-objects: use skip_prefix to avoid magic number
335 + + index-pack, unpack-objects: use get_be32() for reading pack header
336 + + parse_pack_header_option(): avoid unaligned memory writes
337 + + packfile: factor out --pack_header argument parsing
338 + + bswap.h: squelch potential sparse -Wcast-truncate warnings
339
340 It was possible for "git unpack-objects" and "git index-pack" to
341 make an unaligned access, which has been corrected.
342
280 - Will merge to 'next'.
281 - source: <20250117125207.GB2356599@coredump.intra.peff.net>
343 + Will merge to 'master'.
344 + source: <20250119131224.GA1541095@coredump.intra.peff.net>
345
346
284 -* kn/reflog-migration-fix-followup (2025-01-17) 4 commits
285 - - reftable: prevent 'update_index' changes after header write
347 +* kn/reflog-migration-fix-followup (2025-01-22) 4 commits
348 + - reftable: prevent 'update_index' changes after adding records
349 - refs: use 'uint64_t' for 'ref_update.index'
350 - refs: mark `ref_transaction_update_reflog()` as static
351 - Merge branch 'kn/reflog-migration-fix' into kn/reflog-migration-fix-followup
@@ -290,32 +353,34 @@ Release tarballs are available at:
353
354 Code clean-up.
355
293 - source: <20250117-461-corrupted-reftable-followup-v1-0-70ee605ae3fe@gmail.com>
356 + Will merge to 'next'.
357 + cf. <Z5DgxQuc2j_-5GHg@pks.im>
358 + source: <20250122-461-corrupted-reftable-followup-v3-0-ae5f88bf04fa@gmail.com>
359
360
361 * mh/connect-sign-compare (2025-01-17) 1 commit
297 - - connect: address -Wsign-compare warnings
362 + (merged to 'next' on 2025-01-21 at 6d872e6042)
363 + + connect: address -Wsign-compare warnings
364
365 The code in connect.c has been updated to work around complaints
366 from -Wsign-compare.
367
302 - Will merge to 'next'.
368 + Will merge to 'master'.
369 source: <20250117074909.1430067-1-mh@glandium.org>
370
371
372 * ps/build-meson-subtree (2025-01-17) 3 commits
307 - - meson: wire up the git-subtree(1) command
308 - - meson: introduce build option for contrib
309 - - contrib/subtree: fix building docs
373 + (merged to 'next' on 2025-01-21 at fe4e60a331)
374 + + meson: wire up the git-subtree(1) command
375 + + meson: introduce build option for contrib
376 + + contrib/subtree: fix building docs
377
378 THe meson-driven build is now aware of "git-subtree" housed in
379 contrib/subtree hierarchy.
380
314 - Will merge to 'next'.
381 + Will merge to 'master'.
382 source: <20250117-b4-pks-build-subtree-v1-0-03c2ed6cc42e@pks.im>
383
317 ---------------------------------------------------
318 -[Cooking]
384
385 * ak/instaweb-python-port-binding-fix (2025-01-10) 1 commit
386 (merged to 'next' on 2025-01-17 at bcb5e21e0b)
@@ -352,7 +417,7 @@ Release tarballs are available at:
417 source: <pull.1851.v2.git.1736549677.gitgitgadget@gmail.com>
418
419
355 -* ps/build-meson-fixes (2025-01-14) 12 commits
420 +* ps/build-meson-fixes (2025-01-22) 12 commits
421 - ci: wire up Visual Studio build with Meson
422 - ci: raise error when Meson generates warnings
423 - meson: fix compilation with Visual Studio
@@ -369,11 +434,11 @@ Release tarballs are available at:
434
435 More build fixes and enhancements on meson based build procedure.
436
372 - Needs review.
373 - source: <20250114-b4-pks-meson-additions-v2-0-8d7ec676cfd9@pks.im>
437 + Will merge to 'next'?
438 + source: <20250122-b4-pks-meson-additions-v3-0-5a51eb5d3dcd@pks.im>
439
440
376 -* ps/zlib-ng (2025-01-16) 12 commits
441 +* ps/zlib-ng (2025-01-22) 12 commits
442 - ci: make "linux-musl" job use zlib-ng
443 - ci: switch linux-musl to use Meson
444 - compat/zlib: allow use of zlib-ng as backend
@@ -395,13 +460,15 @@ Release tarballs are available at:
460 source: <20250116-b4-pks-compat-drop-uncompress2-v3-0-f2af1f5c4a06@pks.im>
461
462
398 -* rs/ref-fitler-used-atoms-value-fix (2025-01-13) 1 commit
399 - - ref-filter: share bases and is_base_tips between formatting and sorting
463 +* rs/ref-fitler-used-atoms-value-fix (2025-01-21) 3 commits
464 + - ref-filter: remove ref_format_clear()
465 + - ref-filter: move is-base tip to used_atom
466 + - ref-filter: move ahead-behind bases into used_atom
467
468 "git branch --sort=..." and "git for-each-ref --format=... --sort=..."
469 did not work as expected with some atoms, which has been corrected.
470
404 - cf. https://lore.kernel.org/git/20250113051700.GA767856@coredump.intra.peff.net/
471 + Will merge to 'next'.
472 source: <6b824f05-6f16-4cd9-85b7-3b8b236158b4@web.de>
473
474
@@ -419,20 +486,11 @@ Release tarballs are available at:
486 implementation has been updated in an attempt to make it harder to
487 abuse.
488
422 - Will merge to 'next'?
489 + Expecting a hopefully small and final reroll.
490 + cf. <20250118124343.GA3828177@coredump.intra.peff.net>
491 source: <cover.1737151386.git.me@ttaylorr.com>
492
493
426 -* dk/zsh-config-completion-fix (2025-01-06) 1 commit
427 - (merged to 'next' on 2025-01-10 at efba7d534c)
428 - + completion: repair config completion for Zsh
429 -
430 - Completion script updates for zsh
431 -
432 - Will merge to 'master'.
433 - source: <pull.1860.v3.git.git.1736200026899.gitgitgadget@gmail.com>
434 -
435 -
494 * en/object-name-with-funny-refname-fix (2025-01-13) 2 commits
495 (merged to 'next' on 2025-01-16 at 89cd7778c9)
496 + object-name: be more strict in parsing describe-like output
@@ -461,89 +519,15 @@ Release tarballs are available at:
519 source: <Z3qNUizvHJLgMx1y@ArchLinux>
520
521
464 -* jk/lsan-race-ignore-false-positive (2025-01-07) 3 commits
465 - (merged to 'next' on 2025-01-09 at 3d7cd910b5)
466 - + test-lib: add a few comments to LSan log checking
467 - + test-lib: simplify lsan results check
468 - + test-lib: invert return value of check_test_results_san_file_empty
469 -
470 - The code to check LSan results has been simplified and made more
471 - robust.
472 -
473 - Will merge to 'master'.
474 - source: <20250107070409.GA584456@coredump.intra.peff.net>
475 -
476 -
477 -* jk/t7407-use-test-grep (2025-01-07) 1 commit
478 - (merged to 'next' on 2025-01-09 at 1d584ee42d)
479 - + t7407: use test_grep
480 -
481 - Test clean-up.
482 -
483 - Will merge to 'master'.
484 - source: <20250107071824.GA594237@coredump.intra.peff.net>
485 -
486 -
487 -* jt/fsck-skiplist-parse-fix (2025-01-07) 1 commit
488 - (merged to 'next' on 2025-01-09 at d08b30fd78)
489 - + fsck: reject misconfigured fsck.skipList
490 -
491 - A misconfigured "fsck.skiplist" configuration variable was not
492 - diagnosed as an error, which has been corrected.
493 -
494 - Will merge to 'master'.
495 - source: <20250107162914.3756968-2-jltobler@gmail.com>
496 -
497 -
498 -* ps/reftable-get-random-fix (2025-01-07) 2 commits
499 - (merged to 'next' on 2025-01-09 at bc024b7a45)
500 - + reftable/stack: accept insecure random bytes
501 - + wrapper: allow generating insecure random bytes
502 -
503 - The code to compute "unique" name used git_rand() which can fail or
504 - get stuck; the callsite does not require cryptographic security.
505 - Introduce the "insecure" mode and use it appropriately.
506 -
507 - Will merge to 'master'.
508 - source: <20250107-b4-pks-reftable-csprng-v1-0-6109a54a8756@pks.im>
509 -
510 -
522 * mh/credential-cache-authtype-request-fix (2025-01-09) 1 commit
512 - - credential-cache: respect authtype capability
523 + (merged to 'next' on 2025-01-22 at 51a22e98a1)
524 + + credential-cache: respect authtype capability
525
526 The "cache" credential back-end did not handle authtype correctly,
527 which has been corrected.
516 - source: <pull.1842.v5.git.1736462721156.gitgitgadget@gmail.com>
517 -
518 -
519 -* mh/gitattr-doc-markup-fix (2025-01-07) 1 commit
520 - (merged to 'next' on 2025-01-10 at 9b8f84ebe2)
521 - + docs: fix typesetting of merge driver placeholders
522 -
523 - Doc markup fix.
524 -
525 - Will merge to 'master'.
526 - source: <20250107212421.7yyvuzw4uqxnqv7t@archP14s>
527 -
528 -
529 -* sk/unit-test-hash (2025-01-09) 1 commit
530 - (merged to 'next' on 2025-01-13 at 865b121824)
531 - + t/unit-tests: convert hash to use clar test framework
532 -
533 - Test update.
534 -
535 - Will merge to 'master'.
536 - source: <20250109140952.5267-1-kuforiji98@gmail.com>
537 -
538 -
539 -* aj/difftool-config-doc-fix (2025-01-09) 1 commit
540 - (merged to 'next' on 2025-01-10 at b8902a53d1)
541 - + difftool docs: restore correct position of tool list
542 -
543 - Docfix.
528
529 Will merge to 'master'.
546 - source: <pull.1849.git.1736379323427.gitgitgadget@gmail.com>
530 + source: <pull.1842.v5.git.1736462721156.gitgitgadget@gmail.com>
531
532
533 * jk/combine-diff-cleanup (2025-01-09) 14 commits
@@ -593,16 +577,15 @@ Release tarballs are available at:
577
578
579 * ua/os-version-capability (2025-01-17) 6 commits
596 - . version: introduce osversion.command config for os-version output
597 - . connect: advertise OS version
598 - . t5701: add setup test to remove side-effect dependency
599 - . version: extend get_uname_info() to hide system details
600 - . version: refactor get_uname_info()
601 - . version: refactor redact_non_printables()
580 + - version: introduce osversion.command config for os-version output
581 + - connect: advertise OS version
582 + - t5701: add setup test to remove side-effect dependency
583 + - version: extend get_uname_info() to hide system details
584 + - version: refactor get_uname_info()
585 + - version: refactor redact_non_printables()
586
587 The value of "uname -s" is by default sent over the wire as a new
588 capability, with an opt-out for privacy-concious folks.
605 -
589 source: <20250117104639.65608-1-usmanakinyemi202@gmail.com>
590
591
@@ -615,7 +598,7 @@ Release tarballs are available at:
598
599 Doc updates.
600
618 - Will merge to 'next'?
601 + Will merge to 'next'.
602 source: <pull.1845.v2.git.1736972628.gitgitgadget@gmail.com>
603
604
@@ -664,31 +647,6 @@ Release tarballs are available at:
647 source: <xmqqfrmidyhk.fsf@gitster.g>
648
649
667 -* ps/the-repository (2024-12-18) 15 commits
668 - (merged to 'next' on 2025-01-09 at 1de40edade)
669 - + match-trees: stop using `the_repository`
670 - + graph: stop using `the_repository`
671 - + add-interactive: stop using `the_repository`
672 - + tmp-objdir: stop using `the_repository`
673 - + resolve-undo: stop using `the_repository`
674 - + credential: stop using `the_repository`
675 - + mailinfo: stop using `the_repository`
676 - + diagnose: stop using `the_repository`
677 - + server-info: stop using `the_repository`
678 - + send-pack: stop using `the_repository`
679 - + serve: stop using `the_repository`
680 - + trace: stop using `the_repository`
681 - + pager: stop using `the_repository`
682 - + progress: stop using `the_repository`
683 - + Merge branch 'ps/build-sign-compare' into ps/the-repository
684 -
685 - More code paths have a repository passed through the callchain,
686 - instead of assuming the primary the_repository object.
687 -
688 - Will merge to 'master'.
689 - source: <20241217-pks-use-the-repository-conversion-v1-0-0dba48bcc239@pks.im>
690 -
691 -
650 * jc/doc-attr-tree (2024-12-14) 1 commit
651 - doc: give attr.tree a bit more visibility
652
@@ -701,7 +659,8 @@ Release tarballs are available at:
659 source: <xmqq5xnladwi.fsf@gitster.g>
660
661
704 -* ps/3.0-remote-deprecation (2025-01-06) 6 commits
662 +* ps/3.0-remote-deprecation (2025-01-22) 7 commits
663 + - SQUASH???
664 - remote: announce removal of "branches/" and "remotes/"
665 - builtin/pack-redundant: remove subcommand with breaking changes
666 - ci: repurpose "linux-gcc" job for deprecations
@@ -713,7 +672,9 @@ Release tarballs are available at:
672 changes for Git 3.0, allow an early opt-in for removing support of
673 $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
674 remotes.
716 - source: <20250106-pks-remote-branches-deprecation-v2-0-2ce87c053536@pks.im>
675 +
676 + Will merge to 'next'?
677 + source: <20250122-pks-remote-branches-deprecation-v4-0-5cbf5b28afd5@pks.im>
678
679
680 * cc/lop-remote (2024-12-07) 5 commits
@@ -796,24 +757,26 @@ Release tarballs are available at:
757 selection to produce a packfile with deeper history than window
758 size.
759
799 - Comments?
760 + Will merge to 'next'.
761 + (microhalt) <Z5E5KdbwHE7fmiJx@nand.local>
762 source: <pull.1823.v3.git.1734715194.gitgitgadget@gmail.com>
763
764
765 * ds/path-walk-1 (2024-12-20) 7 commits
804 - - path-walk: reorder object visits
805 - - path-walk: mark trees and blobs as UNINTERESTING
806 - - path-walk: visit tags and cached objects
807 - - path-walk: allow consumer to specify object types
808 - - t6601: add helper for testing path-walk API
809 - - test-lib-functions: add test_cmp_sorted
810 - - path-walk: introduce an object walk by path
766 + (merged to 'next' on 2025-01-22 at 3171845b73)
767 + + path-walk: reorder object visits
768 + + path-walk: mark trees and blobs as UNINTERESTING
769 + + path-walk: visit tags and cached objects
770 + + path-walk: allow consumer to specify object types
771 + + t6601: add helper for testing path-walk API
772 + + test-lib-functions: add test_cmp_sorted
773 + + path-walk: introduce an object walk by path
774 (this branch is used by ds/backfill.)
775
776 Introduce a new API to visit objects in batches based on a common
777 path, or by type.
778
816 - Will merge to 'next'?
779 + Will merge to 'master'.
780 cf. <Z4jeQSLmARruE5l3@pks.im>
781 source: <pull.1818.v4.git.1734711675.gitgitgadget@gmail.com>
782