What's cooking (2023/10 #06)
Junio C Hamano committed
Oct 14, 2023 at 09:09 UTC
6387d821baefcef600f30633e0160a74a948cc64
1 file changed
+160
-156
whats-cooking.txt
+160
-156
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #05; Thu, 12)
3
-X-master-at: 59167d7d09fd7a1d64aa1d5be73bc484f6621894
4
-X-next-at: aed0368e0ec22719bf8aa6dece549de780395f82
2
+Subject: What's cooking in git.git (Oct 2023, #06; Fri, 13)
3
+X-master-at: a9ecda2788e229afc9b611acaa26d0d9d4da53ed
4
+X-next-at: e4580a1d7b1178eb1559367d74fe1eac208e14bb
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #05; Thu, 12)
7
+What's cooking in git.git (Oct 2023, #06; Fri, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -51,88 +51,136 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
54
-* jm/git-status-submodule-states-docfix (2023-10-04) 1 commit
55
- (merged to 'next' on 2023-10-04 at 520b7711a4)
56
- + git-status.txt: fix minor asciidoc format issue
54
+* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
55
+ (merged to 'next' on 2023-10-06 at 0ff4dfc0e1)
56
+ + diff: fix --merge-base with annotated tags
57
58
- Docfix.
59
- source: <pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com>
58
+ "git diff --merge-base X other args..." insisted that X must be a
59
+ commit and errored out when given an annotated tag that peels to a
60
+ commit, but we only need it to be a committish. This has been
61
+ corrected.
62
+ source: <20231001151845.3621551-1-hi@alyssa.is>
63
64
62
-* js/ci-coverity (2023-10-05) 6 commits
63
- (merged to 'next' on 2023-10-05 at 253788f0d1)
64
- + coverity: detect and report when the token or project is incorrect
65
- + coverity: allow running on macOS
66
- + coverity: support building on Windows
67
- + coverity: allow overriding the Coverity project
68
- + coverity: cache the Coverity Build Tool
69
- + ci: add a GitHub workflow to submit Coverity scans
65
+* ds/mailmap-entry-update (2023-10-12) 1 commit
66
+ (merged to 'next' on 2023-10-12 at 3de300ac62)
67
+ + mailmap: change primary address for Derrick Stolee
68
71
- GitHub CI workflow has learned to trigger Coverity check.
72
- source: <pull.1588.v2.git.1695642662.gitgitgadget@gmail.com>
69
+ Update mailmap entry for Derrick.
70
71
+ Will merge to 'master' immediately.
72
+ source: <pull.1592.git.1697131834003.gitgitgadget@gmail.com>
73
75
-* rs/parse-opt-ctx-cleanup (2023-10-03) 1 commit
76
- (merged to 'next' on 2023-10-04 at d5d0a2ce3b)
77
- + parse-options: drop unused parse_opt_ctx_t member
74
79
- Code clean-up.
80
- source: <ebcaa9e1-d306-4c93-adec-3f35d7040531@web.de>
75
+* jk/commit-graph-leak-fixes (2023-10-03) 10 commits
76
+ (merged to 'next' on 2023-10-06 at 5d202ef8b9)
77
+ + commit-graph: clear oidset after finishing write
78
+ + commit-graph: free write-context base_graph_name during cleanup
79
+ + commit-graph: free write-context entries before overwriting
80
+ + commit-graph: free graph struct that was not added to chain
81
+ + commit-graph: delay base_graph assignment in add_graph_to_chain()
82
+ + commit-graph: free all elements of graph chain
83
+ + commit-graph: move slab-clearing to close_commit_graph()
84
+ + merge: free result of repo_get_merge_bases()
85
+ + commit-reach: free temporary list in get_octopus_merge_bases()
86
+ + t6700: mark test as leak-free
87
82
---------------------------------------------------
83
-[New Topics]
88
+ Leakfix.
89
+ source: <20231003202504.GA7697@coredump.intra.peff.net>
90
85
-* jc/fail-stash-to-store-non-stash (2023-10-11) 1 commit
86
- - stash: be careful what we store
91
88
- Feeding "git stash store" with a random commit that was not created
89
- by "git stash create" now errors out.
92
+* jk/decoration-and-other-leak-fixes (2023-10-05) 3 commits
93
+ (merged to 'next' on 2023-10-06 at 5fc05c94dc)
94
+ + daemon: free listen_addr before returning
95
+ + revision: clear decoration structs during release_revisions()
96
+ + decorate: add clear_decoration() function
97
91
- Will merge to 'next'?
92
- source: <xmqqbkd4lwj0.fsf_-_@gitster.g>
98
+ Leakfix.
99
+ source: <20231005212802.GA982892@coredump.intra.peff.net>
100
101
95
-* jc/doc-unit-tests-fixup (2023-10-11) 1 commit
96
- - SQUASH???
97
- (this branch uses js/doc-unit-tests and js/doc-unit-tests-with-cmake.)
102
+* js/submodule-fix-misuse-of-path-and-name (2023-10-03) 6 commits
103
+ (merged to 'next' on 2023-10-06 at 1054b6e752)
104
+ + t7420: test that we correctly handle renamed submodules
105
+ + t7419: test that we correctly handle renamed submodules
106
+ + t7419, t7420: use test_cmp_config instead of grepping .gitmodules
107
+ + t7419: actually test the branch switching
108
+ + submodule--helper: return error from set-url when modifying failed
109
+ + submodule--helper: use submodule_from_path in set-{url,branch}
110
99
- Quick fix for jc/doc-unit-tests topic to unbreak CI running on 'seen'.
100
- source: <xmqqwmvskf8t.fsf@gitster.g>
111
+ In .gitmodules files, submodules are keyed by their names, and the
112
+ path to the submodule whose name is $name is specified by the
113
+ submodule.$name.path variable. There were a few codepaths that
114
+ mixed the name and path up when consulting the submodule database,
115
+ which have been corrected. It took long for these bugs to be found
116
+ as the name of a submodule initially is the same as its path, and
117
+ the problem does not surface until it is moved to a different path,
118
+ which apparently happens very rarely.
119
+ source: <0a0a157f88321d25fdb0be771a454b3410a449f3.camel@archlinux.org>
120
121
103
-* bc/racy-4gb-files (2023-10-12) 2 commits
104
- - Prevent git from rehashing 4GiB files
105
- - t: add a test helper to truncate files
122
+* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
123
+ (merged to 'next' on 2023-10-06 at 69fef35819)
124
+ + trailer doc: <token> is a <key> or <keyAlias>, not both
125
+ + trailer doc: separator within key suppresses default separator
126
+ + trailer doc: emphasize the effect of configuration variables
127
+ + trailer --unfold help: prefer "reformat" over "join"
128
+ + trailer --parse docs: add explanation for its usefulness
129
+ + trailer --only-input: prefer "configuration variables" over "rules"
130
+ + trailer --parse help: expose aliased options
131
+ + trailer --no-divider help: describe usual "---" meaning
132
+ + trailer: trailer location is a place, not an action
133
+ + trailer doc: narrow down scope of --where and related flags
134
+ + trailer: add tests to check defaulting behavior with --no-* flags
135
+ + trailer test description: this tests --where=after, not --where=before
136
+ + trailer tests: make test cases self-contained
137
107
- The index file has room only for lower 32-bit of the file size in
108
- the cached stat information, which means cached stat information
109
- will have 0 in its sd_size member for a file whose size is multiple
110
- of 4GiB. This is mistaken for a racily clean path. Avoid it by
111
- storing a bogus sd_size value instead for such files.
138
+ Test coverage for trailers has been improved.
139
+ source: <pull.1564.v3.git.1694125209.gitgitgadget@gmail.com>
140
113
- Waiting for review response.
114
- source: <20231012160930.330618-1-sandals@crustytoothpaste.net>
141
+--------------------------------------------------
142
+[New Topics]
143
144
+* tb/format-pack-doc-update (2023-10-12) 2 commits
145
+ - Documentation/gitformat-pack.txt: fix incorrect MIDX documentation
146
+ - Documentation/gitformat-pack.txt: fix typo
147
117
-* ds/mailmap-entry-update (2023-10-12) 1 commit
118
- (merged to 'next' on 2023-10-12 at 3de300ac62)
119
- + mailmap: change primary address for Derrick Stolee
148
+ Doc update.
149
121
- Update mailmap entry for Derrick.
150
+ Expecting a reroll.
151
+ cf. <xmqq5y3b4id2.fsf@gitster.g>
152
+ source: <cover.1697144959.git.me@ttaylorr.com>
153
123
- Will merge to 'master' immediately.
124
- source: <pull.1592.git.1697131834003.gitgitgadget@gmail.com>
154
155
+* ps/do-not-trust-commit-graph-blindly-for-existence (2023-10-13) 1 commit
156
+ - commit: detect commits that exist in commit-graph but not in the ODB
157
+ (this branch is used by kn/rev-list-missing-fix.)
158
127
-* jc/grep-f-relative-to-cwd (2023-10-12) 1 commit
128
- - grep: -f <path> is relative to $cwd
159
+ The codepath to traverse the commit-graph learned to notice that a
160
+ commit is missing (e.g., corrupt repository lost an object), even
161
+ though it knows something about the commit (like its parents) from
162
+ what is in commit-graph.
163
130
- "cd sub && git grep -f patterns" tried to read "patterns" file at
131
- the top level of the working tree; it has been corrected to read
132
- "sub/patterns" instead.
164
+ Comments?
165
+ source: <b0bf576c51a706367a758b8e30eca37edb9c2734.1697200576.git.ps@pks.im>
166
134
- Needs review.
135
- source: <xmqqedhzg37z.fsf@gitster.g>
167
+
168
+* tb/pair-chunk-expect-size (2023-10-13) 8 commits
169
+ - midx: read `OOFF` chunk with `pair_chunk_expect()`
170
+ - midx: read `OIDL` chunk with `pair_chunk_expect()`
171
+ - midx: read `OIDF` chunk with `pair_chunk_expect()`
172
+ - commit-graph: read `BIDX` chunk with `pair_chunk_expect()`
173
+ - commit-graph: read `GDAT` chunk with `pair_chunk_expect()`
174
+ - commit-graph: read `CDAT` chunk with `pair_chunk_expect()`
175
+ - commit-graph: read `OIDF` chunk with `pair_chunk_expect()`
176
+ - chunk-format: introduce `pair_chunk_expect()` helper
177
+ (this branch uses jk/chunk-bounds.)
178
+
179
+ Code clean-up for jk/chunk-bounds topic.
180
+
181
+ Comments?
182
+ source: <45cac29403e63483951f7766c6da3c022c68d9f0.1697225110.git.me@ttaylorr.com>
183
+ source: <cover.1697225110.git.me@ttaylorr.com>
184
185
--------------------------------------------------
186
[Stalled]
@@ -179,6 +227,49 @@ Release tarballs are available at:
227
--------------------------------------------------
228
[Cooking]
229
230
+* jc/fail-stash-to-store-non-stash (2023-10-11) 1 commit
231
+ - stash: be careful what we store
232
+
233
+ Feeding "git stash store" with a random commit that was not created
234
+ by "git stash create" now errors out.
235
+
236
+ Will merge to 'next'?
237
+ source: <xmqqbkd4lwj0.fsf_-_@gitster.g>
238
+
239
+
240
+* jc/doc-unit-tests-fixup (2023-10-11) 1 commit
241
+ - SQUASH???
242
+ (this branch uses js/doc-unit-tests and js/doc-unit-tests-with-cmake.)
243
+
244
+ Quick fix for jc/doc-unit-tests topic to unbreak CI running on 'seen'.
245
+ source: <xmqqwmvskf8t.fsf@gitster.g>
246
+
247
+
248
+* bc/racy-4gb-files (2023-10-13) 2 commits
249
+ - Prevent git from rehashing 4GiB files
250
+ - t: add a test helper to truncate files
251
+
252
+ The index file has room only for lower 32-bit of the file size in
253
+ the cached stat information, which means cached stat information
254
+ will have 0 in its sd_size member for a file whose size is multiple
255
+ of 4GiB. This is mistaken for a racily clean path. Avoid it by
256
+ storing a bogus sd_size value instead for such files.
257
+
258
+ Will merge to 'next'?
259
+ source: <20231012160930.330618-1-sandals@crustytoothpaste.net>
260
+
261
+
262
+* jc/grep-f-relative-to-cwd (2023-10-12) 1 commit
263
+ - grep: -f <path> is relative to $cwd
264
+
265
+ "cd sub && git grep -f patterns" tried to read "patterns" file at
266
+ the top level of the working tree; it has been corrected to read
267
+ "sub/patterns" instead.
268
+
269
+ Needs review.
270
+ source: <xmqqedhzg37z.fsf@gitster.g>
271
+
272
+
273
* tb/path-filter-fix (2023-10-10) 17 commits
274
- bloom: introduce `deinit_bloom_filters()`
275
- commit-graph: reuse existing Bloom filters where possible
@@ -251,17 +342,17 @@ Release tarballs are available at:
342
source: <pull.1595.git.1696747527.gitgitgadget@gmail.com>
343
344
254
-* kn/rev-list-missing-fix (2023-10-09) 3 commits
255
- . rev-list: add commit object support in `--missing` option
256
- . rev-list: move `show_commit()` to the bottom
257
- . revision: rename bit to `do_not_die_on_missing_objects`
345
+* kn/rev-list-missing-fix (2023-10-13) 4 commits
346
+ - rev-list: add commit object support in `--missing` option
347
+ - rev-list: move `show_commit()` to the bottom
348
+ - revision: rename bit to `do_not_die_on_missing_objects`
349
+ - Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
350
+ (this branch uses ps/do-not-trust-commit-graph-blindly-for-existence.)
351
352
"git rev-list --missing" did not work for missing commit objects,
353
which has been corrected.
354
355
Needs review.
263
- Seems to break CI job with extra environment settings.
264
- cf. <xmqqil7etndo.fsf@gitster.g>
356
source: <20231009105528.17777-1-karthik.188@gmail.com>
357
358
@@ -307,6 +398,7 @@ Release tarballs are available at:
398
+ midx: stop ignoring malformed oid fanout chunk
399
+ t: add library for munging chunk-format files
400
+ chunk-format: note that pair_chunk() is unsafe
401
+ (this branch is used by tb/pair-chunk-expect-size.)
402
403
The codepaths that read "chunk" formatted files have been corrected
404
to pay attention to the chunk size and notice broken files.
@@ -336,18 +428,6 @@ Release tarballs are available at:
428
source: <pull.1583.v3.git.git.1696857660374.gitgitgadget@gmail.com>
429
430
339
-* jk/decoration-and-other-leak-fixes (2023-10-05) 3 commits
340
- (merged to 'next' on 2023-10-06 at 5fc05c94dc)
341
- + daemon: free listen_addr before returning
342
- + revision: clear decoration structs during release_revisions()
343
- + decorate: add clear_decoration() function
344
-
345
- Leakfix.
346
-
347
- Will merge to 'master'.
348
- source: <20231005212802.GA982892@coredump.intra.peff.net>
349
-
350
-
431
* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
432
- t/README: fix multi-prerequisite example
433
- doc/gitk: s/sticked/stuck/
@@ -420,25 +500,6 @@ Release tarballs are available at:
500
source: <20231010123847.2777056-1-christian.couder@gmail.com>
501
502
423
-* jk/commit-graph-leak-fixes (2023-10-03) 10 commits
424
- (merged to 'next' on 2023-10-06 at 5d202ef8b9)
425
- + commit-graph: clear oidset after finishing write
426
- + commit-graph: free write-context base_graph_name during cleanup
427
- + commit-graph: free write-context entries before overwriting
428
- + commit-graph: free graph struct that was not added to chain
429
- + commit-graph: delay base_graph assignment in add_graph_to_chain()
430
- + commit-graph: free all elements of graph chain
431
- + commit-graph: move slab-clearing to close_commit_graph()
432
- + merge: free result of repo_get_merge_bases()
433
- + commit-reach: free temporary list in get_octopus_merge_bases()
434
- + t6700: mark test as leak-free
435
-
436
- Leakfix.
437
-
438
- Will merge to 'master'.
439
- source: <20231003202504.GA7697@coredump.intra.peff.net>
440
-
441
-
503
* tb/repack-max-cruft-size (2023-10-09) 5 commits
504
(merged to 'next' on 2023-10-09 at 38f039e880)
505
+ repack: free existing_cruft array after use
@@ -466,7 +527,7 @@ Release tarballs are available at:
527
source: <20231003205442.22963-1-andy.koppe@gmail.com>
528
529
469
-* jc/attr-tree-config (2023-10-11) 2 commits
530
+* jc/attr-tree-config (2023-10-13) 2 commits
531
- attr: add attr.tree for setting the treeish to read attributes from
532
- attr: read attributes from HEAD when bare repo
533
@@ -474,42 +535,7 @@ Release tarballs are available at:
535
that specifies which tree to read the .gitattributes files from.
536
537
Will merge to 'next'?
477
- source: <pull.1577.v4.git.git.1697044422.gitgitgadget@gmail.com>
478
-
479
-
480
-* js/submodule-fix-misuse-of-path-and-name (2023-10-03) 6 commits
481
- (merged to 'next' on 2023-10-06 at 1054b6e752)
482
- + t7420: test that we correctly handle renamed submodules
483
- + t7419: test that we correctly handle renamed submodules
484
- + t7419, t7420: use test_cmp_config instead of grepping .gitmodules
485
- + t7419: actually test the branch switching
486
- + submodule--helper: return error from set-url when modifying failed
487
- + submodule--helper: use submodule_from_path in set-{url,branch}
488
-
489
- In .gitmodules files, submodules are keyed by their names, and the
490
- path to the submodule whose name is $name is specified by the
491
- submodule.$name.path variable. There were a few codepaths that
492
- mixed the name and path up when consulting the submodule database,
493
- which have been corrected. It took long for these bugs to be found
494
- as the name of a submodule initially is the same as its path, and
495
- the problem does not surface until it is moved to a different path,
496
- which apparently happens very rarely.
497
-
498
- Will merge to 'master'.
499
- source: <0a0a157f88321d25fdb0be771a454b3410a449f3.camel@archlinux.org>
500
-
501
-
502
-* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
503
- (merged to 'next' on 2023-10-06 at 0ff4dfc0e1)
504
- + diff: fix --merge-base with annotated tags
505
-
506
- "git diff --merge-base X other args..." insisted that X must be a
507
- commit and errored out when given an annotated tag that peels to a
508
- commit, but we only need it to be a committish. This has been
509
- corrected.
510
-
511
- Will merge to 'master'.
512
- source: <20231001151845.3621551-1-hi@alyssa.is>
538
+ source: <pull.1577.v5.git.git.1697218770.gitgitgadget@gmail.com>
539
540
541
* js/update-urls-in-doc-and-comment (2023-09-26) 4 commits
@@ -649,28 +675,6 @@ Release tarballs are available at:
675
source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>
676
677
652
-* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
653
- (merged to 'next' on 2023-10-06 at 69fef35819)
654
- + trailer doc: <token> is a <key> or <keyAlias>, not both
655
- + trailer doc: separator within key suppresses default separator
656
- + trailer doc: emphasize the effect of configuration variables
657
- + trailer --unfold help: prefer "reformat" over "join"
658
- + trailer --parse docs: add explanation for its usefulness
659
- + trailer --only-input: prefer "configuration variables" over "rules"
660
- + trailer --parse help: expose aliased options
661
- + trailer --no-divider help: describe usual "---" meaning
662
- + trailer: trailer location is a place, not an action
663
- + trailer doc: narrow down scope of --where and related flags
664
- + trailer: add tests to check defaulting behavior with --no-* flags
665
- + trailer test description: this tests --where=after, not --where=before
666
- + trailer tests: make test cases self-contained
667
-
668
- Test coverage for trailers has been improved.
669
-
670
- Will merge to 'master'.
671
- source: <pull.1564.v3.git.1694125209.gitgitgadget@gmail.com>
672
-
673
-
678
* js/doc-unit-tests (2023-10-09) 3 commits
679
- ci: run unit tests in CI
680
- unit tests: add TAP unit test framework