What's cooking (2020/06 #01)
Junio C Hamano committed
Jun 3, 2020 at 13:58 UTC
a11b47e3ec95c39381b12708328d90c838033c63
1 file changed
+160
-155
whats-cooking.txt
+160
-155
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2020, #10; Sun, 31)
4
-X-master-at: 56219baf1eae50134ee05eaa64e26e7f1207042c
5
-X-next-at: 5238fbb8ea3e0d9159ed431f9042d31285ea2d15
3
+Subject: What's cooking in git.git (Jun 2020, #01; Wed, 3)
4
+X-master-at: 20514004ddf1a3528de8933bc32f284e175e1012
5
+X-next-at: ba653c62daa4884fe39d46cecbbcf7d8c13e7b61
6
7
-What's cooking in git.git (May 2020, #10; Sun, 31)
7
+What's cooking in git.git (Jun 2020, #01; Wed, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,27 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-Git 2.27 final soon.
15
+Git 2.27 has been tagged, and the first batch of topics (including
16
+the "throw protocol v2 to the experimental group of features" thing)
17
+have been merged to the 'master' branch. I'm planning to rewind the
18
+tip of 'next' in a not-so-distant future.
19
+
20
+Seeing a handful of regression reports [*] immediately after a
21
+feature release is made gives me a mixed feeling: people are eager
22
+enough to help by reporting issues they encounter, but there are not
23
+enough people who are eager enough to help by testing the tip of
24
+'master' before the release. Are there things we can do to help
25
+them become early adopters so that they do not have to scramble
26
+after the release?
27
+
28
+ * sparse-checkout
29
+ cf. <CAD3+_6CUX0RPr-dgfUnfGDNNfqu80SYCskioYnu=MS6aJv2dEQ@mail.gmail.com>
30
+
31
+ * untracked with pathspec
32
+ cf. <CAJmdR_pG74x0Zn43MSm7zXNcoitqjjOy+WnhyGBW+oFjVFLbRQ@mail.gmail.com>
33
+
34
+ * shallow point adjustment
35
+ cf. <20200603034213.GB253041@google.com>
36
37
You can find the changes described here in the integration branches
38
of the repositories listed at
@@ -22,52 +42,27 @@ of the repositories listed at
42
--------------------------------------------------
43
[Graduated to "master"]
44
25
-* bc/sha-256-part-1-of-4 (2020-05-27) 1 commit
26
- (merged to 'next' on 2020-05-27 at 7d66fd54f2)
27
- + Documentation: correct hash environment variable
28
-
29
- Docfix.
30
-
31
-
32
-* cb/test-use-ere-for-alternation (2020-05-29) 1 commit
33
- (merged to 'next' on 2020-05-29 at d90169ce5e)
34
- + t: avoid alternation (not POSIX) in grep's BRE
35
-
36
- Portability fix for tests added recently.
37
-
38
-
39
-* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
40
- (merged to 'next' on 2020-05-24 at 5f1f5ef66a)
41
- + ci/config: correct instruction for CI preferences
45
+* an/merge-single-strategy-optim (2020-05-19) 1 commit
46
+ (merged to 'next' on 2020-05-20 at 8d5cacc8d1)
47
+ + merge: optimization to skip evaluate_result for single strategy
48
43
- Dev support.
49
+ Code optimization for a common case.
50
51
46
-* ma/rev-list-options-docfix (2020-05-26) 1 commit
47
- (merged to 'next' on 2020-05-27 at 7cd09af7b1)
48
- + rev-list-options.txt: start a list for `show-pulls`
52
+* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
53
+ (merged to 'next' on 2020-05-24 at c1b4644b04)
54
+ + git-p4.py: fix --prepare-p4-only error with multiple commits
55
50
- Docfix.
56
+ The "--prepare-p4-only" option is supposed to stop after replaying
57
+ one changeset, but kept going (by mistake?)
58
+ cf. <CAE5ih797YYxsR2H0TA65w9W-1jF4jQLayja_nGjQMGtc=PB6Jw@mail.gmail.com>
59
52
---------------------------------------------------
53
-[New Topics]
60
55
-* cc/upload-pack-data-2 (2020-05-27) 12 commits
56
- - upload-pack: move pack_objects_hook to upload_pack_data
57
- - upload-pack: move allow_sideband_all to upload_pack_data
58
- - upload-pack: move allow_ref_in_want to upload_pack_data
59
- - upload-pack: move allow_filter to upload_pack_data
60
- - upload-pack: move keepalive to upload_pack_data
61
- - upload-pack: pass upload_pack_data to upload_pack_config()
62
- - upload-pack: change multi_ack to an enum
63
- - upload-pack: move multi_ack to upload_pack_data
64
- - upload-pack: move filter_capability_requested to upload_pack_data
65
- - upload-pack: move use_sideband to upload_pack_data
66
- - upload-pack: move static vars to upload_pack_data
67
- - upload-pack: actually use some upload_pack_data bitfields
68
- (this branch uses cc/upload-pack-data.)
61
+* cb/t5608-cleanup (2020-05-24) 1 commit
62
+ (merged to 'next' on 2020-05-24 at 2bfa581890)
63
+ + t5608: avoid say() and use "skip_all" instead for consistency
64
70
- Further code clean-up.
65
+ Test fixup.
66
67
68
* en/fast-import-looser-date (2020-05-31) 1 commit
@@ -79,16 +74,40 @@ of the repositories listed at
74
option to pass these nonsense timestamps intact to allow recreating
75
existing repositories as-is.
76
82
- Will cook in 'next'.
77
78
+* jn/experimental-opts-into-proto-v2 (2020-05-21) 1 commit
79
+ (merged to 'next' on 2020-05-24 at 53cd664dfe)
80
+ + config: let feature.experimental imply protocol.version=2
81
85
-* js/checkout-p-new-file (2020-05-27) 1 commit
86
- (merged to 'next' on 2020-05-31 at 017c325bf6)
87
- + checkout -p: handle new files correctly
82
+ "feature.experimental" configuration variable is to let volunteers
83
+ easily opt into a set of newer features, which use of the v2
84
+ transport protocol is now a part of.
85
89
- "git checkout -p" did not handle a newly added path at all.
86
91
- Will cook in 'next'.
87
+* jx/pkt-line-doc-count-fix (2020-05-21) 1 commit
88
+ (merged to 'next' on 2020-05-24 at 7115240db4)
89
+ + doc: fix wrong 4-byte length of pkt-line message
90
+
91
+ Docfix.
92
+
93
+
94
+* la/diff-relative-config (2020-05-24) 1 commit
95
+ (merged to 'next' on 2020-05-26 at b4604e6abc)
96
+ + diff: add config option relative
97
+
98
+ The commands in the "diff" family learned to honor "diff.relative"
99
+ configuration variable.
100
+
101
+
102
+* lo/sparse-universal-zero-init (2020-05-24) 1 commit
103
+ (merged to 'next' on 2020-05-24 at 1f4ea6b348)
104
+ + sparse: allow '{ 0 }' to be used without warnings
105
+
106
+ We've adopted a convention that any on-stack structure can be
107
+ initialized to have zero values in all fields with "= { 0 }", even
108
+ when the first field happens to be a pointer, but sparse complained
109
+ that a null pointer should be spelled NULL for a long time. Start
110
+ using -Wno-universal-initializer option to squelch it.
111
112
113
* mt/zsh-completion-optim (2020-05-28) 1 commit
@@ -97,16 +116,44 @@ of the repositories listed at
116
117
Command line completion (incontrib/) update.
118
100
- Will cook in 'next'.
119
120
+* rs/checkout-b-track-error (2020-05-24) 2 commits
121
+ (merged to 'next' on 2020-05-26 at 9220e43203)
122
+ + checkout: improve error messages for -b with extra argument
123
+ + checkout: add tests for -b and --track
124
103
-* xl/upgrade-repo-format (2020-05-29) 1 commit
104
- - fetch: allow adding a filter after initial clone
125
+ The error message from "git checkout -b foo -t bar baz" was
126
+ confusing.
127
106
- Allow runtime upgrade of the repository format version, which needs
107
- to be done carefully.
128
+--------------------------------------------------
129
+[New Topics]
130
+
131
+* jk/diff-memuse-optim-with-stat-unmatch (2020-06-02) 1 commit
132
+ - diff: discard blob data from stat-unmatched pairs
133
+
134
+ Reduce memory usage during "diff --quiet" in a worktree with too
135
+ many stat-unmatched paths.
136
+
137
+ Will merge to 'next'.
138
+
139
+
140
+* js/reflog-anonymize-for-clone-and-fetch (2020-06-02) 1 commit
141
+ - clone/fetch: anonymize URLs in the reflog
142
+
143
+ The reflog entries for "git clone" and "git fetch" did not
144
+ anonymize the URL they operated on.
145
+
146
+ Will merge to 'next'.
147
+
148
+
149
+* tb/t5318-cleanup (2020-06-02) 2 commits
150
+ - t5318: test that '--stdin-commits' respects '--[no-]progress'
151
+ - t5318: use 'test_must_be_empty'
152
+
153
+ Code cleanup.
154
155
Almost there.
156
+ cf. <20200602180403.GA4791@szeder.dev>
157
158
--------------------------------------------------
159
[Stalled]
@@ -133,7 +180,7 @@ of the repositories listed at
180
181
The effort to avoid using test_must_fail on non-git command continues.
182
136
- Waiting for a review thread to settle.
183
+ Expecting a reroll.
184
cf. <20200521182928.GA1308647@coredump.intra.peff.net>
185
The last step is a bit too ugly to live; Peff seems to have better
186
ideas.
@@ -169,6 +216,46 @@ of the repositories listed at
216
--------------------------------------------------
217
[Cooking]
218
219
+* cc/upload-pack-data-2 (2020-06-02) 14 commits
220
+ - fixup! upload-pack: change multi_ack to an enum
221
+ - upload-pack: move pack_objects_hook to upload_pack_data
222
+ - upload-pack: move allow_sideband_all to upload_pack_data
223
+ - upload-pack: move allow_ref_in_want to upload_pack_data
224
+ - upload-pack: move allow_filter to upload_pack_data
225
+ - upload-pack: move keepalive to upload_pack_data
226
+ - upload-pack: pass upload_pack_data to upload_pack_config()
227
+ - upload-pack: change multi_ack to an enum
228
+ - upload-pack: move multi_ack to upload_pack_data
229
+ - upload-pack: move filter_capability_requested to upload_pack_data
230
+ - upload-pack: move use_sideband to upload_pack_data
231
+ - upload-pack: move static vars to upload_pack_data
232
+ - upload-pack: annotate upload_pack_data fields
233
+ - upload-pack: actually use some upload_pack_data bitfields
234
+ (this branch uses cc/upload-pack-data.)
235
+
236
+ Further code clean-up.
237
+
238
+ Almost there.
239
+
240
+
241
+* js/checkout-p-new-file (2020-05-27) 1 commit
242
+ (merged to 'next' on 2020-05-31 at 017c325bf6)
243
+ + checkout -p: handle new files correctly
244
+
245
+ "git checkout -p" did not handle a newly added path at all.
246
+
247
+ Will merge to 'master'.
248
+
249
+
250
+* xl/upgrade-repo-format (2020-05-29) 1 commit
251
+ - fetch: allow adding a filter after initial clone
252
+
253
+ Allow runtime upgrade of the repository format version, which needs
254
+ to be done carefully.
255
+
256
+ Almost there.
257
+
258
+
259
* jk/complete-git-switch (2020-05-28) 16 commits
260
- completion: improve handling of --orphan option of switch/checkout
261
- completion: improve handling of -c/-C and -b/-B in switch/checkout
@@ -206,7 +293,7 @@ of the repositories listed at
293
294
Code simplification and test coverage enhancement.
295
209
- Will cook in 'next'.
296
+ Will merge to 'master'.
297
298
299
* cb/bisect-helper-parser-fix (2020-05-24) 1 commit
@@ -216,27 +303,7 @@ of the repositories listed at
303
The code to parse "git bisect start" command line was lax in
304
validating the arguments.
305
219
- Will cook in 'next'.
220
-
221
-
222
-* jn/experimental-opts-into-proto-v2 (2020-05-21) 1 commit
223
- (merged to 'next' on 2020-05-24 at 53cd664dfe)
224
- + config: let feature.experimental imply protocol.version=2
225
-
226
- "feature.experimental" configuration variable is to let volunteers
227
- easily opt into a set of newer features, which use of the v2
228
- transport protocol is now a part of.
229
-
230
- Will cook in 'next'.
231
-
232
-
233
-* jx/pkt-line-doc-count-fix (2020-05-21) 1 commit
234
- (merged to 'next' on 2020-05-24 at 7115240db4)
235
- + doc: fix wrong 4-byte length of pkt-line message
236
-
237
- Docfix.
238
-
239
- Will cook in 'next'.
306
+ Will merge to 'master'.
307
308
309
* rs/fsck-duplicate-names-in-trees (2020-05-21) 4 commits
@@ -249,18 +316,18 @@ of the repositories listed at
316
The check in "git fsck" to ensure that the tree objects are sorted
317
still had corner cases it missed unsorted entries.
318
252
- Will cook in 'next'.
319
+ Will merge to 'master'.
320
321
255
-* ss/submodule-set-branch-in-c (2020-05-24) 2 commits
256
- - fixup! submodule: port subcommand 'set-branch' from shell to C
322
+* ss/submodule-set-branch-in-c (2020-06-02) 1 commit
323
- submodule: port subcommand 'set-branch' from shell to C
324
325
Rewrite of parts of the scripted "git submodule" Porcelain command
326
continues; this time it is "git submodule set-branch" subcommand's
327
turn.
328
263
- cf. <20200523231838.GB1981@danh.dev>
329
+ Almost there.
330
+ cf. <1b851e49-3bb1-3b59-7f24-b903c5514391@gmail.com>
331
332
333
* vs/complete-stash-show-p-fix (2020-05-21) 1 commit
@@ -272,16 +339,7 @@ of the repositories listed at
339
aggressive and also affected "git stash show -p", which has been
340
corrected.
341
275
- Will cook in 'next'.
276
-
277
-
278
-* cb/t5608-cleanup (2020-05-24) 1 commit
279
- (merged to 'next' on 2020-05-24 at 2bfa581890)
280
- + t5608: avoid say() and use "skip_all" instead for consistency
281
-
282
- Test fixup.
283
-
284
- Will cook in 'next'.
342
+ Will merge to 'master'.
343
344
345
* es/config-hooks (2020-05-21) 4 commits
@@ -291,30 +349,6 @@ of the repositories listed at
349
. doc: propose hooks managed by the config
350
351
294
-* rs/checkout-b-track-error (2020-05-24) 2 commits
295
- (merged to 'next' on 2020-05-26 at 9220e43203)
296
- + checkout: improve error messages for -b with extra argument
297
- + checkout: add tests for -b and --track
298
-
299
- The error message from "git checkout -b foo -t bar baz" was
300
- confusing.
301
-
302
- Will cook in 'next'.
303
-
304
-
305
-* lo/sparse-universal-zero-init (2020-05-24) 1 commit
306
- (merged to 'next' on 2020-05-24 at 1f4ea6b348)
307
- + sparse: allow '{ 0 }' to be used without warnings
308
-
309
- We've adopted a convention that any on-stack structure can be
310
- initialized to have zero values in all fields with "= { 0 }", even
311
- when the first field happens to be a pointer, but sparse complained
312
- that a null pointer should be spelled NULL for a long time. Start
313
- using -Wno-universal-initializer option to squelch it.
314
-
315
- Will cook in 'next'.
316
-
317
-
352
* pw/rebase-i-more-options (2020-05-27) 5 commits
353
- rebase: add --reset-author-date
354
- rebase -i: support --ignore-date
@@ -328,15 +362,6 @@ of the repositories listed at
362
cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
363
364
331
-* an/merge-single-strategy-optim (2020-05-19) 1 commit
332
- (merged to 'next' on 2020-05-20 at 8d5cacc8d1)
333
- + merge: optimization to skip evaluate_result for single strategy
334
-
335
- Code optimization for a common case.
336
-
337
- Will cook in 'next'.
338
-
339
-
365
* cc/upload-pack-data (2020-05-18) 13 commits
366
(merged to 'next' on 2020-05-29 at 66008d9209)
367
+ upload-pack: use upload_pack_data fields in receive_needs()
@@ -356,7 +381,7 @@ of the repositories listed at
381
382
Code clean-up.
383
359
- Will cook in 'next'.
384
+ Will merge to 'master'.
385
386
387
* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
@@ -374,17 +399,7 @@ of the repositories listed at
399
prematurely throws an error and disconnects. The communication has
400
been updated to make it more robust.
401
377
- Will cook in 'next'.
378
-
379
-
380
-* la/diff-relative-config (2020-05-24) 1 commit
381
- (merged to 'next' on 2020-05-26 at b4604e6abc)
382
- + diff: add config option relative
383
-
384
- The commands in the "diff" family learned to honor "diff.relative"
385
- configuration variable.
386
-
387
- Will cook in 'next'.
402
+ Will merge to 'master'.
403
404
405
* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
@@ -396,18 +411,7 @@ of the repositories listed at
411
a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
412
automatically and skip the affected tests.
413
399
- Will cook in 'next'.
400
-
401
-
402
-* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
403
- (merged to 'next' on 2020-05-24 at c1b4644b04)
404
- + git-p4.py: fix --prepare-p4-only error with multiple commits
405
-
406
- The "--prepare-p4-only" option is supposed to stop after replaying
407
- one changeset, but kept going (by mistake?)
408
-
409
- Will cook in 'next'.
410
- cf. <CAE5ih797YYxsR2H0TA65w9W-1jF4jQLayja_nGjQMGtc=PB6Jw@mail.gmail.com>
414
+ Will merge to 'master'.
415
416
417
* jt/curl-verbose-on-trace-curl (2020-05-11) 2 commits
@@ -420,7 +424,8 @@ of the repositories listed at
424
Expecting further work on optionally disabling redacting authinfo
425
426
423
-* mt/grep-sparse-checkout (2020-05-28) 5 commits
427
+* mt/grep-sparse-checkout (2020-06-02) 6 commits
428
+ - git.c: fix sparse warning
429
- config: add setting to ignore sparsity patterns in some cmds
430
- grep: honor sparse checkout patterns
431
- config: correctly read worktree configs in submodules
@@ -430,7 +435,7 @@ of the repositories listed at
435
"git grep" has been tweaked to be limited to the sparse checkout
436
paths.
437
433
- Expecting further polishing.
438
+ Expecting a reroll.
439
cf. <cover.1590627264.git.matheus.bernardino@usp.br>
440
cf. <CABPp-BFsCPPNOZ92JQRJeGyNd0e-TCW-LcLyr0i_+VSQJP+GCg@mail.gmail.com>
441
@@ -491,7 +496,7 @@ of the repositories listed at
496
497
"git bugreport" learns to report what shell is in use.
498
494
- Will cook in 'next'.
499
+ Will merge to 'master'.
500
We may want to learn more details than just the path, but
501
that can come later.
502
cf. <20200512235924.GC6605@camp.crustytoothpaste.net>
@@ -508,7 +513,7 @@ of the repositories listed at
513
"git log -L..." now takes advantage of the "which paths are touched
514
by this commit?" info stored in the commit-graph system.
515
511
- Will cook in 'next'.
516
+ Will merge to 'master'.
517
518
519
* tb/commit-graph-no-check-oids (2020-05-18) 8 commits
@@ -524,7 +529,7 @@ of the repositories listed at
529
530
Clean-up the commit-graph codepath.
531
527
- Will cook in 'next'.
532
+ Will merge to 'master'.
533
534
535
* jx/proc-receive-hook (2020-05-18) 11 commits
@@ -561,7 +566,7 @@ of the repositories listed at
566
Preliminary clean-ups around refs API, plus file format
567
specification documentation for the reftable backend.
568
564
- Will cook in 'next'.
569
+ Will merge to 'master' after squashing the fix in.
570
We probably would want to squash the fix at the tip to an earlier
571
step when we rewind the 'next' branch.
572