Skip to content

Commit 0d22412

Browse files
committed
What's cooking (2024/04 #8)
1 parent 3450424 commit 0d22412

File tree

1 file changed

+86
-32
lines changed

1 file changed

+86
-32
lines changed

whats-cooking.txt

Lines changed: 86 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
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
55
66

7-
What's cooking in git.git (Apr 2024, #07; Fri, 19)
7+
What's cooking in git.git (Apr 2024, #08; Mon, 22)
88
--------------------------------------------------
99

1010
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
1717
no activity (of course they can be resubmit when new interests
1818
arise).
1919

20-
A preview release Git 2.45-rc0 has been tagged.
21-
2220
Copies of the source code to Git live in many repositories, and the
2321
following is a list of the ones I push into or their mirrors. Some
2422
repositories have only a subset of branches.
@@ -48,36 +46,76 @@ Release tarballs are available at:
4846
https://www.kernel.org/pub/software/scm/git/
4947

5048
--------------------------------------------------
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+
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.
5268

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+
71+
72+
73+
* rj/add-p-typo-reaction (2024-04-21) 1 commit
74+
- add-patch: response to unknown command
5675

57-
Update contact address for Linus Arver.
58-
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+
5983

6084

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
6487

65-
Spellfix.
66-
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+
6793

6894
--------------------------------------------------
69-
[New Topics]
95+
[Cooking]
7096

7197
* ds/format-patch-rfc-and-k (2024-04-19) 1 commit
7298
- format-patch: ensure that --rfc and -k are mutually exclusive
7399

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'.
74106
source: <71d195c248879e7c46fac0e84c6b0a8aa90bd2c2.1713488563.git.dsimic@manjaro.org>
75107

76108

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)]
78111
- format-patch: allow --rfc to optionally take a value, like --rfc=WIP
79112

80-
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+
81119

82120

83121
* ps/the-index-is-no-more (2024-04-18) 6 commits
@@ -88,6 +126,11 @@ Release tarballs are available at:
88126
- builtin: stop using `the_index`
89127
- t/helper: stop using `the_index`
90128

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?
91134
92135

93136

@@ -99,10 +142,13 @@ Release tarballs are available at:
99142
- sequencer: always free "struct replay_opts"
100143
- Merge branch 'pw/t3428-cleanup' into pw/rebase-m-signoff-fix
101144

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'.
102150
103151

104-
--------------------------------------------------
105-
[Cooking]
106152

107153
* mr/rerere-crash-fix (2024-04-16) 1 commit
108154
(merged to 'next' on 2024-04-17 at 60be8e2d74)
@@ -117,14 +163,15 @@ Release tarballs are available at:
117163

118164

119165
* 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"
121168

122169
When "git bisect" reports the commit it determined to be the
123170
culprit, we used to show it in a format that does not honor common
124171
UI tweaks, like log.date and log.decorate. The code has been
125172
taught to use "git show" to follow more customizations.
126173

127-
Will merge to 'next'.
174+
Will merge to 'master'.
128175
129176

130177

@@ -202,19 +249,22 @@ Release tarballs are available at:
202249
repositories it knows about, but it stopped at the first one that
203250
errored out. Now it keeps going.
204251

205-
Will merge to 'next'?
252+
Expecting a hopefully small and final reroll.
253+
Can change exit condition, which needs fixing.
254+
206255
207256

208257

209258
* 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
212262

213263
The "receive-pack" program (which responds to "git push") was not
214264
converted to run "git maintenance --auto" when other codepaths that
215265
used to run "git gc --auto" were updated, which has been corrected.
216266

217-
Will merge to 'next'.
267+
Will merge to 'master'.
218268
219269

220270

@@ -329,7 +379,8 @@ Release tarballs are available at:
329379
commit, the error experience is not pleasant. Such an error is now
330380
caught earlier in the process that parses the todo list.
331381

332-
Comments?
382+
Expecting a reroll.
383+
333384
334385

335386

@@ -371,6 +422,7 @@ Release tarballs are available at:
371422
that has better memory usage characteristics.
372423

373424
Needs review.
425+
374426
375427

376428

@@ -454,20 +506,22 @@ Release tarballs are available at:
454506
455507

456508

457-
* la/hide-trailer-info (2024-03-16) 7 commits
509+
* la/hide-trailer-info (2024-04-19) 9 commits
458510
- trailer: retire trailer_info_get() from API
459511
- trailer: make trailer_info struct private
460512
- trailer: make parse_trailers() return trailer_info pointer
461513
- interpret-trailers: access trailer_info with new helpers
462514
- sequencer: use the trailer iterator
463515
- trailer: teach iterator about non-trailer lines
516+
- trailer: add unit tests for trailer iterator
517+
- Makefile: sort UNIT_TEST_PROGRAMS
464518
- Merge branch 'la/format-trailer-info' into la/hide-trailer-info
465519
(this branch uses la/format-trailer-info.)
466520

467521
The trailer API has been reshuffled a bit.
468522

469523
Needs review.
470-
source: <pull.1696.git.1710570428[email protected]>
524+
source: <pull.1696.v2.git.1713504153[email protected]>
471525

472526

473527
* ds/doc-config-reflow (2024-03-14) 1 commit
@@ -516,7 +570,7 @@ Release tarballs are available at:
516570
that are used in fuzzer tests, to make sure at least they build
517571
without bitrot, in Linux CI runs.
518572

519-
Expecting a hopefully minor and final reroll.
573+
Expecting a hopefully small and final reroll.
520574
521575
522576

0 commit comments

Comments
 (0)