What's cooking (2024/04 #08)
Junio C Hamano committed
Apr 22, 2024 at 16:44 UTC
0d2241241b11de0031b90cd54a6bd3ad41d97d9b
1 file changed
+86
-32
whats-cooking.txt
+86
-32
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2024, #07; Fri, 19)
3
-X-master-at: ae3196a5ea84a9e88991d576020cf66512487088
4
-X-next-at: bae5840b3b82b94d0aca7c99a507840c3e5bd7fb
2
+Subject: What's cooking in git.git (Apr 2024, #08; Mon, 22)
3
+X-master-at: 00e10ef10e161a913893b8cb33aa080d4ca5baa6
4
+X-next-at: 0c9c63564e25443fb8d0688fe3c87722ba128238
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2024, #07; Fri, 19)
7
+What's cooking in git.git (Apr 2024, #08; Mon, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,8 +17,6 @@ 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
-A preview release Git 2.45-rc0 has been tagged.
21
-
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
22
repositories have only a subset of branches.
@@ -48,36 +46,76 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
51
-[Graduated to 'master']
49
+[New Topics]
50
+
51
+* aj/stash-staged-fix (2024-04-22) 1 commit
52
+ - stash: fix "--staged" with binary files
53
+
54
+ "git stash -S" did not handle binary files correctly, which has
55
+ been corrected.
56
+
57
+ Will merge to 'next'.
58
+ source: <pull.1722.git.1713781694490.gitgitgadget@gmail.com>
59
+
60
+
61
+* rj/add-i-leak-fix (2024-04-22) 4 commits
62
+ - add: plug a leak on interactive_add
63
+ - add-patch: plug a leak handling the '/' command
64
+ - add-interactive: plug a leak in get_untracked_files
65
+ - apply: plug a leak in apply_data
66
+
67
+ Leakfix.
68
53
-* la/mailmap-entry (2024-04-16) 1 commit
54
- (merged to 'next' on 2024-04-17 at 440b18b8be)
55
- + mailmap: change primary address for Linus Arver
69
+ Will merge to 'next'.
70
+ source: <69f86760-96ff-4c62-9649-4627652b7c19@gmail.com>
71
+
72
+
73
+* rj/add-p-typo-reaction (2024-04-21) 1 commit
74
+ - add-patch: response to unknown command
75
57
- Update contact address for Linus Arver.
58
- source: <pull.1720.git.1713309711217.gitgitgadget@gmail.com>
76
+ When the user responds to a prompt given by "git add -p" with an
77
+ unsupported command, list of available commands were given, which
78
+ was too much if the user knew what they wanted to type but merely
79
+ made a typo. Now the user gets a much shorter error message.
80
+
81
+ Will merge to 'next'.
82
+ source: <b209a2b8-f98f-4f14-a687-9022d30968dd@gmail.com>
83
84
61
-* pf/commitish-committish (2024-04-11) 1 commit
62
- (merged to 'next' on 2024-04-12 at 7ef816cb64)
63
- + typo: replace 'commitish' with 'committish'
85
+* rs/vsnprintf-failure-is-not-a-bug (2024-04-21) 1 commit
86
+ - don't report vsnprintf(3) error as bug
87
65
- Spellfix.
66
- source: <20240407212111.55362-1-Pi.L.D.Fisher@gmail.com>
88
+ Demote a BUG() to an die() when the failure from vsnprintf() may
89
+ not be due to a programmer error.
90
+
91
+ Will merge to 'next'.
92
+ source: <ea752a2b-9b74-4a59-a037-4782abf7161e@web.de>
93
94
--------------------------------------------------
69
-[New Topics]
95
+[Cooking]
96
97
* ds/format-patch-rfc-and-k (2024-04-19) 1 commit
98
- format-patch: ensure that --rfc and -k are mutually exclusive
99
100
+ The "-k" and "--rfc" options of "format-patch" will now error out
101
+ when used together, as one tells us not to add anything to the
102
+ title of the commit, and the other one tells us to add "RFC" in
103
+ addition to "PATCH".
104
+
105
+ Will merge to 'next'.
106
source: <71d195c248879e7c46fac0e84c6b0a8aa90bd2c2.1713488563.git.dsimic@manjaro.org>
107
108
77
-* jc/format-patch-rfc-more (2024-04-18) 1 commit
109
+* jc/format-patch-rfc-more (2024-04-22) 2 commits
110
+ - format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)]
111
- format-patch: allow --rfc to optionally take a value, like --rfc=WIP
112
80
- source: <xmqqzftqnuxq.fsf@gitster.g>
113
+ The "--rfc" option of "git format-patch" learned to take an
114
+ optional string value to be used in place of "RFC" to tweak the
115
+ "[PATCH]" on the subject header.
116
+
117
+ Will merge to 'next'?
118
+ source: <20240421185915.1031590-1-gitster@pobox.com>
119
120
121
* ps/the-index-is-no-more (2024-04-18) 6 commits
@@ -88,6 +126,11 @@ Release tarballs are available at:
126
- builtin: stop using `the_index`
127
- t/helper: stop using `the_index`
128
129
+ The singleton index_state instance "the_index" has been eliminated
130
+ by always instantiating "the_repository" and replacing references
131
+ to "the_index" with references to its .index member.
132
+
133
+ Comments?
134
source: <cover.1713442061.git.ps@pks.im>
135
136
@@ -99,10 +142,13 @@ Release tarballs are available at:
142
- sequencer: always free "struct replay_opts"
143
- Merge branch 'pw/t3428-cleanup' into pw/rebase-m-signoff-fix
144
145
+ "git rebase --signoff" used to forget that it needs to add a
146
+ sign-off to the resulting commit when told to continue after a
147
+ conflict stops its operation.
148
+
149
+ Will merge to 'next'.
150
source: <cover.1713445918.git.phillip.wood@dunelm.org.uk>
151
104
---------------------------------------------------
105
-[Cooking]
152
153
* mr/rerere-crash-fix (2024-04-16) 1 commit
154
(merged to 'next' on 2024-04-17 at 60be8e2d74)
@@ -117,14 +163,15 @@ Release tarballs are available at:
163
164
165
* pk/bisect-use-show (2024-04-15) 1 commit
120
- - bisect: report the found commit with "show"
166
+ (merged to 'next' on 2024-04-22 at 4dd13c288f)
167
+ + bisect: report the found commit with "show"
168
169
When "git bisect" reports the commit it determined to be the
170
culprit, we used to show it in a format that does not honor common
171
UI tweaks, like log.date and log.decorate. The code has been
172
taught to use "git show" to follow more customizations.
173
127
- Will merge to 'next'.
174
+ Will merge to 'master'.
175
source: <965ae345-fd58-c46c-5a7a-de181e901f21@softwolves.pp.se>
176
177
@@ -202,19 +249,22 @@ Release tarballs are available at:
249
repositories it knows about, but it stopped at the first one that
250
errored out. Now it keeps going.
251
205
- Will merge to 'next'?
252
+ Expecting a hopefully small and final reroll.
253
+ Can change exit condition, which needs fixing.
254
+ cf. <20240419175621.GB14309@coredump.intra.peff.net>
255
source: <pull.1719.v2.git.1713444783.gitgitgadget@gmail.com>
256
257
258
* ps/run-auto-maintenance-in-receive-pack (2024-04-17) 2 commits
210
- - builtin/receive-pack: convert to use git-maintenance(1)
211
- - run-command: introduce function to prepare auto-maintenance process
259
+ (merged to 'next' on 2024-04-22 at cacdcac452)
260
+ + builtin/receive-pack: convert to use git-maintenance(1)
261
+ + run-command: introduce function to prepare auto-maintenance process
262
263
The "receive-pack" program (which responds to "git push") was not
264
converted to run "git maintenance --auto" when other codepaths that
265
used to run "git gc --auto" were updated, which has been corrected.
266
217
- Will merge to 'next'.
267
+ Will merge to 'master'.
268
source: <cover.1713334241.git.ps@pks.im>
269
270
@@ -329,7 +379,8 @@ Release tarballs are available at:
379
commit, the error experience is not pleasant. Such an error is now
380
caught earlier in the process that parses the todo list.
381
332
- Comments?
382
+ Expecting a reroll.
383
+ cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@gmail.com>
384
source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
385
386
@@ -371,6 +422,7 @@ Release tarballs are available at:
422
that has better memory usage characteristics.
423
424
Needs review.
425
+ cf. <xmqqy1a4ao3t.fsf@gitster.g>
426
source: <20240328101356.300374-1-e@80x24.org>
427
428
@@ -454,20 +506,22 @@ Release tarballs are available at:
506
source: <cover.1710972293.git.me@ttaylorr.com>
507
508
457
-* la/hide-trailer-info (2024-03-16) 7 commits
509
+* la/hide-trailer-info (2024-04-19) 9 commits
510
- trailer: retire trailer_info_get() from API
511
- trailer: make trailer_info struct private
512
- trailer: make parse_trailers() return trailer_info pointer
513
- interpret-trailers: access trailer_info with new helpers
514
- sequencer: use the trailer iterator
515
- trailer: teach iterator about non-trailer lines
516
+ - trailer: add unit tests for trailer iterator
517
+ - Makefile: sort UNIT_TEST_PROGRAMS
518
- Merge branch 'la/format-trailer-info' into la/hide-trailer-info
519
(this branch uses la/format-trailer-info.)
520
521
The trailer API has been reshuffled a bit.
522
523
Needs review.
470
- source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>
524
+ source: <pull.1696.v2.git.1713504153.gitgitgadget@gmail.com>
525
526
527
* ds/doc-config-reflow (2024-03-14) 1 commit
@@ -516,7 +570,7 @@ Release tarballs are available at:
570
that are used in fuzzer tests, to make sure at least they build
571
without bitrot, in Linux CI runs.
572
519
- Expecting a hopefully minor and final reroll.
573
+ Expecting a hopefully small and final reroll.
574
cf. <20240412042247.GA1077925@coredump.intra.peff.net>
575
source: <cover.1712858920.git.steadmon@google.com>
576