What's cooking (2023/04 #05)
Junio C Hamano committed
Apr 17, 2023 at 22:07 UTC
f8afeb1787c57ae24bbecf512b05d2ffe094b2d4
1 file changed
+185
-160
whats-cooking.txt
+185
-160
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #04; Fri, 14)
3
-X-master-at: 9857273be005833c71e2d16ba48e193113e12276
4
-X-next-at: 2798986c608c3adb1834690c0b9fd90882561004
2
+Subject: What's cooking in git.git (Apr 2023, #05; Mon, 17)
3
+X-master-at: 667fcf4e15379790f0b609d6a83d578e69f20301
4
+X-next-at: b7802c66730735cf148f99daaa090bc171a7f8cd
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #04; Fri, 14)
7
+What's cooking in git.git (Apr 2023, #05; Mon, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -44,9 +44,169 @@ Release tarballs are available at:
44
45
https://www.kernel.org/pub/software/scm/git/
46
47
+--------------------------------------------------
48
+[Graduated to 'master']
49
+
50
+* cm/branch-delete-error-message-update (2023-04-06) 1 commit
51
+ (merged to 'next' on 2023-04-10 at 09c987c822)
52
+ + branch: improve error log on branch not found by checking remotes refs
53
+
54
+ "git branch -d origin/master" would say "no such branch", but it is
55
+ likely a missed "-r" if refs/remotes/origin/master exists. The
56
+ command has been taught to give such a hint in its error message.
57
+ source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
58
+
59
+
60
+* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
61
+ (merged to 'next' on 2023-04-10 at f08eab44f2)
62
+ + doc: asciidoc: remove custom header macro
63
+ (this branch is used by fc/doc-use-datestamp-in-commit.)
64
+
65
+ Doc toolchain update to remove old workaround for AsciiDoc.
66
+ source: <20230323221523.52472-1-felipe.contreras@gmail.com>
67
+
68
+
69
+* la/mfc-markup-fix (2023-04-06) 1 commit
70
+ (merged to 'next' on 2023-04-10 at 05415e1c90)
71
+ + MyFirstContribution: render literal *
72
+
73
+ Documentation mark-up fix.
74
+ source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
75
+
76
+
77
+* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-10) 5 commits
78
+ (merged to 'next' on 2023-04-11 at a3b1fd5ec7)
79
+ + rebase: remove a couple of redundant strategy tests
80
+ + rebase -m: fix serialization of strategy options
81
+ + rebase -m: cleanup --strategy-option handling
82
+ + sequencer: use struct strvec to store merge strategy options
83
+ + rebase: stop reading and writing unnecessary strategy state
84
+
85
+ Clean-up of the code path that deals with merge strategy option
86
+ handling in "git rebase".
87
+ source: <cover.1681117706.git.phillip.wood@dunelm.org.uk>
88
+
89
+
90
+* sl/sparse-write-tree (2023-04-04) 1 commit
91
+ (merged to 'next' on 2023-04-10 at 0cd39c23b1)
92
+ + write-tree: integrate with sparse index
93
+
94
+ "git write-tree" learns to work better with sparse-index.
95
+ source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
96
+
97
+
98
+* tk/mergetool-gui-default-config (2023-04-05) 1 commit
99
+ (merged to 'next' on 2023-04-10 at 228432526c)
100
+ + mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
101
+
102
+ "git mergetool" and "git difftool" learns a new configuration
103
+ guiDefault to optionally favor configured guitool over non-gui-tool
104
+ automatically when $DISPLAY is set.
105
+ source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
106
+
107
--------------------------------------------------
108
[New Topics]
109
110
+* ds/fsck-pack-revindex (2023-04-17) 5 commits
111
+ - fsck: validate .rev file header
112
+ - fsck: check rev-index position values
113
+ - fsck: check rev-index checksums
114
+ - fsck: create scaffolding for rev-index checks
115
+ - Merge branch 'tb/pack-revindex-on-disk' into ds/fsck-pack-revindex
116
+ (this branch uses tb/pack-revindex-on-disk.)
117
+
118
+ "git fsck" learned to validate the on-disk pack reverse index files.
119
+ source: <pull.1512.git.1681748502.gitgitgadget@gmail.com>
120
+
121
+
122
+* tb/enable-cruft-packs-by-default (2023-04-17) 10 commits
123
+ - repository.h: drop unused `gc_cruft_packs`
124
+ - builtin/gc.c: make `gc.cruftPacks` enabled by default
125
+ - t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
126
+ - t/t6500-gc.sh: add additional test cases
127
+ - t/t6500-gc.sh: refactor cruft pack tests
128
+ - t/t9300-fast-import.sh: prepare for `gc --cruft` by default
129
+ - t/t5304-prune.sh: prepare for `gc --cruft` by default
130
+ - builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
131
+ - builtin/repack.c: fix incorrect reference to '-C'
132
+ - pack-write.c: plug a leak in stage_tmp_packfiles()
133
+
134
+ source: <cover.1681764848.git.me@ttaylorr.com>
135
+
136
+--------------------------------------------------
137
+[Stalled]
138
+
139
+* tl/notes-separator (2023-03-28) 4 commits
140
+ . notes.c: don't do stripespace when parse file arg
141
+ . notes.c: introduce '--separator=<paragraph-break>' option
142
+ . notes.c: use designated initializers for clarity
143
+ . notes.c: cleanup 'strbuf_grow' call in 'append_edit'
144
+
145
+ 'git notes append' was taught '--separator' to specify string to insert
146
+ between paragraphs.
147
+
148
+ Seems to break CI.
149
+ cf. <xmqqy1nf8c0f.fsf@gitster.g>
150
+ source: <cover.1680012650.git.dyroneteng@gmail.com>
151
+
152
+
153
+* ab/tag-object-type-errors (2022-11-22) 5 commits
154
+ - tag: don't emit potentially incorrect "object is a X, not a Y"
155
+ - tag: don't misreport type of tagged objects in errors
156
+ - object tests: add test for unexpected objects in tags
157
+ - object-file.c: free the "t.tag" in check_tag()
158
+ - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
159
+
160
+ Hardening checks around mismatched object types when one of those
161
+ objects is a tag.
162
+
163
+ Expecting a reroll.
164
+ cf. <xmqqzgb5jz5c.fsf@gitster.g>
165
+ cf. <xmqqsfgxjugi.fsf@gitster.g>
166
+ source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
167
+
168
+
169
+* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
170
+ - test-lib: allow storing counts with test harnesses
171
+
172
+ Allow summary results from tests to be written to t/test-results
173
+ directory even when a test harness like 'prove' is in use.
174
+
175
+ Expecting a reroll.
176
+ cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
177
+ source: <20221224225200.1027806-1-adam@dinwoodie.org>
178
+
179
+
180
+* so/diff-merges-more (2022-12-18) 5 commits
181
+ - diff-merges: improve --diff-merges documentation
182
+ - diff-merges: issue warning on lone '-m' option
183
+ - diff-merges: support list of values for --diff-merges
184
+ - diff-merges: implement log.diffMerges-m-imply-p config
185
+ - diff-merges: implement [no-]hide option and log.diffMergesHide config
186
+
187
+ Assorted updates to "--diff-merges=X" option.
188
+
189
+ May want to discard. Breaking compatibility does not seem worth it.
190
+ source: <20221217132955.108542-1-sorganov@gmail.com>
191
+
192
+--------------------------------------------------
193
+[Cooking]
194
+
195
+* ja/worktree-orphan (2023-04-17) 8 commits
196
+ - worktree add: emit warn when there is a bad HEAD
197
+ - worktree add: extend DWIM to infer --orphan
198
+ - worktree add: introduce "try --orphan" hint
199
+ - worktree add: add --orphan flag
200
+ - t2400: add tests to verify --quiet
201
+ - t2400: refactor "worktree add" opt exclusion tests
202
+ - t2400: print captured git output when finished
203
+ - worktree add: include -B in usage docs
204
+
205
+ 'git worktree add' learned how to create a worktree based on an
206
+ orphaned branch with `--orphan`.
207
+ source: <20230417093255.31079-1-jacobabel@nullpo.dev>
208
+
209
+
210
* gc/doc-cocci-updates (2023-04-12) 2 commits
211
- cocci: codify authoring and reviewing practices
212
- cocci: add headings to and reword README
@@ -58,19 +218,20 @@ Release tarballs are available at:
218
219
220
* jk/protocol-cap-parse-fix (2023-04-14) 7 commits
61
- - v0 protocol: use size_t for capability length/offset
62
- - t5512: test "ls-remote --heads --symref" filtering with v0 and v2
63
- - t5512: allow any protocol version for filtered symref test
64
- - t5512: add v2 support for "ls-remote --symref" test
65
- - v0 protocol: fix sha1/sha256 confusion for capabilities^{}
66
- - t5512: stop referring to "v1" protocol
67
- - v0 protocol: fix infinite loop when parsing multi-valued capabilities
221
+ (merged to 'next' on 2023-04-17 at fd9bf05656)
222
+ + v0 protocol: use size_t for capability length/offset
223
+ + t5512: test "ls-remote --heads --symref" filtering with v0 and v2
224
+ + t5512: allow any protocol version for filtered symref test
225
+ + t5512: add v2 support for "ls-remote --symref" test
226
+ + v0 protocol: fix sha1/sha256 confusion for capabilities^{}
227
+ + t5512: stop referring to "v1" protocol
228
+ + v0 protocol: fix infinite loop when parsing multi-valued capabilities
229
230
The code to parse capability list for v0 on-wire protocol fell into
231
an infinite loop when a capability appears multiple times, which
232
has been corrected.
233
73
- Will merge to 'next'.
234
+ Will merge to 'master'.
235
source: <20230414212404.GA639653@coredump.intra.peff.net>
236
237
@@ -126,6 +287,7 @@ Release tarballs are available at:
287
- pack-revindex: make `load_pack_revindex` take a repository
288
- t5325: mark as leak-free
289
- pack-write.c: plug a leak in stage_tmp_packfiles()
290
+ (this branch is used by ds/fsck-pack-revindex.)
291
292
The on-disk reverse index that allows mapping from the pack offset
293
to the object name for the object stored at the offset has been
@@ -139,7 +301,10 @@ Release tarballs are available at:
301
- doc: set actual revdate for manpages
302
- Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
303
- Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit
142
- (this branch uses fc/doc-stop-using-manversion and fc/remove-header-workarounds-for-asciidoc.)
304
+ (this branch uses fc/doc-stop-using-manversion.)
305
+
306
+ Instead of the time the formatter was run, show the timestamp
307
+ recorded in the commit in the documentation.
308
309
source: <20230413074722.71260-1-felipe.contreras@gmail.com>
310
@@ -151,6 +316,9 @@ Release tarballs are available at:
316
- completion: complete REVERT_HEAD and BISECT_HEAD
317
- revisions.txt: document more special refs
318
319
+ Document more pseudo-refs and teach the command line completion
320
+ machinery to complete AUTO_MERGE.
321
+
322
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
323
324
@@ -161,89 +329,9 @@ Release tarballs are available at:
329
- t/helper/test-hashmap.c: avoid using `strtok()`
330
- string-list: introduce `string_list_split_in_place_multi()`
331
164
- source: <cover.1681428696.git.me@ttaylorr.com>
165
-
166
---------------------------------------------------
167
-[Stalled]
168
-
169
-* ja/worktree-orphan (2023-01-13) 4 commits
170
- - worktree add: add hint to direct users towards --orphan
171
- - worktree add: add --orphan flag
172
- - worktree add: refactor opt exclusion tests
173
- - worktree add: include -B in usage docs
174
-
175
- 'git worktree add' learned how to create a worktree based on an
176
- orphaned branch with `--orphan`.
177
-
178
- Expecting a reroll.
179
- cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk>
180
- source: <20230109173227.29264-1-jacobabel@nullpo.dev>
181
-
182
-
183
-* tl/notes-separator (2023-03-28) 4 commits
184
- . notes.c: don't do stripespace when parse file arg
185
- . notes.c: introduce '--separator=<paragraph-break>' option
186
- . notes.c: use designated initializers for clarity
187
- . notes.c: cleanup 'strbuf_grow' call in 'append_edit'
188
-
189
- 'git notes append' was taught '--separator' to specify string to insert
190
- between paragraphs.
191
-
192
- Seems to break CI.
193
- cf. <xmqqy1nf8c0f.fsf@gitster.g>
194
- source: <cover.1680012650.git.dyroneteng@gmail.com>
195
-
196
-
197
-* ab/tag-object-type-errors (2022-11-22) 5 commits
198
- - tag: don't emit potentially incorrect "object is a X, not a Y"
199
- - tag: don't misreport type of tagged objects in errors
200
- - object tests: add test for unexpected objects in tags
201
- - object-file.c: free the "t.tag" in check_tag()
202
- - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
203
-
204
- Hardening checks around mismatched object types when one of those
205
- objects is a tag.
206
-
207
- Expecting a reroll.
208
- cf. <xmqqzgb5jz5c.fsf@gitster.g>
209
- cf. <xmqqsfgxjugi.fsf@gitster.g>
210
- source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
211
-
212
-
213
-* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
214
- - test-lib: allow storing counts with test harnesses
215
-
216
- Allow summary results from tests to be written to t/test-results
217
- directory even when a test harness like 'prove' is in use.
218
-
219
- Expecting a reroll.
220
- cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
221
- source: <20221224225200.1027806-1-adam@dinwoodie.org>
222
-
223
-
224
-* so/diff-merges-more (2022-12-18) 5 commits
225
- - diff-merges: improve --diff-merges documentation
226
- - diff-merges: issue warning on lone '-m' option
227
- - diff-merges: support list of values for --diff-merges
228
- - diff-merges: implement log.diffMerges-m-imply-p config
229
- - diff-merges: implement [no-]hide option and log.diffMergesHide config
230
-
231
- Assorted updates to "--diff-merges=X" option.
232
-
233
- May want to discard. Breaking compatibility does not seem worth it.
234
- source: <20221217132955.108542-1-sorganov@gmail.com>
235
-
236
---------------------------------------------------
237
-[Cooking]
238
-
239
-* la/mfc-markup-fix (2023-04-06) 1 commit
240
- (merged to 'next' on 2023-04-10 at 05415e1c90)
241
- + MyFirstContribution: render literal *
242
-
243
- Documentation mark-up fix.
332
+ Mark strtok() and strtok_r() to be banned.
333
245
- Will merge to 'master'.
246
- source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
334
+ source: <cover.1681428696.git.me@ttaylorr.com>
335
336
337
* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
@@ -336,41 +424,6 @@ Release tarballs are available at:
424
source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
425
426
339
-* tk/mergetool-gui-default-config (2023-04-05) 1 commit
340
- (merged to 'next' on 2023-04-10 at 228432526c)
341
- + mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
342
-
343
- "git mergetool" and "git difftool" learns a new configuration
344
- guiDefault to optionally favor configured guitool over non-gui-tool
345
- automatically when $DISPLAY is set.
346
-
347
- Will merge to 'master'.
348
- source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
349
-
350
-
351
-* cm/branch-delete-error-message-update (2023-04-06) 1 commit
352
- (merged to 'next' on 2023-04-10 at 09c987c822)
353
- + branch: improve error log on branch not found by checking remotes refs
354
-
355
- "git branch -d origin/master" would say "no such branch", but it is
356
- likely a missed "-r" if refs/remotes/origin/master exists. The
357
- command has been taught to give such a hint in its error message.
358
-
359
- Will merge to 'master'.
360
- source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
361
-
362
-
363
-* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
364
- (merged to 'next' on 2023-04-10 at f08eab44f2)
365
- + doc: asciidoc: remove custom header macro
366
- (this branch is used by fc/doc-use-datestamp-in-commit.)
367
-
368
- Doc toolchain update to remove old workaround for AsciiDoc.
369
-
370
- Will merge to 'master'.
371
- source: <20230323221523.52472-1-felipe.contreras@gmail.com>
372
-
373
-
427
* ow/ref-filter-omit-empty (2023-04-13) 1 commit
428
(merged to 'next' on 2023-04-14 at 2798986c60)
429
+ branch, for-each-ref, tag: add option to omit empty lines
@@ -403,7 +456,7 @@ Release tarballs are available at:
456
source: <20230403040724.642513-1-alexhenrie24@gmail.com>
457
458
406
-* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits
459
+* ar/test-cleanup-unused-file-creation-part2 (2023-04-17) 6 commits
460
- t2019: don't create unused files
461
- t1502: don't create unused files
462
- t1450: don't create unused files
@@ -412,10 +465,7 @@ Release tarballs are available at:
465
- t0300: don't create unused file
466
467
Test cleanup.
415
-
416
- Expecting a reroll.
417
- cf. <6d572a02-0e20-1cf6-db6c-7306ac912049@gmail.com>
418
- source: <20230403223338.468025-1-rybak.a.v@gmail.com>
468
+ source: <20230417191044.909094-1-rybak.a.v@gmail.com>
469
470
471
* en/header-split-cache-h (2023-04-11) 24 commits
@@ -451,16 +501,6 @@ Release tarballs are available at:
501
source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
502
503
454
-* sl/sparse-write-tree (2023-04-04) 1 commit
455
- (merged to 'next' on 2023-04-10 at 0cd39c23b1)
456
- + write-tree: integrate with sparse index
457
-
458
- "git write-tree" learns to work better with sparse-index.
459
-
460
- Will merge to 'master'.
461
- source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
462
-
463
-
504
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
505
- fsmonitor: handle differences between Windows named pipe functions
506
@@ -568,21 +608,6 @@ Release tarballs are available at:
608
source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
609
610
571
-* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-10) 5 commits
572
- (merged to 'next' on 2023-04-11 at a3b1fd5ec7)
573
- + rebase: remove a couple of redundant strategy tests
574
- + rebase -m: fix serialization of strategy options
575
- + rebase -m: cleanup --strategy-option handling
576
- + sequencer: use struct strvec to store merge strategy options
577
- + rebase: stop reading and writing unnecessary strategy state
578
-
579
- Clean-up of the code path that deals with merge strategy option
580
- handling in "git rebase".
581
-
582
- Will merge to 'master'.
583
- source: <cover.1681117706.git.phillip.wood@dunelm.org.uk>
584
-
585
-
611
* sl/diff-files-sparse (2023-03-22) 2 commits
612
- diff-files: integrate with sparse index
613
- t1092: add tests for `git diff-files`