1
1
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
5
6
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
8
--------------------------------------------------
9
9
10
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
17
no activity (of course they can be resubmit when new interests
18
18
arise).
19
19
20
- A preview release Git 2.45-rc0 has been tagged.
21
-
22
20
Copies of the source code to Git live in many repositories, and the
23
21
following is a list of the ones I push into or their mirrors. Some
24
22
repositories have only a subset of branches.
@@ -48,36 +46,76 @@ Release tarballs are available at:
48
46
https://www.kernel.org/pub/software/scm/git/
49
47
50
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
+
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.
52
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
+
71
+
72
+
73
+ * rj/add-p-typo-reaction (2024-04-21) 1 commit
74
+ - add-patch: response to unknown command
56
75
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
+
59
83
60
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
64
87
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
+
67
93
68
94
--------------------------------------------------
69
- [New Topics ]
95
+ [Cooking ]
70
96
71
97
* ds/format-patch-rfc-and-k (2024-04-19) 1 commit
72
98
- format-patch: ensure that --rfc and -k are mutually exclusive
73
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'.
74
106
source: <71d195c248879e7c46fac0e84c6b0a8aa90bd2c2.1713488563.git.dsimic@manjaro.org>
75
107
76
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)]
78
111
- format-patch: allow --rfc to optionally take a value, like --rfc=WIP
79
112
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
+
81
119
82
120
83
121
* ps/the-index-is-no-more (2024-04-18) 6 commits
@@ -88,6 +126,11 @@ Release tarballs are available at:
88
126
- builtin: stop using `the_index`
89
127
- t/helper: stop using `the_index`
90
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?
91
134
92
135
93
136
@@ -99,10 +142,13 @@ Release tarballs are available at:
99
142
- sequencer: always free "struct replay_opts"
100
143
- Merge branch 'pw/t3428-cleanup' into pw/rebase-m-signoff-fix
101
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'.
102
150
103
151
104
- --------------------------------------------------
105
- [Cooking]
106
152
107
153
* mr/rerere-crash-fix (2024-04-16) 1 commit
108
154
(merged to 'next' on 2024-04-17 at 60be8e2d74)
@@ -117,14 +163,15 @@ Release tarballs are available at:
117
163
118
164
119
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"
121
168
122
169
When "git bisect" reports the commit it determined to be the
123
170
culprit, we used to show it in a format that does not honor common
124
171
UI tweaks, like log.date and log.decorate. The code has been
125
172
taught to use "git show" to follow more customizations.
126
173
127
- Will merge to 'next '.
174
+ Will merge to 'master '.
128
175
129
176
130
177
@@ -202,19 +249,22 @@ Release tarballs are available at:
202
249
repositories it knows about, but it stopped at the first one that
203
250
errored out. Now it keeps going.
204
251
205
- Will merge to 'next'?
252
+ Expecting a hopefully small and final reroll.
253
+ Can change exit condition, which needs fixing.
254
+
206
255
207
256
208
257
209
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
212
262
213
263
The "receive-pack" program (which responds to "git push") was not
214
264
converted to run "git maintenance --auto" when other codepaths that
215
265
used to run "git gc --auto" were updated, which has been corrected.
216
266
217
- Will merge to 'next '.
267
+ Will merge to 'master '.
218
268
219
269
220
270
@@ -329,7 +379,8 @@ Release tarballs are available at:
329
379
commit, the error experience is not pleasant. Such an error is now
330
380
caught earlier in the process that parses the todo list.
331
381
332
- Comments?
382
+ Expecting a reroll.
383
+
333
384
334
385
335
386
@@ -371,6 +422,7 @@ Release tarballs are available at:
371
422
that has better memory usage characteristics.
372
423
373
424
Needs review.
425
+
374
426
375
427
376
428
@@ -454,20 +506,22 @@ Release tarballs are available at:
454
506
455
507
456
508
457
- * la/hide-trailer-info (2024-03-16) 7 commits
509
+ * la/hide-trailer-info (2024-04-19) 9 commits
458
510
- trailer: retire trailer_info_get() from API
459
511
- trailer: make trailer_info struct private
460
512
- trailer: make parse_trailers() return trailer_info pointer
461
513
- interpret-trailers: access trailer_info with new helpers
462
514
- sequencer: use the trailer iterator
463
515
- trailer: teach iterator about non-trailer lines
516
+ - trailer: add unit tests for trailer iterator
517
+ - Makefile: sort UNIT_TEST_PROGRAMS
464
518
- Merge branch 'la/format-trailer-info' into la/hide-trailer-info
465
519
(this branch uses la/format-trailer-info.)
466
520
467
521
The trailer API has been reshuffled a bit.
468
522
469
523
Needs review.
470
- source: <pull.1696.git.
1710570428 [email protected] >
524
+ source: <pull.1696.
v2. git.
1713504153 [email protected] >
471
525
472
526
473
527
* ds/doc-config-reflow (2024-03-14) 1 commit
@@ -516,7 +570,7 @@ Release tarballs are available at:
516
570
that are used in fuzzer tests, to make sure at least they build
517
571
without bitrot, in Linux CI runs.
518
572
519
- Expecting a hopefully minor and final reroll.
573
+ Expecting a hopefully small and final reroll.
520
574
521
575
522
576
0 commit comments