What's cooking (2024/02 #08)
Junio C Hamano committed
Feb 23, 2024 at 00:00 UTC
d9de65ab5e36c6fecba49add82cca268ca50edc7
1 file changed
+120
-50
whats-cooking.txt
+120
-50
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2024, #07; Tue, 20)
3
-X-master-at: f41f85c9ec8d4d46de0fd5fded88db94d3ec8c11
4
-X-next-at: e91efceb0f2ddd49aa201fe3bd057235203b2dcd
2
+Subject: What's cooking in git.git (Feb 2024, #08; Thu, 22)
3
+X-master-at: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0
4
+X-next-at: e034bb2e1d470dd9e12a63da2b6b7e5d3a25a721
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Feb 2024, #07; Tue, 20)
7
+What's cooking in git.git (Feb 2024, #08; Thu, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,8 +17,8 @@ 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.44-rc2 has been tagged to fix a regression discovered the last
21
-minute. The final release is postponed until later this week.
20
+Git 2.44 has been tagged, after fixing a last minute regression.
21
+Git 2.43.3 also has been tagged for the same fix.
22
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
@@ -49,16 +49,81 @@ Release tarballs are available at:
49
https://www.kernel.org/pub/software/scm/git/
50
51
--------------------------------------------------
52
-[Graduated to 'master']
52
+[New Topics]
53
+
54
+* ps/difftool-dir-diff-exit-code (2024-02-20) 1 commit
55
+ (merged to 'next' on 2024-02-21 at a7bbef5a5f)
56
+ + git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`
57
+
58
+ "git difftool --dir-diff" learned to honor the "--trust-exit-code"
59
+ option; it used to always exit with 0 and signalled success.
60
+
61
+ Will cook in 'next'.
62
+ source: <0fac668f8fc021af9f9c4df5134da59816307ccc.1708423309.git.ps@pks.im>
63
+
64
+
65
+* ds/doc-send-email-capitalization (2024-02-20) 1 commit
66
+ (merged to 'next' on 2024-02-21 at c4aac4b993)
67
+ + documentation: send-email: use camel case consistently
68
+
69
+ Doc update.
70
+
71
+ Will cook in 'next'.
72
+ source: <88f1fe08c3047e14090957093ee8d98b0f60cb6c.1708467601.git.dsimic@manjaro.org>
73
+
74
+
75
+* ja/docfixes (2024-02-20) 3 commits
76
+ (merged to 'next' on 2024-02-21 at 6d778ca672)
77
+ + doc: end sentences with full-stop
78
+ + doc: close unclosed angle-bracket of a placeholder in git-clone doc
79
+ + doc: git-rev-parse: enforce command-line description syntax
80
+
81
+ Doc update.
82
+
83
+ Will cook in 'next'.
84
+ source: <pull.1670.git.1708468374.gitgitgadget@gmail.com>
85
+
86
+
87
+* hs/rebase-not-in-progress (2024-02-21) 1 commit
88
+ - rebase: make warning less passive aggressive
89
+
90
+ Error message update.
91
+
92
+ Will merge to 'next'.
93
+ source: <pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com>
94
+
95
+
96
+* jw/remote-doc-typofix (2024-02-21) 1 commit
97
+ - git-remote.txt: fix typo
98
+
99
+ Docfix.
100
54
-* la/trailer-cleanups (2024-02-19) 1 commit
55
- - trailer: fix comment/cut-line regression with opts->no_divider
101
+ Will merge to 'next'.
102
+ source: <20240221083554.5255-1-jwilk@jwilk.net>
103
57
- Fix to an already-graduated topic.
58
- source: <20240220010936.GA1793660@coredump.intra.peff.net>
104
+
105
+* ja/doc-placeholders-markup-rules (2024-02-21) 1 commit
106
+ - doc: clarify the format of placeholders
107
+
108
+ The way placeholders are to be marked-up in documentation have been
109
+ specified; use "_<placeholder>_" to typeset the word inside a pair
110
+ of <angle-brakets> emphasized.
111
+
112
+ Will merge to 'next'.
113
+ source: <pull.1671.git.1708550340094.gitgitgadget@gmail.com>
114
+
115
+
116
+* jc/doc-add-placeholder-fix (2024-02-21) 1 commit
117
+ - doc: apply the new placeholder rules to git-add documentation
118
+
119
+ Practice the new mark-up rule for <placeholders> with "git add"
120
+ documentation page.
121
+
122
+ Will merge to 'next'.
123
+ source: <xmqqbk89molz.fsf@gitster.g>
124
125
--------------------------------------------------
61
-[New Topics]
126
+[Cooking]
127
128
* as/option-names-in-messages (2024-02-16) 5 commits
129
- revision.c: trivial fix to message
@@ -126,24 +191,23 @@ Release tarballs are available at:
191
source: <pull.1676.v2.git.git.1708375258296.gitgitgadget@gmail.com>
192
193
129
-* ps/reflog-list (2024-02-19) 7 commits
130
- (merged to 'next' on 2024-02-19 at 6c491b5079)
131
- + builtin/reflog: introduce subcommand to list reflogs
132
- + refs: stop resolving ref corresponding to reflogs
133
- + refs: drop unused params from the reflog iterator callback
134
- + refs/files: sort reflogs returned by the reflog iterator
135
- + dir-iterator: support iteration in sorted order
136
- + dir-iterator: pass name to `prepare_next_entry_data()` directly
194
+* ps/reflog-list (2024-02-21) 9 commits
195
+ - builtin/reflog: introduce subcommand to list reflogs
196
+ - refs: stop resolving ref corresponding to reflogs
197
+ - refs: drop unused params from the reflog iterator callback
198
+ - refs: always treat iterators as ordered
199
+ - refs/files: sort merged worktree and common reflogs
200
+ - refs/files: sort reflogs returned by the reflog iterator
201
+ - dir-iterator: support iteration in sorted order
202
+ - dir-iterator: pass name to `prepare_next_entry_data()` directly
203
+ Merge branch 'ps/reftable-backend' into ps/reflog-list
204
(this branch uses ps/reftable-backend.)
205
206
"git reflog" learned a "list" subcommand that enumerates known reflogs.
207
142
- Will cook in 'next'.
143
- source: <cover.1708353264.git.ps@pks.im>
208
+ Will merge to 'next'.
209
+ source: <cover.1708518982.git.ps@pks.im>
210
145
---------------------------------------------------
146
-[Cooking]
211
212
* jh/fsmonitor-icase-corner-case-fix (2024-02-14) 11 commits
213
- t7527: update case-insenstive fsmonitor test
@@ -202,9 +266,12 @@ Release tarballs are available at:
266
267
268
* cp/t9146-use-test-path-helpers (2024-02-14) 1 commit
205
- - t9146: replace test -d/-e/-f with appropriate test_path_is_* function
269
+ (merged to 'next' on 2024-02-21 at 0b8356ef33)
270
+ + t9146: replace test -d/-e/-f with appropriate test_path_is_* function
271
272
Test script clean-up.
273
+
274
+ Will cook in 'next'.
275
source: <pull.1661.v3.git.1707933048210.gitgitgadget@gmail.com>
276
277
@@ -292,7 +359,7 @@ Release tarballs are available at:
359
command line, but it did not honor an empty string to mean "pass
360
everything", which has been corrected.
361
295
- Will merge to 'next'?
362
+ Expecting a reroll?
363
source: <20240211183923.131278-1-karthik.188@gmail.com>
364
365
@@ -378,17 +445,18 @@ Release tarballs are available at:
445
446
447
* cc/rev-list-allow-missing-tips (2024-02-14) 4 commits
381
- - rev-list: allow missing tips with --missing=[print|allow*]
382
- - t6022: fix 'test' style and 'even though' typo
383
- - oidset: refactor oidset_insert_from_set()
384
- - revision: clarify a 'return NULL' in get_reference()
448
+ (merged to 'next' on 2024-02-21 at 9b63eec23f)
449
+ + rev-list: allow missing tips with --missing=[print|allow*]
450
+ + t6022: fix 'test' style and 'even though' typo
451
+ + oidset: refactor oidset_insert_from_set()
452
+ + revision: clarify a 'return NULL' in get_reference()
453
(this branch uses jc/t9210-lazy-fix.)
454
387
- "git rev-list --missing=print" have learned to optionally take
455
+ "git rev-list --missing=print" has learned to optionally take
456
"--allow-missing-tips", which allows the objects at the starting
457
points to be missing.
458
391
- Will merge to 'next'?
459
+ Will cook in 'next'.
460
source: <20240214142513.4002639-1-christian.couder@gmail.com>
461
462
@@ -410,7 +478,7 @@ Release tarballs are available at:
478
source: <cover.1707726654.git.ps@pks.im>
479
480
413
-* js/merge-tree-3-trees (2024-02-07) 6 commits
481
+* js/merge-tree-3-trees (2024-02-22) 6 commits
482
- cache-tree: avoid an unnecessary check
483
- Always check `parse_tree*()`'s return value
484
- t4301: verify that merge-tree fails on missing blob objects
@@ -422,11 +490,9 @@ Release tarballs are available at:
490
"git merge-tree" has learned that the three trees involved in the
491
3-way merge only need to be trees, not necessarily commits.
492
425
- Expecting a reroll.
426
- cf. <CAPig+cSs8MFkLasTULh7tybrFm7SwaT+JeR7HnXjh+-agCHYMw@mail.gmail.com>
427
- cf. <CAPig+cSJz3U+vT==NhX5hcrTjsCggnAzhzQOvZcSXbcEGuYaKQ@mail.gmail.com>
428
- source: <pull.1647.v2.git.1706474063109.gitgitgadget@gmail.com>
429
- source: <pull.1651.v2.git.1707324461.gitgitgadget@gmail.com>
493
+ Comments?
494
+ source: <pull.1647.git.1706277694231.gitgitgadget@gmail.com>
495
+ source: <pull.1651.v3.git.1708612605.gitgitgadget@gmail.com>
496
497
498
* rj/complete-reflog (2024-01-26) 4 commits
@@ -438,7 +504,8 @@ Release tarballs are available at:
504
The command line completion script (in contrib/) learned to
505
complete "git reflog" better.
506
441
- Needs review.
507
+ Expecting a reroll.
508
+ cf. <dd106d87-3363-426a-90a2-16e1f2d04661@gmail.com>
509
source: <98daf977-dbad-4d3b-a293-6a769895088f@gmail.com>
510
511
@@ -474,23 +541,26 @@ Release tarballs are available at:
541
avoid offering revision names as candidates to "git send-email" when
542
the command is used to send pre-generated files.
543
477
- Needs review.
478
- cf. <xmqq4jej6i1b.fsf@gitster.g>
544
+ Expecting a reroll.
545
+ cf. <CAC4O8c88Z3ZqxH2VVaNPpEGB3moL5dJcg3cOWuLWwQ_hLrJMtA@mail.gmail.com>
546
source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>
547
548
549
* la/trailer-api (2024-02-16) 9 commits
483
- - format_trailers_from_commit(): indirectly call trailer_info_get()
484
- - format_trailer_info(): move "fast path" to caller
485
- - format_trailers(): use strbuf instead of FILE
486
- - trailer_info_get(): reorder parameters
487
- - trailer: start preparing for formatting unification
488
- - trailer: move interpret_trailers() to interpret-trailers.c
489
- - trailer: prepare to expose functions as part of API
490
- - shortlog: add test for de-duplicating folded trailers
491
- - trailer: free trailer_info _after_ all related usage
550
+ (merged to 'next' on 2024-02-21 at 631e28bbbc)
551
+ + format_trailers_from_commit(): indirectly call trailer_info_get()
552
+ + format_trailer_info(): move "fast path" to caller
553
+ + format_trailers(): use strbuf instead of FILE
554
+ + trailer_info_get(): reorder parameters
555
+ + trailer: start preparing for formatting unification
556
+ + trailer: move interpret_trailers() to interpret-trailers.c
557
+ + trailer: prepare to expose functions as part of API
558
+ + shortlog: add test for de-duplicating folded trailers
559
+ + trailer: free trailer_info _after_ all related usage
560
561
Code clean-up.
562
+
563
+ Will cook in 'next'.
564
source: <pull.1632.v5.git.1708124950.gitgitgadget@gmail.com>
565
566