What's cooking (2023/10 #02)
Junio C Hamano committed
Oct 4, 2023 at 15:43 UTC
0b985726b77ea25290c3d5f72d6dc22358ab7c7f
1 file changed
+148
-173
whats-cooking.txt
+148
-173
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #01; Mon, 2)
3
-X-master-at: d0e8084c65cbf949038ae4cc344ac2c2efd77415
4
-X-next-at: 2d36e41d1a24beaf57bc0d7146d2b0ae93a5d61b
2
+Subject: What's cooking in git.git (Oct 2023, #02; Wed, 4)
3
+X-master-at: 3a06386e314565108ad56a9bdb8f7b80ac52fb69
4
+X-next-at: 421f12c284626330cb1738d5e5e98c9ede1ec91e
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #01; Mon, 2)
7
+What's cooking in git.git (Oct 2023, #02; Wed, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,141 +48,148 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* ds/stat-name-width-configuration (2023-09-18) 1 commit
52
- (merged to 'next' on 2023-09-22 at dbf5bd96e8)
53
- + diff --stat: add config option to limit filename width
51
+* bb/unicode-width-table-15 (2023-09-25) 1 commit
52
+ (merged to 'next' on 2023-09-28 at bb76f46606)
53
+ + unicode: update the width tables to Unicode 15.1
54
55
- "git diff" learned diff.statNameWidth configuration variable, to
56
- give the default width for the name part in the "--stat" output.
57
- source: <87badb12f040d1c66cd9b89074d3de5015a45983.1694446743.git.dsimic@manjaro.org>
55
+ The display width table for unicode characters has been updated for
56
+ Unicode 15.1
57
+ source: <20230925190704.157731-1-dev+git@drbeat.li>
58
59
60
-* hy/doc-show-is-like-log-not-diff-tree (2023-09-20) 1 commit
61
- (merged to 'next' on 2023-09-22 at 5492c03eae)
62
- + show doc: redirect user to git log manual instead of git diff-tree
60
+* jk/commit-graph-verify-fix (2023-09-28) 6 commits
61
+ (merged to 'next' on 2023-09-28 at e3ed560a2f)
62
+ + commit-graph: report incomplete chains during verification
63
+ + commit-graph: tighten chain size check
64
+ + commit-graph: detect read errors when verifying graph chain
65
+ + t5324: harmonize sha1/sha256 graph chain corruption
66
+ + commit-graph: check mixed generation validation when loading chain file
67
+ + commit-graph: factor out chain opening function
68
64
- Doc update.
65
- source: <20230920132731.1259-1-hanyang.tony@bytedance.com>
69
+ Various fixes to "git commit-graph verify".
70
+ source: <20230928043746.GB57926@coredump.intra.peff.net>
71
72
68
-* jc/alias-completion (2023-09-20) 1 commit
69
- (merged to 'next' on 2023-09-22 at 1d069e900b)
70
- + completion: loosen and document the requirement around completing alias
73
+* ks/ref-filter-mailmap (2023-09-25) 3 commits
74
+ (merged to 'next' on 2023-09-28 at 0d3fd9959a)
75
+ + ref-filter: add mailmap support
76
+ + t/t6300: introduce test_bad_atom
77
+ + t/t6300: cleanup test_atom
78
72
- The command line completion script (in contrib/) can be told to
73
- complete aliases by including ": git <cmd> ;" in the alias to tell
74
- it that the alias should be completed similar to how "git <cmd>" is
75
- completed. The parsing code for the alias as been loosened to
76
- allow ';' without an extra space before it.
77
- cf. <owlyjzssjro2.fsf@fine.c.googlers.com>
78
- source: <xmqqy1h08zsp.fsf_-_@gitster.g>
79
+ "git for-each-ref" and friends learn to apply mailmap to authorname
80
+ and other fields.
81
+ source: <20230925175050.3498-1-five231003@gmail.com>
82
83
81
-* jc/unresolve-removal (2023-07-31) 7 commits
82
- (merged to 'next' on 2023-09-25 at 0563c8d8a1)
83
- + checkout: allow "checkout -m path" to unmerge removed paths
84
- + checkout/restore: add basic tests for --merge
85
- + checkout/restore: refuse unmerging paths unless checking out of the index
86
- + update-index: remove stale fallback code for "--unresolve"
87
- + update-index: use unmerge_index_entry() to support removal
88
- + resolve-undo: allow resurrecting conflicted state that resolved to deletion
89
- + update-index: do not read HEAD and MERGE_HEAD unconditionally
90
- (this branch is used by jc/rerere-cleanup.)
84
+* ps/revision-cmdline-stdin-not (2023-09-25) 1 commit
85
+ (merged to 'next' on 2023-09-28 at a28201e0dd)
86
+ + revision: make pseudo-opt flags read via stdin behave consistently
87
92
- "checkout --merge -- path" and "update-index --unresolve path" did
93
- not resurrect conflicted state that was resolved to remove path,
94
- but now they do.
95
- source: <20230731224409.4181277-1-gitster@pobox.com>
88
+ "git rev-list --stdin" learned to take non-revisions (like "--not")
89
+ recently from the standard input, but the way such a "--not" was
90
+ handled was quite confusing, which has been rethought. This is
91
+ potentially a change that breaks backward compatibility.
92
+ source: <6221acd2796853144f8e84081655fbc79fdc6634.1695646898.git.ps@pks.im>
93
94
98
-* jk/fsmonitor-unused-parameter (2023-09-18) 8 commits
99
- (merged to 'next' on 2023-09-19 at bd06505f9e)
100
- + run-command: mark unused parameters in start_bg_wait callbacks
101
- + fsmonitor: mark unused hashmap callback parameters
102
- + fsmonitor/darwin: mark unused parameters in system callback
103
- + fsmonitor: mark unused parameters in stub functions
104
- + fsmonitor/win32: mark unused parameter in fsm_os__incompatible()
105
- + fsmonitor: mark some maybe-unused parameters
106
- + fsmonitor/win32: drop unused parameters
107
- + fsmonitor: prefer repo_git_path() to git_pathdup()
95
+* xz/commit-title-soft-limit-doc (2023-09-28) 1 commit
96
+ (merged to 'next' on 2023-09-28 at 20df852430)
97
+ + doc: correct the 50 characters soft limit
98
109
- Unused parameters in fsmonitor related code paths have been marked
110
- as such.
111
- source: <20230918222908.GA2659096@coredump.intra.peff.net>
99
+ Doc tweak.
100
+ source: <pull.1580.git.git.1695895155985.gitgitgadget@gmail.com>
101
102
+--------------------------------------------------
103
+[New Topics]
104
114
-* jk/test-pass-ubsan-options-to-http-test (2023-09-21) 1 commit
115
- (merged to 'next' on 2023-09-22 at bbe2f75937)
116
- + test-lib: set UBSAN_OPTIONS to match ASan
105
+* jk/commit-graph-leak-fixes (2023-10-03) 10 commits
106
+ - commit-graph: clear oidset after finishing write
107
+ - commit-graph: free write-context base_graph_name during cleanup
108
+ - commit-graph: free write-context entries before overwriting
109
+ - commit-graph: free graph struct that was not added to chain
110
+ - commit-graph: delay base_graph assignment in add_graph_to_chain()
111
+ - commit-graph: free all elements of graph chain
112
+ - commit-graph: move slab-clearing to close_commit_graph()
113
+ - merge: free result of repo_get_merge_bases()
114
+ - commit-reach: free temporary list in get_octopus_merge_bases()
115
+ - t6700: mark test as leak-free
116
118
- UBSAN options were not propagated through the test framework to git
119
- run via the httpd, unlike ASAN options, which has been corrected.
120
- source: <20230921041825.GA2814583@coredump.intra.peff.net>
117
+ Leakfix.
118
+ source: <20231003202504.GA7697@coredump.intra.peff.net>
119
120
123
-* js/doc-status-with-submodules-mark-up-fix (2023-09-22) 1 commit
124
- (merged to 'next' on 2023-09-25 at 7ed318fc91)
125
- + Documentation/git-status: add missing line breaks
121
+* jm/git-status-submodule-states-docfix (2023-10-04) 1 commit
122
+ (merged to 'next' on 2023-10-04 at 520b7711a4)
123
+ + git-status.txt: fix minor asciidoc format issue
124
125
Docfix.
128
- source: <pull.1590.git.1695392082207.gitgitgadget@gmail.com>
126
127
+ Will merge to 'master'.
128
+ source: <pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com>
129
131
-* kh/range-diff-notes (2023-09-19) 1 commit
132
- (merged to 'next' on 2023-09-22 at ac04978b4b)
133
- + range-diff: treat notes like `log`
130
135
- "git range-diff --notes=foo" compared "log --notes=foo --notes" of
136
- the two ranges, instead of using just the specified notes tree.
137
- source: <6e114271a2e7d2323193bd58bb307f60101942ce.1695154855.git.code@khaugsbakk.name>
131
+* rs/parse-opt-ctx-cleanup (2023-10-03) 1 commit
132
+ (merged to 'next' on 2023-10-04 at d5d0a2ce3b)
133
+ + parse-options: drop unused parse_opt_ctx_t member
134
135
+ Code clean-up.
136
140
-* ml/git-gui-exec-path-fix (2023-09-18) 3 commits
141
- (merged to 'next' on 2023-09-19 at 0565b0b14b)
142
- + Merge git-gui into ml/git-gui-exec-path-fix
143
- + git-gui - use git-hook, honor core.hooksPath
144
- + git-gui - re-enable use of hook scripts
137
+ Will merge to 'master'.
138
+ source: <ebcaa9e1-d306-4c93-adec-3f35d7040531@web.de>
139
146
- Fix recent regression in Git-GUI that fails to run hook scripts at
147
- all.
140
141
+* tb/repack-max-cruft-size (2023-10-03) 4 commits
142
+ - builtin/repack.c: avoid making cruft packs preferred
143
+ - builtin/repack.c: implement support for `--max-cruft-size`
144
+ - builtin/repack.c: parse `--max-pack-size` with OPT_MAGNITUDE
145
+ - t7700: split cruft-related tests to t7704
146
150
-* ob/am-msgfix (2023-09-21) 1 commit
151
- (merged to 'next' on 2023-09-22 at 7f7589a06a)
152
- + am: fix error message in parse_opt_show_current_patch()
147
+ "git repack" learned "--max-cruft-size" to prevent cruft packs from
148
+ growing without bounds.
149
154
- The parameters to generate an error message have been corrected.
155
- source: <20230921110727.789156-1-oswald.buddenhagen@gmx.de>
150
+ Will merge to 'next'?
151
+ source: <cover.1696293862.git.me@ttaylorr.com>
152
157
---------------------------------------------------
158
-[New Topics]
153
160
-* cw/prelim-cleanup (2023-09-29) 4 commits
161
- - parse: separate out parsing functions from config.h
162
- - config: correct bad boolean env value error message
163
- - wrapper: reduce scope of remove_or_warn()
164
- - hex-ll: separate out non-hash-algo functions
154
+* ak/color-decorate-symbols (2023-10-03) 1 commit
155
+ - decorate: add color.decorate.symbols config option
156
166
- Shuffle some bits across headers and sources to prepare for
167
- libification effort.
157
+ A new config for coloring.
158
169
- Will merge to 'next'.
170
- source: <cover.1696021277.git.jonathantanmy@google.com>
159
+ Needs review.
160
+ source: <20231003205442.22963-1-andy.koppe@gmail.com>
161
162
173
-* ds/init-diffstat-width (2023-09-29) 1 commit
174
- - diff --stat: set the width defaults in a helper function
163
+* jc/attr-tree-config (2023-10-04) 2 commits
164
+ - attr: add attr.allowInvalidSource config to allow invalid revision
165
+ - attr: add attr.tree for setting the treeish to read attributes from
166
176
- Code clean-up.
167
+ The attribute subsystem learned to honor `attr.tree` configuration
168
+ that specifies which tree to read the .gitattributes files from.
169
178
- Will merge to 'next'.
179
- source: <d45d1dac1a20699e370905b88b6fd0ec296751e7.1695441501.git.dsimic@manjaro.org>
170
+ Needs review.
171
+ source: <pull.1577.v2.git.git.1696443502.gitgitgadget@gmail.com>
172
173
182
-* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
183
- - diff: fix --merge-base with annotated tags
174
+* js/submodule-fix-misuse-of-path-and-name (2023-10-03) 6 commits
175
+ - t7420: test that we correctly handle renamed submodules
176
+ - t7419: test that we correctly handle renamed submodules
177
+ - t7419, t7420: use test_cmp_config instead of grepping .gitmodules
178
+ - t7419: actually test the branch switching
179
+ - submodule--helper: return error from set-url when modifying failed
180
+ - submodule--helper: use submodule_from_path in set-{url,branch}
181
185
- source: <20231001151845.3621551-1-hi@alyssa.is>
182
+ In .gitmodules files, submodules are keyed by their names, and the
183
+ path to the submodule whose name is $name is specified by the
184
+ submodule.$name.path variable. There were a few codepaths that
185
+ mixed the name and path up when consulting the submodule database,
186
+ which have been corrected. It took long for these bugs to be found
187
+ as the name of a submodule initially is the same as its path, and
188
+ the problem does not surface until it is moved to a different path,
189
+ which apparently happens very rarely.
190
+
191
+ Will merge to 'next'?
192
+ source: <0a0a157f88321d25fdb0be771a454b3410a449f3.camel@archlinux.org>
193
194
--------------------------------------------------
195
[Stalled]
@@ -214,15 +221,34 @@ Release tarballs are available at:
221
--------------------------------------------------
222
[Cooking]
223
217
-* bb/unicode-width-table-15 (2023-09-25) 1 commit
218
- (merged to 'next' on 2023-09-28 at bb76f46606)
219
- + unicode: update the width tables to Unicode 15.1
224
+* cw/prelim-cleanup (2023-09-29) 4 commits
225
+ (merged to 'next' on 2023-10-03 at 5985929612)
226
+ + parse: separate out parsing functions from config.h
227
+ + config: correct bad boolean env value error message
228
+ + wrapper: reduce scope of remove_or_warn()
229
+ + hex-ll: separate out non-hash-algo functions
230
221
- The display width table for unicode characters has been updated for
222
- Unicode 15.1
231
+ Shuffle some bits across headers and sources to prepare for
232
+ libification effort.
233
234
Will merge to 'master'.
225
- source: <20230925190704.157731-1-dev+git@drbeat.li>
235
+ source: <cover.1696021277.git.jonathantanmy@google.com>
236
+
237
+
238
+* ds/init-diffstat-width (2023-09-29) 1 commit
239
+ (merged to 'next' on 2023-10-03 at 18383ac895)
240
+ + diff --stat: set the width defaults in a helper function
241
+
242
+ Code clean-up.
243
+
244
+ Will merge to 'master'.
245
+ source: <d45d1dac1a20699e370905b88b6fd0ec296751e7.1695441501.git.dsimic@manjaro.org>
246
+
247
+
248
+* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
249
+ - diff: fix --merge-base with annotated tags
250
+
251
+ source: <20231001151845.3621551-1-hi@alyssa.is>
252
253
254
* eb/limit-bulk-checkin-to-blobs (2023-09-26) 1 commit
@@ -237,21 +263,6 @@ Release tarballs are available at:
263
source: <87msx99b9o.fsf_-_@gmail.froward.int.ebiederm.org>
264
265
240
-* jk/commit-graph-verify-fix (2023-09-28) 6 commits
241
- (merged to 'next' on 2023-09-28 at e3ed560a2f)
242
- + commit-graph: report incomplete chains during verification
243
- + commit-graph: tighten chain size check
244
- + commit-graph: detect read errors when verifying graph chain
245
- + t5324: harmonize sha1/sha256 graph chain corruption
246
- + commit-graph: check mixed generation validation when loading chain file
247
- + commit-graph: factor out chain opening function
248
-
249
- Various fixes to "git commit-graph verify".
250
-
251
- Will merge to 'master'.
252
- source: <20230928043746.GB57926@coredump.intra.peff.net>
253
-
254
-
266
* js/update-urls-in-doc-and-comment (2023-09-26) 4 commits
267
- doc: refer to internet archive
268
- doc: update links for andre-simon.de
@@ -316,30 +327,19 @@ Release tarballs are available at:
327
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
328
329
319
-* xz/commit-title-soft-limit-doc (2023-09-28) 1 commit
320
- (merged to 'next' on 2023-09-28 at 20df852430)
321
- + doc: correct the 50 characters soft limit
322
-
323
- Doc tweak.
324
-
325
- Will merge to 'master'.
326
- source: <pull.1580.git.git.1695895155985.gitgitgadget@gmail.com>
327
-
328
-
329
-* jx/remote-archive-over-smart-http (2023-09-25) 3 commits
330
+* jx/remote-archive-over-smart-http (2023-10-04) 4 commits
331
- archive: support remote archive from stateless transport
331
- - transport-helper: run do_take_over in connect_helper
332
+ - transport-helper: call do_take_over() in connect_helper
333
+ - transport-helper: call do_take_over() in process_connect
334
- transport-helper: no connection restriction in connect_helper
335
336
"git archive --remote=<remote>" learned to talk over the smart
337
http (aka stateless) transport.
338
337
- Expecting a reroll.
338
- cf. <CANYiYbFkG+CvrNFBkdNewZs7ADROVsjd051SDQsU0zVq8eBhew@mail.gmail.com>
339
- source: <20230923152201.14741-1-worldhello.net@gmail.com>
339
+ source: <cover.1696432593.git.zhiyou.jx@alibaba-inc.com>
340
341
342
-* jx/sideband-chomp-newline-fix (2023-09-25) 3 commits
342
+* jx/sideband-chomp-newline-fix (2023-10-04) 3 commits
343
- pkt-line: do not chomp newlines for sideband messages
344
- pkt-line: memorize sideband fragment in reader
345
- test-pkt-line: add option parser for unpack-sideband
@@ -347,33 +347,7 @@ Release tarballs are available at:
347
Sideband demultiplexer fixes.
348
349
Needs review.
350
- source: <CANYiYbF+Xmk4rCNLMJe+i_CFafg8=QU5vbXWNUZbOVsDLTe5QQ@mail.gmail.com>
351
-
352
-
353
-* ks/ref-filter-mailmap (2023-09-25) 3 commits
354
- (merged to 'next' on 2023-09-28 at 0d3fd9959a)
355
- + ref-filter: add mailmap support
356
- + t/t6300: introduce test_bad_atom
357
- + t/t6300: cleanup test_atom
358
-
359
- "git for-each-ref" and friends learn to apply mailmap to authorname
360
- and other fields.
361
-
362
- Will merge to 'master'.
363
- source: <20230925175050.3498-1-five231003@gmail.com>
364
-
365
-
366
-* ps/revision-cmdline-stdin-not (2023-09-25) 1 commit
367
- (merged to 'next' on 2023-09-28 at a28201e0dd)
368
- + revision: make pseudo-opt flags read via stdin behave consistently
369
-
370
- "git rev-list --stdin" learned to take non-revisions (like "--not")
371
- recently from the standard input, but the way such a "--not" was
372
- handled was quite confusing, which has been rethought. This is
373
- potentially a change that breaks backward compatibility.
374
-
375
- Will merge to 'master'.
376
- source: <6221acd2796853144f8e84081655fbc79fdc6634.1695646898.git.ps@pks.im>
350
+ source: <cover.1696425168.git.zhiyou.jx@alibaba-inc.com>
351
352
353
* ty/merge-tree-strategy-options (2023-09-25) 1 commit
@@ -460,20 +434,21 @@ Release tarballs are available at:
434
435
436
* cc/repack-sift-filtered-objects-to-separate-pack (2023-10-02) 9 commits
463
- - gc: add `gc.repackFilterTo` config option
464
- - repack: implement `--filter-to` for storing filtered out objects
465
- - gc: add `gc.repackFilter` config option
466
- - repack: add `--filter=<filter-spec>` option
467
- - pack-bitmap-write: rebuild using new bitmap when remapping
468
- - repack: refactor finding pack prefix
469
- - repack: refactor finishing pack-objects command
470
- - t/helper: add 'find-pack' test-tool
471
- - pack-objects: allow `--filter` without `--stdout`
437
+ (merged to 'next' on 2023-10-03 at e5a4824609)
438
+ + gc: add `gc.repackFilterTo` config option
439
+ + repack: implement `--filter-to` for storing filtered out objects
440
+ + gc: add `gc.repackFilter` config option
441
+ + repack: add `--filter=<filter-spec>` option
442
+ + pack-bitmap-write: rebuild using new bitmap when remapping
443
+ + repack: refactor finding pack prefix
444
+ + repack: refactor finishing pack-objects command
445
+ + t/helper: add 'find-pack' test-tool
446
+ + pack-objects: allow `--filter` without `--stdout`
447
448
"git repack" machinery learns to pay attention to the "--filter="
449
option.
450
476
- Will merge to 'next'.
451
+ Will merge to 'master'.
452
cf. <ZRsknb4NxNHTR21E@nand.local>
453
source: <20231002165504.1325153-1-christian.couder@gmail.com>
454