What's cooking (2023/08 #01)
Junio C Hamano committed
Aug 2, 2023 at 10:49 UTC
1bbcd54e582a645f5f0b680cc731af11f8af1116
1 file changed
+152
-128
whats-cooking.txt
+152
-128
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #07; Mon, 31)
3
-X-master-at: ee48e70a829d1fa2da82f14787051ad8e7c45b71
4
-X-next-at: 740a260315f663d112ca96dba50b607cb7269bdf
2
+Subject: What's cooking in git.git (Aug 2023, #01; Wed, 2)
3
+X-master-at: 1b0a5129563ebe720330fdc8f5c6843d27641137
4
+X-next-at: ed35a5117f890568bcd8290b0000b7550ab351b8
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #07; Mon, 31)
7
+What's cooking in git.git (Aug 2023, #01; Wed, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,15 @@ 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
+We are getting closer to the final phase of this cycle, which begins
21
+when -rc0 preview release is tagged this coming Friday, followed by
22
+about 1 1/2 weeks of stabilization period that begins when -rc1 is
23
+tagged (cf. tinyurl.com/gitCal). There are a handful of topics that
24
+still need reviews before getting merged to 'next', but because the
25
+summer in the northern hemisphere is historically a slower season,
26
+too few reviewers seem to be active, relative to the number of these
27
+topics.
28
+
29
Copies of the source code to Git live in many repositories, and the
30
following is a list of the ones I push into or their mirrors. Some
31
repositories have only a subset of branches.
@@ -46,63 +55,109 @@ Release tarballs are available at:
55
https://www.kernel.org/pub/software/scm/git/
56
57
--------------------------------------------------
49
-[New Topics]
58
+[Graduated to 'master']
59
51
-* jc/checkout-merge-fix (2023-07-28) 2 commits
52
- - checkout/restore: add basic tests for --merge
53
- - checkout/restore: refuse unmerging paths unless checking out of the index
60
+* ah/autoconf-fixes (2023-07-19) 3 commits
61
+ (merged to 'next' on 2023-07-25 at 35ff66e0cb)
62
+ + configure.ac: always save NO_ICONV to config.status
63
+ + configure.ac: don't overwrite NO_CURL option
64
+ + configure.ac: don't overwrite NO_EXPAT option
65
55
- "git checkout/restore --merge -- $path" improvements.
66
+ "./configure --with-expat=no" did not work as a way to refuse use
67
+ of the expat library on a system with the library installed, which
68
+ has been corrected.
69
+ source: <20230719145211.17854-2-aherrmann@suse.de>
70
57
- Needs review.
58
- source: <xmqq7cqj4rme.fsf@gitster.g>
71
72
+* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit
73
+ (merged to 'next' on 2023-07-26 at 24e74d9eda)
74
+ + sequencer: finish parsing the todo list despite an invalid first line
75
61
-* ew/sha256-gcrypt-leak-fixes (2023-07-31) 3 commits
62
- - sha256/gcrypt: die on gcry_md_open failures
63
- - sha256/gcrypt: fix memory leak with SHA-256 repos
64
- - sha256/gcrypt: fix build with SANITIZE=leak
76
+ When the user edits "rebase -i" todo file so that it starts with a
77
+ "fixup", which would make it invalid, the command truncated the
78
+ rest of the file before giving an error and returning the control
79
+ back to the user. Stop truncating to make it easier to correct
80
+ such a malformed todo file.
81
+ cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>
82
+ source: <20230722212830.132135-2-alexhenrie24@gmail.com>
83
66
- Leakfixes.
84
68
- Will merge to 'next'.
69
- source: <20230731120808.1230210-1-e@80x24.org>
85
+* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit
86
+ (merged to 'next' on 2023-07-26 at f2c2e3f2b9)
87
+ + wrapper: use trace2 counters to collect fsync stats
88
89
+ Instead of inventing a custom counter variables for debugging,
90
+ use existing trace2 facility in the fsync customization codepath.
91
+ source: <20230720164823.625815-1-dev+git@drbeat.li>
92
72
-* rs/bundle-parseopt-cleanup (2023-07-31) 1 commit
73
- - bundle: use OPT_PASSTHRU_ARGV
93
75
- Code clean-up.
94
+* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
95
+ (merged to 'next' on 2023-07-25 at cc050c60a6)
96
+ + tree-walk: drop unused base_offset from do_match()
97
+ + tree-walk: lose base_offset that is never used in tree_entry_interesting
98
77
- Will merge to 'next'.
78
- source: <2dcb915f-b926-e024-6394-23aff200955c@web.de>
99
+ Code simplification.
100
+ source: <20230707222116.4129415-1-gitster@pobox.com>
101
+
102
+
103
+* ks/ref-filter-describe (2023-07-24) 2 commits
104
+ (merged to 'next' on 2023-07-26 at f4b3b3b7ef)
105
+ + ref-filter: add new "describe" atom
106
+ + ref-filter: add multiple-option parsing functions
107
+
108
+ "git branch --list --format=<format>" and friends are taught
109
+ a new "%(describe)" placeholder.
110
+ source: <20230723162717.68123-1-five231003@gmail.com>
111
112
--------------------------------------------------
81
-[Graduated to 'master']
113
+[New Topics]
114
+
115
+* bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit
116
+ - ident: don't consider '.' a crud
117
+
118
+ Exclude "." from the set of characters to be removed from the
119
+ beginning and the end of the human-readable name.
120
+
121
+ Will merge to 'next'?
122
+ source: <xmqqsf918k4j.fsf@gitster.g>
123
+
124
+
125
+* jc/unresolve-removal (2023-07-31) 7 commits
126
+ - checkout: allow "checkout -m path" to unmerge removed paths
127
+ - checkout/restore: add basic tests for --merge
128
+ - checkout/restore: refuse unmerging paths unless checking out of the index
129
+ - update-index: remove stale fallback code for "--unresolve"
130
+ - update-index: use unmerge_index_entry() to support removal
131
+ - resolve-undo: allow resurrecting conflicted state that resolved to deletion
132
+ - update-index: do not read HEAD and MERGE_HEAD unconditionally
133
83
-* bb/trace2-comment-fix (2023-07-19) 1 commit
84
- (merged to 'next' on 2023-07-21 at f77aeba1b5)
85
- + trace2: fix a comment
134
+ "checkout --merge -- path" and "update-index --unresolve path" did
135
+ not resurrect conflicted state that was resolved to remove path,
136
+ but now they do.
137
87
- In-code comment fix.
88
- source: <20230719232444.555838-1-dev+git@drbeat.li>
138
+ Needs review.
139
+ source: <20230731224409.4181277-1-gitster@pobox.com>
140
+
141
+
142
+* ew/hash-with-openssl-evp (2023-08-01) 2 commits
143
+ - avoid SHA-1 functions deprecated in OpenSSL 3+
144
+ - sha256: avoid functions deprecated in OpenSSL 3+
145
146
+ Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
147
+ its traditional API, by using its EVP API instead.
148
91
-* rs/describe-parseopt-fix (2023-07-21) 1 commit
92
- (merged to 'next' on 2023-07-21 at e74749af0c)
93
- + describe: fix --no-exact-match
149
+ Will merge to 'next'.
150
+ source: <20230801025454.1137802-1-e@80x24.org>
151
95
- Command line parser fix.
96
- source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de>
152
153
+* rj/status-bisect-while-rebase (2023-08-01) 1 commit
154
+ - status: fix branch shown when not only bisecting
155
99
-* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits
100
- (merged to 'next' on 2023-07-21 at acdf84416c)
101
- + pack-objects: fix --no-quiet
102
- + pack-objects: fix --no-keep-true-parents
156
+ "git status" is taught to show both the branch being bisected and
157
+ being rebased when both are in effect at the same time.
158
104
- Command line parser fix.
105
- source: <xmqqo7k9fa5x.fsf@gitster.g>
159
+ Needs review.
160
+ source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
161
162
--------------------------------------------------
163
[Stalled]
@@ -146,27 +201,48 @@ Release tarballs are available at:
201
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
202
203
149
-* pw/rebase-i-after-failure (2023-04-21) 6 commits
204
+* pw/rebase-i-after-failure (2023-08-01) 7 commits
205
- rebase -i: fix adding failed command to the todo list
151
- - rebase: fix rewritten list for failed pick
206
- rebase --continue: refuse to commit after failed command
207
+ - rebase: fix rewritten list for failed pick
208
- sequencer: factor out part of pick_commits()
209
+ - sequencer: use rebase_path_message()
210
- rebase -i: remove patch file after conflict resolution
211
- rebase -i: move unlink() calls
212
213
Various fixes to the behaviour of "rebase -i" when the command got
214
interrupted by conflicting changes.
215
160
- Will discard.
161
- Have been expecting a reroll for too long.
162
- cf. <xmqqsfcthrpb.fsf@gitster.g>
163
- cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
164
- cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
165
- source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
216
+ Will merge to 'next'?
217
+ cf. <xmqqa5vad6ea.fsf@gitster.g>
218
+ cf. <xmqq5y5yd6d7.fsf@gitster.g>
219
+ source: <pull.1492.v3.git.1690903412.gitgitgadget@gmail.com>
220
221
--------------------------------------------------
222
[Cooking]
223
224
+* ew/sha256-gcrypt-leak-fixes (2023-07-31) 3 commits
225
+ (merged to 'next' on 2023-08-01 at eed83801c3)
226
+ + sha256/gcrypt: die on gcry_md_open failures
227
+ + sha256/gcrypt: fix memory leak with SHA-256 repos
228
+ + sha256/gcrypt: fix build with SANITIZE=leak
229
+
230
+ Leakfixes.
231
+
232
+ Will merge to 'master'.
233
+ source: <20230731120808.1230210-1-e@80x24.org>
234
+
235
+
236
+* rs/bundle-parseopt-cleanup (2023-07-31) 1 commit
237
+ (merged to 'next' on 2023-08-01 at 405eb138fa)
238
+ + bundle: use OPT_PASSTHRU_ARGV
239
+
240
+ Code clean-up.
241
+
242
+ Will merge to 'master'.
243
+ source: <2dcb915f-b926-e024-6394-23aff200955c@web.de>
244
+
245
+
246
* pv/doc-submodule-update-settings (2023-07-25) 1 commit
247
(merged to 'next' on 2023-07-27 at e27b5b7ba8)
248
+ doc: highlight that .gitmodules does not support !command
@@ -193,58 +269,9 @@ Release tarballs are available at:
269
source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
270
271
196
-* jc/resolve-undo-fixes (2023-07-28) 4 commits
197
- - update-index: remove stale fallback code for "--unresolve"
198
- - update-index: use unmerge_index_entry() to support removal
199
- - resolve-undo: allow resurrecting conflicted state that resolved to deletion
200
- - update-index: do not read HEAD and MERGE_HEAD unconditionally
201
-
202
- Assorted fixes and clean-up around resolve-undo data.
203
-
204
- Needs review.
205
- source: <xmqqo7jv4y0t.fsf_-_@gitster.g>
206
-
207
-
208
-* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit
209
- (merged to 'next' on 2023-07-26 at 24e74d9eda)
210
- + sequencer: finish parsing the todo list despite an invalid first line
211
-
212
- When the user edits "rebase -i" todo file so that it starts with a
213
- "fixup", which would make it invalid, the command truncated the
214
- rest of the file before giving an error and returning the control
215
- back to the user. Stop truncating to make it easier to correct
216
- such a malformed todo file.
217
-
218
- Will merge to 'master'.
219
- cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>
220
- source: <20230722212830.132135-2-alexhenrie24@gmail.com>
221
-
222
-
223
-* ks/ref-filter-describe (2023-07-24) 2 commits
224
- (merged to 'next' on 2023-07-26 at f4b3b3b7ef)
225
- + ref-filter: add new "describe" atom
226
- + ref-filter: add multiple-option parsing functions
227
-
228
- "git branch --list --format=<format>" and friends are taught
229
- a new "%(describe)" placeholder.
230
-
231
- Will merge to 'master'.
232
- source: <20230723162717.68123-1-five231003@gmail.com>
233
-
234
-
235
-* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit
236
- (merged to 'next' on 2023-07-26 at f2c2e3f2b9)
237
- + wrapper: use trace2 counters to collect fsync stats
238
-
239
- Instead of inventing a custom counter variables for debugging,
240
- use existing trace2 facility in the fsync customization codepath.
241
-
242
- Will merge to 'master'.
243
- source: <20230720164823.625815-1-dev+git@drbeat.li>
244
-
245
-
272
* am/doc-sha256 (2023-07-31) 1 commit
247
- - doc: sha256 is no longer experimental
273
+ (merged to 'next' on 2023-08-01 at d7419bf527)
274
+ + doc: sha256 is no longer experimental
275
276
Tone down the warning on SHA-256 repositories being an experimental
277
curiosity. We do not have support for them to interoperate with
@@ -252,7 +279,7 @@ Release tarballs are available at:
279
to make breaking changes to SHA-256 repositories and there is no
280
longer need for such a strongly phrased warning.
281
255
- Will merge to 'next'.
282
+ Will merge to 'master'.
283
source: <ZMe6KmzZGVubYpvO@adams>
284
285
@@ -374,20 +401,6 @@ Release tarballs are available at:
401
source: <20230718232916.31660-1-cheskaqiqi@gmail.com>
402
403
377
-* ah/autoconf-fixes (2023-07-19) 3 commits
378
- (merged to 'next' on 2023-07-25 at 35ff66e0cb)
379
- + configure.ac: always save NO_ICONV to config.status
380
- + configure.ac: don't overwrite NO_CURL option
381
- + configure.ac: don't overwrite NO_EXPAT option
382
-
383
- "./configure --with-expat=no" did not work as a way to refuse use
384
- of the expat library on a system with the library installed, which
385
- has been corrected.
386
-
387
- Will merge to 'master'.
388
- source: <20230719145211.17854-2-aherrmann@suse.de>
389
-
390
-
404
* jc/branch-in-use-error-message (2023-07-21) 1 commit
405
(merged to 'next' on 2023-07-31 at 22f17d131b)
406
+ branch: update the message to refuse touching a branch in-use
@@ -401,17 +414,6 @@ Release tarballs are available at:
414
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
415
416
404
-* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
405
- (merged to 'next' on 2023-07-25 at cc050c60a6)
406
- + tree-walk: drop unused base_offset from do_match()
407
- + tree-walk: lose base_offset that is never used in tree_entry_interesting
408
-
409
- Code simplification.
410
-
411
- Will merge to 'master'.
412
- source: <20230707222116.4129415-1-gitster@pobox.com>
413
-
414
-
417
* mh/credential-erase-improvements-more (2023-07-26) 2 commits
418
- credential/wincred: erase matching creds only
419
- credential/libsecret: erase matching creds only
@@ -451,7 +453,7 @@ Release tarballs are available at:
453
source: <0169ce6fb9ccafc089b74ae406db0d1a8ff8ac65.1688165272.git.steadmon@google.com>
454
455
454
-* jt/path-filter-fix (2023-07-25) 7 commits
456
+* jt/path-filter-fix (2023-08-01) 7 commits
457
- commit-graph: new filter ver. that fixes murmur3
458
- repo-settings: introduce commitgraph.changedPathsVersion
459
- t4216: test changed path filters with high bit paths
@@ -465,8 +467,8 @@ Release tarballs are available at:
467
bump the format version to 2.
468
469
Still under discussion.
468
- cf. <20230727205308.401364-1-jonathantanmy@google.com>
469
- source: <cover.1689889382.git.jonathantanmy@google.com>
470
+ cf. <20230801185232.1457172-1-jonathantanmy@google.com>
471
+ source: <cover.1690912539.git.jonathantanmy@google.com>
472
473
474
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
@@ -567,3 +569,25 @@ Release tarballs are available at:
569
Have been expecting a reroll for too long.
570
cf. <ZDSTFwMFO7vbj/du@google.com>
571
source: <ZDSTFwMFO7vbj/du@google.com>
572
+
573
+
574
+* jc/checkout-merge-fix (2023-07-28) 2 commits
575
+ . checkout/restore: add basic tests for --merge
576
+ . checkout/restore: refuse unmerging paths unless checking out of the index
577
+
578
+ "git checkout/restore --merge -- $path" improvements.
579
+
580
+ Superseded by jc/unresolve-removal
581
+ source: <xmqq7cqj4rme.fsf@gitster.g>
582
+
583
+
584
+* jc/resolve-undo-fixes (2023-07-28) 4 commits
585
+ . update-index: remove stale fallback code for "--unresolve"
586
+ . update-index: use unmerge_index_entry() to support removal
587
+ . resolve-undo: allow resurrecting conflicted state that resolved to deletion
588
+ . update-index: do not read HEAD and MERGE_HEAD unconditionally
589
+
590
+ Assorted fixes and clean-up around resolve-undo data.
591
+
592
+ Superseded by jc/unresolve-removal
593
+ source: <xmqqo7jv4y0t.fsf_-_@gitster.g>