What's cooking (2023/07 #07)
Junio C Hamano committed
Jul 31, 2023 at 10:02 UTC
93a884b351125b144fa4de329642d378e670df00
1 file changed
+104
-139
whats-cooking.txt
+104
-139
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2023, #06; Thu, 27)
3
-X-master-at: bfce02c22f3f1b0539686cabb69a637854448be3
4
-X-next-at: a95def55d0faaf65aa3e0af7c4586ec520f28f9a
2
+Subject: What's cooking in git.git (Jul 2023, #07; Mon, 31)
3
+X-master-at: ee48e70a829d1fa2da82f14787051ad8e7c45b71
4
+X-next-at: 740a260315f663d112ca96dba50b607cb7269bdf
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2023, #06; Thu, 27)
7
+What's cooking in git.git (Jul 2023, #07; Mon, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,109 +46,63 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
50
-
51
-* jc/am-parseopt-fix (2023-07-18) 1 commit
52
- (merged to 'next' on 2023-07-19 at eaf592531e)
53
- + am: simplify parsing of "--[no-]keep-cr"
54
-
55
- Code simplification.
56
- source: <xmqqr0p5gjv3.fsf@gitster.g>
57
-
58
-
59
-* jc/branch-parseopt-fix (2023-07-18) 1 commit
60
- (merged to 'next' on 2023-07-19 at 738d25bbb6)
61
- + branch: reject "--no-all" and "--no-remotes" early
62
-
63
- Command line parser fixes.
64
- source: <xmqqjzuxgjmi.fsf@gitster.g>
65
-
66
-
67
-* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
68
- (merged to 'next' on 2023-07-20 at ecfc9c6118)
69
- + gitignore.txt: mark up explanation of patterns consistently
70
-
71
- Doc mark-up update.
72
- source: <xmqqwmyxglhg.fsf@gitster.g>
73
-
74
-
75
-* jc/parse-options-reset (2023-07-19) 1 commit
76
- (merged to 'next' on 2023-07-20 at d2178a4bd4)
77
- + reset: reject --no-(mixed|soft|hard|merge|keep) option
78
-
79
- Command line parser fix.
80
- source: <xmqq1qh4c998.fsf@gitster.g>
81
-
49
+[New Topics]
50
83
-* jc/parse-options-show-branch (2023-07-19) 2 commits
84
- (merged to 'next' on 2023-07-20 at 4fa809c2f2)
85
- + show-branch: reject --[no-](topo|date)-order
86
- + show-branch: --no-sparse should give dense output
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
54
88
- Command line parser fixes.
89
- source: <xmqqh6pzc15n.fsf@gitster.g>
55
+ "git checkout/restore --merge -- $path" improvements.
56
57
+ Needs review.
58
+ source: <xmqq7cqj4rme.fsf@gitster.g>
59
92
-* jc/transport-parseopt-fix (2023-07-18) 2 commits
93
- (merged to 'next' on 2023-07-20 at 07f0026aaa)
94
- + fetch: reject --no-ipv[46]
95
- + parse-options: introduce OPT_IPVERSION()
60
97
- Command line parser fixes.
98
- source: <xmqqedl4gag8.fsf@gitster.g>
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
65
66
+ Leakfixes.
67
101
-* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
102
- (merged to 'next' on 2023-07-19 at 4f2ece568d)
103
- + gitignore.txt: use backticks instead of double quotes
68
+ Will merge to 'next'.
69
+ source: <20230731120808.1230210-1-e@80x24.org>
70
105
- Doc update.
106
- source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
71
72
+* rs/bundle-parseopt-cleanup (2023-07-31) 1 commit
73
+ - bundle: use OPT_PASSTHRU_ARGV
74
109
-* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
110
- (merged to 'next' on 2023-07-19 at 86e570c084)
111
- + ls-tree: fix --no-full-name
75
+ Code clean-up.
76
113
- Command line parser fix.
114
- source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
77
+ Will merge to 'next'.
78
+ source: <2dcb915f-b926-e024-6394-23aff200955c@web.de>
79
80
--------------------------------------------------
117
-[New Topics]
118
-
119
-* pv/doc-submodule-update-settings (2023-07-25) 1 commit
120
- (merged to 'next' on 2023-07-27 at e27b5b7ba8)
121
- + doc: highlight that .gitmodules does not support !command
122
-
123
- Rewrite the description of giving a custom command to the
124
- submodule.<name>.update configuraiton variable.
125
-
126
- Will merge to 'master'.
127
- source: <20230725212218.711116-1-pvutov@imap.cc>
81
+[Graduated to 'master']
82
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
86
130
-* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits
131
- - SubmittingPatches: use of older maintenance tracks is an exception
132
- - SubmittingPatches: explain why 'next' and above are inappropriate base
133
- - SubmittingPatches: choice of base for fixing an older maintenance track
134
- (this branch uses la/doc-choose-starting-point.)
87
+ In-code comment fix.
88
+ source: <20230719232444.555838-1-dev+git@drbeat.li>
89
136
- Clarify how to pick a starting point for a new topic in the
137
- SubmittingPatches document.
90
139
- Will merge to 'next'.
140
- source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
141
- source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
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
94
95
+ Command line parser fix.
96
+ source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de>
97
144
-* jc/resolve-undo-fixes (2023-07-27) 3 commits
145
- - update-index: use unmerge_index_entry() to support removal
146
- - resolve-undo: allow resurrecting conflicted state that resolved to deletion
147
- - update-index: do not read HEAD and MERGE_HEAD unconditionally
98
149
- Assorted fixes and clean-up around resolve-undo data.
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
103
151
- source: <xmqqtttp9g6r.fsf@gitster.g>
104
+ Command line parser fix.
105
+ source: <xmqqo7k9fa5x.fsf@gitster.g>
106
107
--------------------------------------------------
108
[Stalled]
@@ -213,6 +167,44 @@ Release tarballs are available at:
167
--------------------------------------------------
168
[Cooking]
169
170
+* pv/doc-submodule-update-settings (2023-07-25) 1 commit
171
+ (merged to 'next' on 2023-07-27 at e27b5b7ba8)
172
+ + doc: highlight that .gitmodules does not support !command
173
+
174
+ Rewrite the description of giving a custom command to the
175
+ submodule.<name>.update configuraiton variable.
176
+
177
+ Will merge to 'master'.
178
+ source: <20230725212218.711116-1-pvutov@imap.cc>
179
+
180
+
181
+* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits
182
+ (merged to 'next' on 2023-07-28 at 047dcae31c)
183
+ + SubmittingPatches: use of older maintenance tracks is an exception
184
+ + SubmittingPatches: explain why 'next' and above are inappropriate base
185
+ + SubmittingPatches: choice of base for fixing an older maintenance track
186
+ (this branch uses la/doc-choose-starting-point.)
187
+
188
+ Clarify how to pick a starting point for a new topic in the
189
+ SubmittingPatches document.
190
+
191
+ Will merge to 'master', together with the underlying topic.
192
+ source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
193
+ source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
194
+
195
+
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
@@ -228,16 +220,6 @@ Release tarballs are available at:
220
source: <20230722212830.132135-2-alexhenrie24@gmail.com>
221
222
231
-* bb/trace2-comment-fix (2023-07-19) 1 commit
232
- (merged to 'next' on 2023-07-21 at f77aeba1b5)
233
- + trace2: fix a comment
234
-
235
- In-code comment fix.
236
-
237
- Will merge to 'master'.
238
- source: <20230719232444.555838-1-dev+git@drbeat.li>
239
-
240
-
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
@@ -261,7 +243,7 @@ Release tarballs are available at:
243
source: <20230720164823.625815-1-dev+git@drbeat.li>
244
245
264
-* am/doc-sha256 (2023-07-20) 1 commit
246
+* am/doc-sha256 (2023-07-31) 1 commit
247
- doc: sha256 is no longer experimental
248
249
Tone down the warning on SHA-256 repositories being an experimental
@@ -270,18 +252,18 @@ Release tarballs are available at:
252
to make breaking changes to SHA-256 repositories and there is no
253
longer need for such a strongly phrased warning.
254
273
- Review comments sent.
274
- cf. <xmqqr0p230rj.fsf@gitster.g>
275
- source: <ZLlNtbAbVcYH7eFb@adams>
255
+ Will merge to 'next'.
256
+ source: <ZMe6KmzZGVubYpvO@adams>
257
258
259
* hy/blame-in-bare-with-contents (2023-07-21) 1 commit
279
- - blame: allow --contents to work with bare repo
260
+ (merged to 'next' on 2023-07-31 at 39ac96d8d8)
261
+ + blame: allow --contents to work with bare repo
262
263
"git blame --contents=file" has been taught to work in a bare
264
repository.
265
284
- Will merge to 'next'?
266
+ Will merge to 'master'.
267
source: <20230721035758.61956-1-hanyang.tony@bytedance.com>
268
269
@@ -297,27 +279,6 @@ Release tarballs are available at:
279
source: <20230726214202.15775-1-jacobabel@nullpo.dev>
280
281
300
-* rs/describe-parseopt-fix (2023-07-21) 1 commit
301
- (merged to 'next' on 2023-07-21 at e74749af0c)
302
- + describe: fix --no-exact-match
303
-
304
- Command line parser fix.
305
-
306
- Will merge to 'master'.
307
- source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de>
308
-
309
-
310
-* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits
311
- (merged to 'next' on 2023-07-21 at acdf84416c)
312
- + pack-objects: fix --no-quiet
313
- + pack-objects: fix --no-keep-true-parents
314
-
315
- Command line parser fix.
316
-
317
- Will merge to 'master'.
318
- source: <xmqqo7k9fa5x.fsf@gitster.g>
319
-
320
-
282
* jc/retire-get-sha1-hex (2023-07-24) 1 commit
283
(merged to 'next' on 2023-07-27 at eeb9cc37f5)
284
+ hex: retire get_sha1_hex()
@@ -349,15 +310,16 @@ Release tarballs are available at:
310
311
312
* tb/commit-graph-tests (2023-07-24) 5 commits
352
- - t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
353
- - t5328: avoid top-level directory changes
354
- - t5318: avoid top-level directory changes
355
- - t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`
356
- - t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories
313
+ (merged to 'next' on 2023-07-31 at 740a260315)
314
+ + t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
315
+ + t5328: avoid top-level directory changes
316
+ + t5318: avoid top-level directory changes
317
+ + t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`
318
+ + t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories
319
320
Test updates.
321
360
- Will merge to 'next'?
322
+ Will merge to 'master'.
323
source: <cover.1690216758.git.me@ttaylorr.com>
324
325
@@ -377,23 +339,25 @@ Release tarballs are available at:
339
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
340
341
380
-* jc/doc-sent-patch-now-what (2023-07-19) 1 commit
381
- - MyFirstContribution: refrain from self-iterating too much
342
+* jc/doc-sent-patch-now-what (2023-07-27) 1 commit
343
+ (merged to 'next' on 2023-07-31 at 51f5d9d465)
344
+ + MyFirstContribution: refrain from self-iterating too much
345
346
Process document update.
347
385
- Will merge to 'next'?
386
- source: <xmqqzga9opdu.fsf@gitster.g>
348
+ Will merge to 'master'.
349
+ source: <xmqqmszg987u.fsf_-_@gitster.g>
350
351
352
* jc/parse-options-short-help (2023-07-19) 3 commits
390
- - short help: allow a gap smaller than USAGE_GAP
391
- - remote: simplify "remote add --tags" help text
392
- - short help: allow multi-line opthelp
353
+ (merged to 'next' on 2023-07-31 at e076d1f497)
354
+ + short help: allow a gap smaller than USAGE_GAP
355
+ + remote: simplify "remote add --tags" help text
356
+ + short help: allow multi-line opthelp
357
358
Command line parser fix, and a small parse-options API update.
359
396
- Comments?
360
+ Will merge to 'master'.
361
source: <xmqq5y6gg8fn.fsf@gitster.g>
362
363
@@ -425,14 +389,15 @@ Release tarballs are available at:
389
390
391
* jc/branch-in-use-error-message (2023-07-21) 1 commit
428
- - branch: update the message to refuse touching a branch in-use
392
+ (merged to 'next' on 2023-07-31 at 22f17d131b)
393
+ + branch: update the message to refuse touching a branch in-use
394
395
"git branch -f X" to repoint the branch X seid that X was "checked
396
out" in another worktree, even when branch X was not and instead
397
being bisected or rebased. The message was reworded to say the
398
branch was "in use".
399
435
- Will merge to 'next'?
400
+ Will merge to 'master'.
401
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
402
403