What's cooking (2023/10 #08)
Junio C Hamano committed
Oct 22, 2023 at 11:08 UTC
0b8ef193e40a3900658a292e557ba5418b6ad213
1 file changed
+214
-139
whats-cooking.txt
+214
-139
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #07; Wed, 18)
3
-X-master-at: 813d9a91884e0afecec8ccf8e33909c405ee1d3f
4
-X-next-at: 680d4f5322bd5e584467ecdc7102556efec01b08
2
+Subject: What's cooking in git.git (Oct 2023, #08; Sun, 22)
3
+X-master-at: ceadf0f3cf51550166a387ec8508bb55e7883057
4
+X-next-at: 7ce3cef56b63eab50c97e020dbcc89a4d2035129
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #07; Wed, 18)
7
+What's cooking in git.git (Oct 2023, #08; Sun, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -51,104 +51,135 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
54
-* jc/merge-ort-attr-index-fix (2023-10-09) 1 commit
55
- (merged to 'next' on 2023-10-10 at b139b87502)
56
- + merge-ort: initialize repo in index state
54
+* ak/pretty-decorate-more-fix (2023-10-09) 1 commit
55
+ (merged to 'next' on 2023-10-12 at 3cbb4c2268)
56
+ + pretty: fix ref filtering for %(decorate) formats
57
58
- Fix "git merge-tree" to stop segfaulting when the --attr-source
59
- option is used.
60
- source: <pull.1583.v3.git.git.1696857660374.gitgitgadget@gmail.com>
58
+ Unlike "git log --pretty=%D", "git log --pretty="%(decorate)" did
59
+ not auto-initialize the decoration subsystem, which has been
60
+ corrected.
61
+ source: <20231008202307.1568477-1-andy.koppe@gmail.com>
62
63
63
-* sn/cat-file-doc-update (2023-10-09) 1 commit
64
- (merged to 'next' on 2023-10-10 at 6719ba7bd4)
65
- + doc/cat-file: make synopsis and description less confusing
64
+* ps/rewritten-is-per-worktree-doc (2023-10-10) 1 commit
65
+ (merged to 'next' on 2023-10-12 at 501b960e8c)
66
+ + doc/git-worktree: mention "refs/rewritten" as per-worktree refs
67
67
- "git cat-file" documentation updates.
68
- source: <20231009175604.2361700-1-stepnem@smrk.net>
68
+ Doc update.
69
+ source: <985ac850eb6e60ae76601acc8bfbcd56f99348b4.1696935657.git.ps@pks.im>
70
71
71
-* tb/repack-max-cruft-size (2023-10-09) 5 commits
72
- (merged to 'next' on 2023-10-09 at 38f039e880)
73
- + repack: free existing_cruft array after use
74
- (merged to 'next' on 2023-10-06 at b3ca6df3b9)
75
- + builtin/repack.c: avoid making cruft packs preferred
76
- + builtin/repack.c: implement support for `--max-cruft-size`
77
- + builtin/repack.c: parse `--max-pack-size` with OPT_MAGNITUDE
78
- + t7700: split cruft-related tests to t7704
72
+* ty/merge-tree-strategy-options (2023-10-11) 2 commits
73
+ (merged to 'next' on 2023-10-12 at 9b873601df)
74
+ + merge: introduce {copy|clear}_merge_options()
75
+ (merged to 'next' on 2023-09-29 at aa65b54416)
76
+ + merge-tree: add -X strategy option
77
80
- "git repack" learned "--max-cruft-size" to prevent cruft packs from
81
- growing without bounds.
82
- source: <cover.1696293862.git.me@ttaylorr.com>
83
- source: <20231007172031.GA1524950@coredump.intra.peff.net>
84
- source: <035393935108d02aaf8927189b05102f4f74f340.1696370003.git.me@ttaylorr.com>
78
+ "git merge-tree" learned to take strategy backend specific options
79
+ via the "-X" option, like "git merge" does.
80
+ source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
81
82
87
-* xz/commit-title-soft-limit-doc (2023-10-09) 1 commit
88
- (merged to 'next' on 2023-10-10 at 0bf3d9ed51)
89
- + doc: correct the 50 characters soft limit (+)
83
+* vd/loose-ref-iteration-optimization (2023-10-09) 4 commits
84
+ (merged to 'next' on 2023-10-12 at 99e2f83855)
85
+ + files-backend.c: avoid stat in 'loose_fill_ref_dir'
86
+ + dir.[ch]: add 'follow_symlink' arg to 'get_dtype'
87
+ + dir.[ch]: expose 'get_dtype'
88
+ + ref-cache.c: fix prefix matching in ref iteration
89
91
- Doc update.
92
- source: <pull.1585.v2.git.git.1696778367151.gitgitgadget@gmail.com>
90
+ The code to iterate over loose references have been optimized to
91
+ reduce the number of lstat() system calls.
92
+ source: <pull.1594.v2.git.1696888736.gitgitgadget@gmail.com>
93
94
--------------------------------------------------
95
[New Topics]
96
97
-* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
98
- - commit: do not use cryptic "new_index" in end-user facing messages
97
+* jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit
98
+ (merged to 'next' on 2023-10-20 at 9200d39c08)
99
+ + am: align placeholder for --whitespace option with apply
100
100
- source: <xmqqo7gwvd8c.fsf_-_@gitster.g>
101
+ Docfix.
102
103
+ Will merge to 'master'.
104
+ source: <xmqqwmvjzeqd.fsf@gitster.g>
105
103
-* js/bugreport-in-the-same-minute (2023-10-16) 1 commit
104
- - bugreport: include +i in outfile suffix as needed
106
106
- source: <20231016214045.146862-2-jacob@initialcommit.io>
107
+* da/t7601-style-fix (2023-10-18) 1 commit
108
+ (merged to 'next' on 2023-10-20 at 8e7326458c)
109
+ + t7601: use "test_path_is_file" etc. instead of "test -f"
110
111
+ Coding style update.
112
109
-* kh/pathspec-error-wo-repository-fix (2023-10-17) 1 commit
110
- - grep: die gracefully when outside repository
113
+ Will merge to 'master'.
114
+ source: <20231018124538.68549-2-anonolitunya@gmail.com>
115
112
- source: <087c92e3904dd774f672373727c300bf7f5f6369.1697317276.git.code@khaugsbakk.name>
116
117
+* jx/fetch-atomic-error-message-fix (2023-10-19) 2 commits
118
+ - fetch: no redundant error message for atomic fetch
119
+ - t5574: test porcelain output of atomic fetch
120
115
-* kh/t7900-cleanup (2023-10-17) 9 commits
116
- - t7900: fix register dependency
117
- - t7900: factor out packfile dependency
118
- - t7900: fix `print-args` dependency
119
- - t7900: fix `pfx` dependency
120
- - t7900: factor out common schedule setup
121
- - t7900: factor out inheritance test dependency
122
- - t7900: create commit so that branch is born
123
- - t7900: setup and tear down clones
124
- - t7900: remove register dependency
121
+ "git fetch --atomic" issued an unnecessary empty error message,
122
+ which has been corrected.
123
126
- source: <cover.1697319294.git.code@khaugsbakk.name>
124
+ Needs review.
125
+ source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@alibaba-inc.com>
126
127
129
-* ni/die-message-fix-for-git-add (2023-10-17) 1 commit
130
- - builtin/add.c: clean up die() messages
128
+* mm/p4-symlink-with-lfs (2023-10-19) 1 commit
129
+ (merged to 'next' on 2023-10-20 at 9c05ce7e85)
130
+ + git-p4 shouldn't attempt to store symlinks in LFS
131
132
- source: <20231017113946.747-1-naomi.ibeh69@gmail.com>
132
+ "git p4" tried to store symlinks to LFS when told, but has been
133
+ fixed not to do so, because it does not make sense.
134
135
+ Will merge to 'master'.
136
+ source: <20231019002558.867830-1-mmcclain@noprivs.com>
137
135
-* ps/git-repack-doc-fixes (2023-10-16) 2 commits
136
- - doc/git-repack: don't mention nonexistent "--unpacked" option
137
- - doc/git-repack: fix syntax for `-g` shorthand option
138
139
- source: <cover.1697440686.git.ps@pks.im>
139
+* jk/send-email-fix-addresses-from-composed-messages (2023-10-20) 3 commits
140
+ (merged to 'next' on 2023-10-22 at 43221cc3a4)
141
+ + send-email: handle to/cc/bcc from --compose message
142
+ + Revert "send-email: extract email-parsing code into a subroutine"
143
+ + doc/send-email: mention handling of "reply-to" with --compose
144
145
+ The codepath to handle recipient addresses `git send-email
146
+ --compose` learns from the user was completely broken, which has
147
+ been corrected.
148
+
149
+ Will merge to 'master'.
150
+ source: <20231020100343.GA2194322@coredump.intra.peff.net>
151
+
152
+
153
+* ms/doc-push-fix (2023-10-20) 1 commit
154
+ (merged to 'next' on 2023-10-22 at 7ce3cef56b)
155
+ + git-push doc: more visibility for -q option
156
+
157
+ Docfix.
158
+
159
+ Will merge to 'master'.
160
+ source: <20231020184627.14336-1-msuchanek@suse.de>
161
+
162
+
163
+* ob/rebase-cleanup (2023-10-20) 3 commits
164
+ (merged to 'next' on 2023-10-22 at 05e14ca4fc)
165
+ + rebase: move parse_opt_keep_empty() down
166
+ + rebase: handle --strategy via imply_merge() as well
167
+ + rebase: simplify code related to imply_merge()
168
+
169
+ Code clean-up.
170
+
171
+ Will merge to 'master'.
172
+ source: <20231020093654.922890-1-oswald.buddenhagen@gmx.de>
173
142
-* tb/merge-tree-write-pack (2023-10-17) 7 commits
143
- - builtin/merge-tree.c: implement support for `--write-pack`
144
- - bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
145
- - bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
146
- - bulk-checkin: factor our `finalize_checkpoint()`
147
- - bulk-checkin: factor out `truncate_checkpoint()`
148
- - bulk-checkin: factor out `prepare_checkpoint()`
149
- - bulk-checkin: factor out `format_object_header_hash()`
174
151
- source: <cover.1697560266.git.me@ttaylorr.com>
175
+* wx/merge-ort-comment-typofix (2023-10-21) 1 commit
176
+ (merged to 'next' on 2023-10-22 at ad1e33883a)
177
+ + merge-ort.c: fix typo 'neeed' to 'needed'
178
+
179
+ Typofix.
180
+
181
+ Will merge to 'master'.
182
+ source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>
183
184
--------------------------------------------------
185
[Stalled]
@@ -195,6 +226,92 @@ Release tarballs are available at:
226
--------------------------------------------------
227
[Cooking]
228
229
+* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
230
+ (merged to 'next' on 2023-10-22 at 0e4787303d)
231
+ + commit: do not use cryptic "new_index" in end-user facing messages
232
+
233
+ Message fix.
234
+
235
+ Will merge to 'master'.
236
+ source: <xmqqo7gwvd8c.fsf_-_@gitster.g>
237
+
238
+
239
+* js/bugreport-in-the-same-minute (2023-10-16) 1 commit
240
+ - bugreport: include +i in outfile suffix as needed
241
+
242
+ Instead of auto-generating a filename that is already in use for
243
+ output and fail the command, `git bugreport` learned to fuzz the
244
+ filename to avoid collisions with existing files.
245
+
246
+ Needs review.
247
+ source: <20231016214045.146862-2-jacob@initialcommit.io>
248
+
249
+
250
+* kh/pathspec-error-wo-repository-fix (2023-10-20) 1 commit
251
+ (merged to 'next' on 2023-10-22 at 4f77af1e40)
252
+ + grep: die gracefully when outside repository
253
+
254
+ The pathspec code carelessly dereferenced NULL while emitting an
255
+ error message, which has been corrected.
256
+
257
+ Will merge to 'master'.
258
+ source: <5c8ef6bec1c99e0fae7ada903885a8e77f8137f9.1697819838.git.code@khaugsbakk.name>
259
+
260
+
261
+* kh/t7900-cleanup (2023-10-17) 9 commits
262
+ - t7900: fix register dependency
263
+ - t7900: factor out packfile dependency
264
+ - t7900: fix `print-args` dependency
265
+ - t7900: fix `pfx` dependency
266
+ - t7900: factor out common schedule setup
267
+ - t7900: factor out inheritance test dependency
268
+ - t7900: create commit so that branch is born
269
+ - t7900: setup and tear down clones
270
+ - t7900: remove register dependency
271
+
272
+ Test clean-up.
273
+
274
+ Needs review.
275
+ source: <cover.1697319294.git.code@khaugsbakk.name>
276
+
277
+
278
+* ni/die-message-fix-for-git-add (2023-10-17) 1 commit
279
+ (merged to 'next' on 2023-10-22 at f46c5dfd63)
280
+ + builtin/add.c: clean up die() messages
281
+
282
+ Message updates.
283
+
284
+ Will merge to 'master'.
285
+ source: <20231017113946.747-1-naomi.ibeh69@gmail.com>
286
+
287
+
288
+* ps/git-repack-doc-fixes (2023-10-16) 2 commits
289
+ (merged to 'next' on 2023-10-22 at df64849f26)
290
+ + doc/git-repack: don't mention nonexistent "--unpacked" option
291
+ + doc/git-repack: fix syntax for `-g` shorthand option
292
+
293
+ Doc updates.
294
+
295
+ Will merge to 'master'.
296
+ source: <cover.1697440686.git.ps@pks.im>
297
+
298
+
299
+* tb/merge-tree-write-pack (2023-10-19) 7 commits
300
+ - builtin/merge-tree.c: implement support for `--write-pack`
301
+ - bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
302
+ - bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
303
+ - bulk-checkin: implement `SOURCE_INCORE` mode for `bulk_checkin_source`
304
+ - bulk-checkin: refactor deflate routine to accept a `bulk_checkin_source`
305
+ - bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
306
+ - bulk-checkin: extract abstract `bulk_checkin_source`
307
+
308
+ "git merge-tree" learned "--write-pack" to record its result
309
+ without creating loose objects.
310
+
311
+ Will merge to 'next'?
312
+ source: <cover.1697736516.git.me@ttaylorr.com>
313
+
314
+
315
* tb/format-pack-doc-update (2023-10-12) 2 commits
316
- Documentation/gitformat-pack.txt: fix incorrect MIDX documentation
317
- Documentation/gitformat-pack.txt: fix typo
@@ -274,7 +391,7 @@ Release tarballs are available at:
391
source: <xmqqedhzg37z.fsf@gitster.g>
392
393
277
-* tb/path-filter-fix (2023-10-10) 17 commits
394
+* tb/path-filter-fix (2023-10-18) 17 commits
395
- bloom: introduce `deinit_bloom_filters()`
396
- commit-graph: reuse existing Bloom filters where possible
397
- object.h: fix mis-aligned flag bits table
@@ -298,19 +415,7 @@ Release tarballs are available at:
415
bump the format version to 2.
416
417
Needs (hopefully final and quick) review.
301
- source: <cover.1696969994.git.me@ttaylorr.com>
302
-
303
-
304
-* ak/pretty-decorate-more-fix (2023-10-09) 1 commit
305
- (merged to 'next' on 2023-10-12 at 3cbb4c2268)
306
- + pretty: fix ref filtering for %(decorate) formats
307
-
308
- Unlike "git log --pretty=%D", "git log --pretty="%(decorate)" did
309
- not auto-initialize the decoration subsystem, which has been
310
- corrected.
311
-
312
- Will merge to 'master'.
313
- source: <20231008202307.1568477-1-andy.koppe@gmail.com>
418
+ source: <cover.1697653929.git.me@ttaylorr.com>
419
420
421
* en/docfixes (2023-10-09) 25 commits
@@ -347,18 +452,18 @@ Release tarballs are available at:
452
source: <pull.1595.git.1696747527.gitgitgadget@gmail.com>
453
454
350
-* kn/rev-list-missing-fix (2023-10-16) 4 commits
351
- . rev-list: add commit object support in `--missing` option
352
- . rev-list: move `show_commit()` to the bottom
353
- . revision: rename bit to `do_not_die_on_missing_objects`
354
- . Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
455
+* kn/rev-list-missing-fix (2023-10-22) 4 commits
456
+ - rev-list: add commit object support in `--missing` option
457
+ - rev-list: move `show_commit()` to the bottom
458
+ - revision: rename bit to `do_not_die_on_missing_objects`
459
+ - Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
460
(this branch uses ps/do-not-trust-commit-graph-blindly-for-existence.)
461
462
"git rev-list --missing" did not work for missing commit objects,
463
which has been corrected.
464
360
- cf. <xmqqbkcyo7ro.fsf@gitster.g>
361
- source: <20231016103830.56486-1-karthik.188@gmail.com>
465
+ Comments?
466
+ source: <20231019121024.194317-1-karthik.188@gmail.com>
467
468
469
* jk/chunk-bounds (2023-10-14) 21 commits
@@ -394,16 +499,6 @@ Release tarballs are available at:
499
source: <20231009205544.GA3281950@coredump.intra.peff.net>
500
501
397
-* ps/rewritten-is-per-worktree-doc (2023-10-10) 1 commit
398
- (merged to 'next' on 2023-10-12 at 501b960e8c)
399
- + doc/git-worktree: mention "refs/rewritten" as per-worktree refs
400
-
401
- Doc update.
402
-
403
- Will merge to 'master'.
404
- source: <985ac850eb6e60ae76601acc8bfbcd56f99348b4.1696935657.git.ps@pks.im>
405
-
406
-
502
* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
503
(merged to 'next' on 2023-10-18 at 575d767f9a)
504
+ t/README: fix multi-prerequisite example
@@ -432,26 +527,13 @@ Release tarballs are available at:
527
source: <20231009160535.236523-1-sorganov@gmail.com>
528
529
435
-* vd/loose-ref-iteration-optimization (2023-10-09) 4 commits
436
- (merged to 'next' on 2023-10-12 at 99e2f83855)
437
- + files-backend.c: avoid stat in 'loose_fill_ref_dir'
438
- + dir.[ch]: add 'follow_symlink' arg to 'get_dtype'
439
- + dir.[ch]: expose 'get_dtype'
440
- + ref-cache.c: fix prefix matching in ref iteration
441
-
442
- The code to iterate over loose references have been optimized to
443
- reduce the number of lstat() system calls.
444
-
445
- Will merge to 'master'.
446
- source: <pull.1594.v2.git.1696888736.gitgitgadget@gmail.com>
447
-
448
-
530
* jc/update-list-references-to-lore (2023-10-06) 1 commit
450
- - doc: update list archive reference to use lore.kernel.org
531
+ (merged to 'next' on 2023-10-19 at 83a721a137)
532
+ + doc: update list archive reference to use lore.kernel.org
533
534
Doc update.
535
454
- Needs review.
536
+ Will merge to 'master'.
537
source: <xmqq7cnz741s.fsf@gitster.g>
538
539
@@ -478,8 +560,14 @@ Release tarballs are available at:
560
source: <20231010123847.2777056-1-christian.couder@gmail.com>
561
562
481
-* ak/color-decorate-symbols (2023-10-03) 1 commit
482
- - decorate: add color.decorate.symbols config option
563
+* ak/color-decorate-symbols (2023-10-19) 7 commits
564
+ - log: show pseudorefs in decorations
565
+ - refs: exempt pseudoref patterns from prefixing
566
+ - log: add color.decorate.ref option for other refs
567
+ - refs: separate decoration type from default filter
568
+ - log: add color.decorate.symbol config option
569
+ - log: use designated inits for decoration_colors
570
+ - config: restructure color.decorate documentation
571
572
A new config for coloring.
573
@@ -488,13 +576,14 @@ Release tarballs are available at:
576
577
578
* jc/attr-tree-config (2023-10-13) 2 commits
491
- - attr: add attr.tree for setting the treeish to read attributes from
492
- - attr: read attributes from HEAD when bare repo
579
+ (merged to 'next' on 2023-10-19 at 202dc1c453)
580
+ + attr: add attr.tree for setting the treeish to read attributes from
581
+ + attr: read attributes from HEAD when bare repo
582
583
The attribute subsystem learned to honor `attr.tree` configuration
584
that specifies which tree to read the .gitattributes files from.
585
497
- Will merge to 'next'?
586
+ Will merge to 'master'.
587
source: <pull.1577.v5.git.git.1697218770.gitgitgadget@gmail.com>
588
589
@@ -511,16 +600,15 @@ Release tarballs are available at:
600
source: <pull.1589.v2.git.1695553041.gitgitgadget@gmail.com>
601
602
514
-* la/trailer-cleanups (2023-09-26) 4 commits
515
- - trailer: only use trailer_block_* variables if trailers were found
603
+* la/trailer-cleanups (2023-10-20) 3 commits
604
- trailer: use offsets for trailer_start/trailer_end
605
- trailer: find the end of the log message
606
- commit: ignore_non_trailer computes number of bytes to ignore
607
608
Code clean-up.
609
522
- Needs review.
523
- source: <pull.1563.v4.git.1695709372.gitgitgadget@gmail.com>
610
+ Will merge to 'next'?
611
+ source: <pull.1563.v5.git.1697828495.gitgitgadget@gmail.com>
612
613
614
* eb/hash-transition (2023-10-02) 30 commits
@@ -585,19 +673,6 @@ Release tarballs are available at:
673
source: <cover.1696425168.git.zhiyou.jx@alibaba-inc.com>
674
675
588
-* ty/merge-tree-strategy-options (2023-10-11) 2 commits
589
- (merged to 'next' on 2023-10-12 at 9b873601df)
590
- + merge: introduce {copy|clear}_merge_options()
591
- (merged to 'next' on 2023-09-29 at aa65b54416)
592
- + merge-tree: add -X strategy option
593
-
594
- "git merge-tree" learned to take strategy backend specific options
595
- via the "-X" option, like "git merge" does.
596
-
597
- Will merge to 'master'.
598
- source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
599
-
600
-
676
* js/config-parse (2023-09-21) 5 commits
677
- config-parse: split library out of config.[c|h]
678
- config.c: accept config_parse_options in git_config_from_stdin
@@ -650,7 +725,7 @@ Release tarballs are available at:
725
source: <cover.1696889529.git.steadmon@google.com>
726
727
653
-* js/doc-unit-tests-with-cmake (2023-10-16) 7 commits
728
+* js/doc-unit-tests-with-cmake (2023-10-19) 7 commits
729
- cmake: handle also unit tests
730
- cmake: use test names instead of full paths
731
- cmake: fix typo in variable name