What's cooking (2024/11 #09)
Junio C Hamano committed
Nov 25, 2024 at 14:53 UTC
58804758837d07e54bd097447be8023ef5d137ee
1 file changed
+91
-119
whats-cooking.txt
+91
-119
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2024, #08; Fri, 22)
3
-X-master-at: 04eaff62f286226f501dd21f069e0e257aee11a6
4
-X-next-at: ff69ae122fde5d47c6ff367af9aef7587057b59f
2
+Subject: What's cooking in git.git (Nov 2024, #09; Mon, 25)
3
+X-master-at: 6ea2d9d271a56afa0e77cd45796ea0592aa9c2d4
4
+X-next-at: dd8b44aac527cac716a395b3fa3356e4ab8b63dd
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2024, #08; Fri, 22)
7
+What's cooking in git.git (Nov 2024, #09; Mon, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,10 @@ 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.47.1 has been tagged; its primary purpose is to synchronise
21
+the gitk subtree with that of J6t, the new maintainer of gitk.
22
+Thanks Johaness for volunteering.
23
+
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
26
repositories have only a subset of branches.
@@ -46,52 +50,20 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
49
-[Graduated to 'master']
50
-
51
-* jk/fetch-prefetch-double-free-fix (2024-11-12) 3 commits
52
- (merged to 'next' on 2024-11-15 at 178c112999)
53
- + refspec: store raw refspecs inside refspec_item
54
- + refspec: drop separate raw_nr count
55
- + fetch: adjust refspec->raw_nr when filtering prefetch refspecs
56
-
57
- Double-free fix.
58
- source: <20241112083204.GA2636868@coredump.intra.peff.net>
59
-
60
-
61
-* jk/test-malloc-debug-check (2024-11-14) 2 commits
62
- (merged to 'next' on 2024-11-15 at 4f8a448748)
63
- + test-lib: move malloc-debug setup after $PATH setup
64
- (merged to 'next' on 2024-11-13 at 9aa0331ba1)
65
- + test-lib: check malloc debug LD_PRELOAD before using
66
-
67
- Avoid build/test breakage on a system without working malloc debug
68
- support dynamic library.
69
- source: <20241111070134.GA675125@coredump.intra.peff.net>
70
- source: <20241114012729.GA1148710@coredump.intra.peff.net>
71
-
72
-
73
-* sm/difftool (2024-11-13) 1 commit
74
- (merged to 'next' on 2024-11-15 at a323438b13)
75
- + builtin/difftool: intialize some hashmap variables
76
-
77
- Use of some uninitialized variables in "git difftool" has been
78
- corrected.
79
- source: <20241112162320.818091-1-simon.marchi@polymtl.ca>
53
+[New Topics]
54
55
+* jc/doc-opt-tilde-expand (2024-11-25) 1 commit
56
+ - doc: option value may be separate for valid reasons
57
82
-* tb/multi-pack-reuse-dupfix (2024-11-15) 2 commits
83
- (merged to 'next' on 2024-11-16 at 32792297e5)
84
- + pack-objects: only perform verbatim reuse on the preferred pack
85
- + t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
58
+ Doc update.
59
87
- Object reuse code based on multi-pack-index sent an unwanted copy
88
- of object.
89
- source: <cover.1731591708.git.me@ttaylorr.com>
60
+ Will merge to 'next'.
61
+ source: <xmqqh67w6m4m.fsf@gitster.g>
62
63
--------------------------------------------------
92
-[New Topics]
64
+[Cooking]
65
94
-* kn/midx-wo-the-repository (2024-11-21) 11 commits
66
+* kn/midx-wo-the-repository (2024-11-25) 11 commits
67
- midx: inline the `MIDX_MIN_SIZE` definition
68
- midx: pass down `hash_algo` to `get_split_midx_filename_ext`
69
- midx: pass down `hash_algo` to `get_midx_filename[_ext]`
@@ -107,7 +79,7 @@ Release tarballs are available at:
79
80
Yet another "pass the repository through the callchain" topic.
81
110
- Waiting for the base topic being rerolled.
82
+ Expecting a reroll.
83
source: <20241119-374-refactor-midx-c-and-midx-write-c-to-not-depend-on-global-state-v2-0-e2f607174efc@gmail.com>
84
85
@@ -138,24 +110,24 @@ Release tarballs are available at:
110
111
112
* tb/boundary-traversal-fix (2024-11-22) 1 commit
141
- - pack-bitmap.c: typofix in `find_boundary_objects()`
113
+ (merged to 'next' on 2024-11-25 at f312b2f8eb)
114
+ + pack-bitmap.c: typofix in `find_boundary_objects()`
115
116
A trivial "correctness" fix that does not yet matter in practice.
117
145
- Will merge to 'next'.
118
+ Will merge to 'master'.
119
source: <cf49115db4e8dcd406a17c946659c2eef3ec6045.1732229420.git.me@ttaylorr.com>
120
121
122
* tb/use-test-file-size-more (2024-11-22) 1 commit
150
- - t/perf: use 'test_file_size' in more places
123
+ (merged to 'next' on 2024-11-25 at 2bdd016a16)
124
+ + t/perf: use 'test_file_size' in more places
125
126
Use the right helper program to measure file size in performance tests.
127
154
- Will merge to 'next'.
128
+ Will merge to 'master'.
129
source: <50c1368630684f235548d2e9a68d4de3745b5fe6.1732220875.git.me@ttaylorr.com>
130
157
---------------------------------------------------
158
-[Cooking]
131
132
* bc/allow-upload-pack-from-other-people (2024-11-15) 1 commit
133
- Allow cloning from repositories owned by another user
@@ -297,10 +269,10 @@ Release tarballs are available at:
269
source: <20241115-pks-clar-build-improvements-v3-0-29672bf65ec6@pks.im>
270
271
300
-* pb/mergetool-errors (2024-11-13) 5 commits
272
+* pb/mergetool-errors (2024-11-25) 5 commits
273
- git-difftool--helper.sh: exit upon initialize_merge_tool errors
274
- git-mergetool--lib.sh: add error message for unknown tool variant
303
- - git-mergetool--lib.sh: add error message in 'setup_user_tool'
275
+ - git-mergetool--lib.sh: add error message if 'setup_user_tool' fails
276
- git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
277
- completion: complete '--tool-help' in 'git mergetool'
278
@@ -308,7 +280,7 @@ Release tarballs are available at:
280
has been improved.
281
282
Will merge to 'next'?
311
- source: <pull.1827.git.1731459128.gitgitgadget@gmail.com>
283
+ source: <pull.1827.v2.git.1732305022.gitgitgadget@gmail.com>
284
285
286
* ps/send-pack-unhide-error-in-atomic-push (2024-11-15) 6 commits
@@ -328,20 +300,21 @@ Release tarballs are available at:
300
301
302
* ps/ref-backend-migration-optim (2024-11-21) 10 commits
331
- - reftable/block: optimize allocations by using scratch buffer
332
- - reftable/block: rename `block_writer::buf` variable
333
- - reftable/writer: optimize allocations by using a scratch buffer
334
- - refs: don't normalize log messages with `REF_SKIP_CREATE_REFLOG`
335
- - refs: skip collision checks in initial transactions
336
- - refs: use "initial" transaction semantics to migrate refs
337
- - refs/files: support symbolic and root refs in initial transaction
338
- - refs: introduce "initial" transaction flag
339
- - refs/files: move logic to commit initial transaction
340
- - refs: allow passing flags when setting up a transaction
303
+ (merged to 'next' on 2024-11-25 at ee2e588790)
304
+ + reftable/block: optimize allocations by using scratch buffer
305
+ + reftable/block: rename `block_writer::buf` variable
306
+ + reftable/writer: optimize allocations by using a scratch buffer
307
+ + refs: don't normalize log messages with `REF_SKIP_CREATE_REFLOG`
308
+ + refs: skip collision checks in initial transactions
309
+ + refs: use "initial" transaction semantics to migrate refs
310
+ + refs/files: support symbolic and root refs in initial transaction
311
+ + refs: introduce "initial" transaction flag
312
+ + refs/files: move logic to commit initial transaction
313
+ + refs: allow passing flags when setting up a transaction
314
315
Optimize migration procedure between two ref backends.
316
344
- Will merge to 'next'.
317
+ Will merge to 'master'.
318
source: <20241120-pks-refs-optimize-migrations-v2-0-a233374b7452@pks.im>
319
320
@@ -412,53 +385,51 @@ Release tarballs are available at:
385
386
387
* ps/leakfixes-part-10 (2024-11-21) 28 commits
415
- - t: remove TEST_PASSES_SANITIZE_LEAK annotations
416
- - test-lib: unconditionally enable leak checking
417
- - t: remove unneeded !SANITIZE_LEAK prerequisites
418
- - t: mark some tests as leak free
419
- - t5601: work around leak sanitizer issue
420
- - git-compat-util: drop now-unused `UNLEAK()` macro
421
- - global: drop `UNLEAK()` annotation
422
- - t/helper: fix leaking commit graph in "read-graph" subcommand
423
- - builtin/branch: fix leaking sorting options
424
- - builtin/init-db: fix leaking directory paths
425
- - builtin/help: fix leaks in `check_git_cmd()`
426
- - help: fix leaking return value from `help_unknown_cmd()`
427
- - help: fix leaking `struct cmdnames`
428
- - help: refactor to not use globals for reading config
429
- - builtin/sparse-checkout: fix leaking sanitized patterns
430
- - split-index: fix memory leak in `move_cache_to_base_index()`
431
- - git: refactor builtin handling to use a `struct strvec`
432
- - git: refactor alias handling to use a `struct strvec`
433
- - strvec: introduce new `strvec_splice()` function
434
- - line-log: fix leak when rewriting commit parents
435
- - bisect: fix various cases where we leak commit list items
436
- - bisect: fix leaking commit list items in `check_merge_base()`
437
- - bisect: fix multiple leaks in `bisect_next_all()`
438
- - bisect: fix leaking `current_bad_oid`
439
- - bisect: fix leaking string in `handle_bad_merge_base()`
440
- - bisect: fix leaking good/bad terms when reading multipe times
441
- - builtin/blame: fix leaking blame entries with `--incremental`
442
- - Merge branch 'ps/leakfixes-part-9' into ps/leakfixes-part-10
388
+ (merged to 'next' on 2024-11-25 at 7284f186b8)
389
+ + t: remove TEST_PASSES_SANITIZE_LEAK annotations
390
+ + test-lib: unconditionally enable leak checking
391
+ + t: remove unneeded !SANITIZE_LEAK prerequisites
392
+ + t: mark some tests as leak free
393
+ + t5601: work around leak sanitizer issue
394
+ + git-compat-util: drop now-unused `UNLEAK()` macro
395
+ + global: drop `UNLEAK()` annotation
396
+ + t/helper: fix leaking commit graph in "read-graph" subcommand
397
+ + builtin/branch: fix leaking sorting options
398
+ + builtin/init-db: fix leaking directory paths
399
+ + builtin/help: fix leaks in `check_git_cmd()`
400
+ + help: fix leaking return value from `help_unknown_cmd()`
401
+ + help: fix leaking `struct cmdnames`
402
+ + help: refactor to not use globals for reading config
403
+ + builtin/sparse-checkout: fix leaking sanitized patterns
404
+ + split-index: fix memory leak in `move_cache_to_base_index()`
405
+ + git: refactor builtin handling to use a `struct strvec`
406
+ + git: refactor alias handling to use a `struct strvec`
407
+ + strvec: introduce new `strvec_splice()` function
408
+ + line-log: fix leak when rewriting commit parents
409
+ + bisect: fix various cases where we leak commit list items
410
+ + bisect: fix leaking commit list items in `check_merge_base()`
411
+ + bisect: fix multiple leaks in `bisect_next_all()`
412
+ + bisect: fix leaking `current_bad_oid`
413
+ + bisect: fix leaking string in `handle_bad_merge_base()`
414
+ + bisect: fix leaking good/bad terms when reading multipe times
415
+ + builtin/blame: fix leaking blame entries with `--incremental`
416
+ + Merge branch 'ps/leakfixes-part-9' into ps/leakfixes-part-10
417
418
Leakfixes.
419
446
- Will merge to 'next'.
420
+ Will merge to 'master'.
421
source: <20241120-b4-pks-leak-fixes-pt10-v3-0-d67f08f45c74@pks.im>
422
423
450
-* kh/sequencer-comment-char (2024-11-13) 3 commits
424
+* kh/sequencer-comment-char (2024-11-25) 3 commits
425
- sequencer: comment commit messages properly
426
- sequencer: comment `--reference` subject line properly
427
- sequencer: comment checked-out branch properly
428
429
The sequencer failed to honor core.commentString in some places.
430
457
- Expecting a reroll to improve tests.
458
- cf. <5ed77fab-678d-4a06-bbd0-ea25462a7562@gmail.com>
459
- cf. <4c623fcf-01dd-4056-80c1-b3c860ab7f87@gmail.com>
460
- cf. <711b59d7-e649-4031-8924-a16fb632b4d4@gmail.com>
461
- source: <cover.1731406513.git.code@khaugsbakk.name>
431
+ Will merge to 'next'?
432
+ source: <cover.1732481200.git.code@khaugsbakk.name>
433
434
435
* ds/full-name-hash (2024-11-04) 7 commits
@@ -519,7 +490,8 @@ Release tarballs are available at:
490
Introduce a new repository extension to prevent older Git versions
491
from mis-interpreting worktrees created with relative paths.
492
522
- Needs review.
493
+ Expecting a reroll.
494
+ cf. <D5SS3P7WQG4F.1I20Z59IDQMD1@pm.me>
495
source: <20241031-wt_relative_options-v4-0-07a3dc0f02a3@pm.me>
496
497
@@ -616,7 +588,7 @@ Release tarballs are available at:
588
source: <cover.1728939687.git.steadmon@google.com>
589
590
619
-* bf/set-head-symref (2024-11-22) 10 commits
591
+* bf/set-head-symref (2024-11-25) 10 commits
592
- fetch set_head: handle mirrored bare repositories
593
- fetch: set remote/HEAD if it does not exist
594
- refs: add create_only option to refs_update_symref_extended
@@ -632,8 +604,8 @@ Release tarballs are available at:
604
missing and discovers what branch the other side points with its
605
HEAD, refs/remotes/$remote/HEAD is updated to point to it.
606
635
- Getting there.
636
- source: <20241121225757.3877852-1-bence@ferdinandy.com>
607
+ Will merge to 'next'?
608
+ source: <20241122123138.66960-1-bence@ferdinandy.com>
609
610
611
* ps/build (2024-11-22) 25 commits
@@ -702,22 +674,23 @@ Release tarballs are available at:
674
675
676
* sj/ref-contents-check (2024-11-21) 9 commits
705
- - ref: add symlink ref content check for files backend
706
- - ref: check whether the target of the symref is a ref
707
- - ref: add basic symref content check for files backend
708
- - ref: add more strict checks for regular refs
709
- - ref: port git-fsck(1) regular refs check for files backend
710
- - ref: support multiple worktrees check for refs
711
- - ref: initialize ref name outside of check functions
712
- - ref: check the full refname instead of basename
713
- - ref: initialize "fsck_ref_report" with zero
677
+ (merged to 'next' on 2024-11-25 at 53e29ae705)
678
+ + ref: add symlink ref content check for files backend
679
+ + ref: check whether the target of the symref is a ref
680
+ + ref: add basic symref content check for files backend
681
+ + ref: add more strict checks for regular refs
682
+ + ref: port git-fsck(1) regular refs check for files backend
683
+ + ref: support multiple worktrees check for refs
684
+ + ref: initialize ref name outside of check functions
685
+ + ref: check the full refname instead of basename
686
+ + ref: initialize "fsck_ref_report" with zero
687
688
"git fsck" learned to issue warnings on "curiously formatted" ref
689
contents that have always been taken valid but something Git
690
wouldn't have written itself (e.g., missing terminating end-of-line
691
after the full object name).
692
720
- Will merge to 'next'.
693
+ Will merge to 'master'.
694
source: <Zz3MON9_9DGD6nsy@ArchLinux>
695
696
@@ -734,7 +707,8 @@ Release tarballs are available at:
707
source: <cover.1729032373.git.steadmon@google.com>
708
709
737
-* kn/the-repository (2024-11-12) 9 commits
710
+* kn/the-repository (2024-11-25) 10 commits
711
+ - packfile.c: remove unnecessary prepare_packed_git() call
712
- midx: add repository to `multi_pack_index` struct
713
- config: make `packed_git_(limit|window_size)` non-global variables
714
- config: make `delta_base_cache_limit` a non-global variable
@@ -749,7 +723,5 @@ Release tarballs are available at:
723
Various implicit uses of 'the_repoository' in the packfile code
724
have been eliminated.
725
752
- Expecting a rework around delta_base_cache_limit.
753
- cf. <Zz5o35FZPFyM5KyL@nand.local>
754
- cf. <CAOLa=ZRVpq7=tRiCrJD-do+PKS-ek3m58bpUm9S7t1oKepiLNQ@mail.gmail.com>
755
- source: <cover.1731323350.git.karthik.188@gmail.com>
726
+ Will merge to 'next'?
727
+ source: <cover.1732269840.git.karthik.188@gmail.com>