What's cooking (2020/05 #08)
Junio C Hamano committed
May 24, 2020 at 20:21 UTC
a0904f941e96cd9817b79030c582aa1267f28a20
1 file changed
+207
-169
whats-cooking.txt
+207
-169
@@ -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, #07; Wed, 20)
4
-X-master-at: 87680d32efb6d14f162e54ad3bda4e3d6c908559
5
-X-next-at: 8d5cacc8d1ede34c079dff20da097c4e1f481d2c
3
+Subject: What's cooking in git.git (May 2020, #08; Sun, 24)
4
+X-master-at: d2ecc46c0981fb829fdfb204604ed0a2798cbe07
5
+X-next-at: 59ed0186f21322539283e0ada8b0e692051b5445
6
7
-What's cooking in git.git (May 2020, #07; Wed, 20)
7
+What's cooking in git.git (May 2020, #08; Sun, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,8 @@ 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-rc1 has been tagged. There are a handful of topics to
16
-further fix-up what we have been built during this cycle still not
17
-in 'next', and they will be merged to 'next' later today and then
18
-down to 'master' before -rc2.
15
+Git 2.27-rc2 will be tagged soon, but most of the topics planned for
16
+it are already in 'master'.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -25,114 +23,189 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
28
-* ak/slab-decl-cleanup (2020-05-18) 1 commit
29
- (merged to 'next' on 2020-05-19 at 7de41005de)
30
- + commit-slab-decl.h: update include guard
26
+* bc/faq (2020-05-20) 1 commit
27
+ (merged to 'next' on 2020-05-21 at ab3fc8fb75)
28
+ + command-list.txt: add gitfaq to the list of guides
29
32
- Code clean-up.
30
+ "git help guides" now includes the newly added FAQ document.
31
32
35
-* cb/no-more-gmtime (2020-05-14) 1 commit
36
- (merged to 'next' on 2020-05-15 at 160e0ada09)
37
- + compat: remove gmtime
33
+* cb/bisect-replay-with-dos-fix (2020-05-20) 1 commit
34
+ (merged to 'next' on 2020-05-21 at ebcc6eb30e)
35
+ + bisect: avoid tailing CR characters from revision in replay
36
39
- Code clean-up by removing a compatibility implementation of a
40
- function we no longer use.
37
+ Re-fix longstanding "edited bisect log may confuse bisect replay
38
+ with trailing carriage-return" issue.
39
40
43
-* dd/t1509-i18n-fix (2020-05-13) 1 commit
44
- (merged to 'next' on 2020-05-15 at a6342455c1)
45
- + t1509: correct i18n test
41
+* dd/t5703-grep-a-fix (2020-05-19) 1 commit
42
+ (merged to 'next' on 2020-05-21 at b85828341f)
43
+ + t5703: replace "grep -a" usage by perl
44
47
- A few tests were not i18n clean.
45
+ Update an unconditional use of "grep -a" with a perl script in a test.
46
47
50
-* ds/trace-log-progress-fix (2020-05-15) 1 commit
51
- (merged to 'next' on 2020-05-15 at d82c1fd03f)
52
- + progress: call trace2_region_leave() only after calling _enter()
48
+* dl/merge-autostash (2020-05-20) 1 commit
49
+ (merged to 'next' on 2020-05-21 at 985d87225d)
50
+ + t5520: avoid alternation in grep's BRE (not POSIX)
51
54
- Last-minute fix for our recent change to allow use of progress API
55
- as a traceable region.
52
+ Test fix.
53
54
58
-* en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
59
- (merged to 'next' on 2020-05-15 at 7e1ddfa3c9)
60
- + merge-recursive: fix rename/rename(1to2) for working tree with a binary
55
+* ds/multi-pack-verify (2020-05-19) 1 commit
56
+ (merged to 'next' on 2020-05-21 at a337d6352c)
57
+ + fsck: use ERROR_MULTI_PACK_INDEX
58
62
- When a binary file gets modified and renamed on both sides of history
63
- to different locations, both files would be written to the working
64
- tree but both would have the contents from "ours". This has been
65
- corrected so that the path from each side gets their original content.
59
+ Fix for a copy-and-paste error introduced during 2.20 era.
60
61
68
-* en/sparse-checkout (2020-05-15) 1 commit
69
- (merged to 'next' on 2020-05-15 at d4b3058787)
70
- + unpack-trees: also allow get_progress() to work on a different index
62
+* gp/hppa-stack-test-fix (2020-05-18) 1 commit
63
+ (merged to 'next' on 2020-05-20 at 57ed63b4ad)
64
+ + tests: skip small-stack tests on hppa architecture
65
72
- Consistency fix to a topic already in 'master'.
66
+ Platform dependent tweak to a test for HP-PA.
67
68
75
-* es/bugreport (2020-05-18) 1 commit
76
- (merged to 'next' on 2020-05-19 at ede8c892b8)
77
- + git-bugreport.txt: adjust reference to strftime(3)
69
+* gs/commit-graph-path-filter (2020-05-20) 1 commit
70
+ (merged to 'next' on 2020-05-21 at e563529d0a)
71
+ + t4216: avoid unnecessary subshell in test_bloom_filters_not_used
72
79
- Doc fix.
73
+ Test fix.
74
75
82
-* jc/fix-tap-output-under-bash (2020-05-15) 3 commits
83
- (merged to 'next' on 2020-05-15 at de8f92d652)
84
- + Revert "tests: when run in Bash, annotate test failures with file name/line number"
85
- + Revert "ci: add a problem matcher for GitHub Actions"
86
- + Revert "t/test_lib: avoid naked bash arrays in file_lineno"
76
+* jt/avoid-prefetch-when-able-in-diff (2020-05-19) 1 commit
77
+ (merged to 'next' on 2020-05-21 at 4fa6f05ea4)
78
+ + t4067: make rename detection test output raw diff
79
88
- A recent attempt to make the test output nicer to view on CI
89
- systems broke TAP output under bash. The effort has been reverted
90
- to be re-attempted in the next cycle.
80
+ Test-coverage enhancement.
81
82
93
-* js/ci-sdk-download-fix (2020-05-15) 1 commit
94
- (merged to 'next' on 2020-05-15 at 9b28f7ec87)
95
- + ci: avoid pounding on the poor ci-artifacts container
83
+* ma/doc-fixes (2020-05-18) 5 commits
84
+ (merged to 'next' on 2020-05-21 at 0f5e748d23)
85
+ + git-sparse-checkout.txt: add missing '
86
+ + git-credential.txt: use list continuation
87
+ + git-commit-graph.txt: fix list rendering
88
+ + git-commit-graph.txt: fix grammo
89
+ + date-formats.txt: fix list continuation
90
97
- Instead of downloading Windows SDK for CI jobs for windows builds
98
- from an external site (wingit.blob.core.windows.net), use the one
99
- created in the windows-build job, to work around quota issues at
100
- the external site.
91
+ Various doc fixes.
92
93
--------------------------------------------------
94
[New Topics]
95
105
-* bc/faq (2020-05-20) 1 commit
106
- - command-list.txt: add gitfaq to the list of guides
96
+* bc/filter-process (2020-05-21) 2 commits
97
+ (merged to 'next' on 2020-05-24 at 3d51328096)
98
+ + t2060: add a test for switch with --orphan and --discard-changes
99
+ + builtin/checkout: simplify metadata initialization
100
108
- "git help guides" now includes the newly added FAQ document.
101
+ Code simplification and test coverage enhancement.
102
110
- Will merge to 'next' and then to 'master'.
103
+ Will cook in 'next'.
104
105
113
-* cb/bisect-replay-with-dos-fix (2020-05-20) 1 commit
114
- - bisect: avoid tailing CR characters from revision in replay
106
+* cb/bisect-helper-parser-fix (2020-05-24) 1 commit
107
+ (merged to 'next' on 2020-05-24 at d30e10fa86)
108
+ + bisect--helper: avoid segfault with bad syntax in `start --term-*`
109
116
- Re-fix longstanding "edited bisect log may confuse bisect replay
117
- with trailing carriage-return" issue.
110
+ The code to parse "git bisect start" command line was lax in
111
+ validating the arguments.
112
119
- Will merge to 'next' and then to 'master'.
113
+ Will cook in 'next'.
114
115
122
-* dl/merge-autostash (2020-05-20) 1 commit
123
- - t5520: avoid alternation in grep's BRE (not POSIX)
116
+* jn/experimental-opts-into-proto-v2 (2020-05-21) 1 commit
117
+ (merged to 'next' on 2020-05-24 at 53cd664dfe)
118
+ + config: let feature.experimental imply protocol.version=2
119
125
- Test fix.
120
+ "feature.experimental" configuration variable is to let volunteers
121
+ easily opt into a set of newer features, which use of the v2
122
+ transport protocol is now a part of.
123
127
- Will merge to 'next' and then to 'master'.
124
+ Will cook in 'next'.
125
126
130
-* gs/commit-graph-path-filter (2020-05-20) 1 commit
131
- - t4216: avoid unnecessary subshell in test_bloom_filters_not_used
127
+* jx/pkt-line-doc-count-fix (2020-05-21) 1 commit
128
+ (merged to 'next' on 2020-05-24 at 7115240db4)
129
+ + doc: fix wrong 4-byte length of pkt-line message
130
133
- Test fix.
131
+ Docfix.
132
135
- Will merge to 'next' and then to 'master'.
133
+ Will cook in 'next'.
134
+
135
+
136
+* rs/fsck-duplicate-names-in-trees (2020-05-21) 4 commits
137
+ (merged to 'next' on 2020-05-24 at 6e1d6ba087)
138
+ + fsck: detect more in-tree d/f conflicts
139
+ + t1450: demonstrate undetected in-tree d/f conflict
140
+ + t1450: increase test coverage of in-tree d/f detection
141
+ + fsck: fix a typo in a comment
142
+
143
+ The check in "git fsck" to ensure that the tree objects are sorted
144
+ still had corner cases it missed unsorted entries.
145
+
146
+ Will cook in 'next'.
147
+
148
+
149
+* ss/submodule-set-branch-in-c (2020-05-24) 2 commits
150
+ - fixup! submodule: port subcommand 'set-branch' from shell to C
151
+ - submodule: port subcommand 'set-branch' from shell to C
152
+
153
+ Rewrite of parts of the scripted "git submodule" Porcelain command
154
+ continues; this time it is "git submodule set-branch" subcommand's
155
+ turn.
156
+
157
+ cf. <20200523231838.GB1981@danh.dev>
158
+
159
+
160
+* vs/complete-stash-show-p-fix (2020-05-21) 1 commit
161
+ (merged to 'next' on 2020-05-24 at fcbff29a0f)
162
+ + completion: don't override given stash subcommand with -p
163
+
164
+ The command line completion script (in contrib/) tried to complete
165
+ "git stash -p" as if it were "git stash push -p", but it was too
166
+ aggressive and also affected "git stash show -p", which has been
167
+ corrected.
168
+
169
+ Will cook in 'next'.
170
+
171
+
172
+* cb/t5608-cleanup (2020-05-24) 1 commit
173
+ (merged to 'next' on 2020-05-24 at 2bfa581890)
174
+ + t5608: avoid say() and use "skip_all" instead for consistency
175
+
176
+ Test fixup.
177
+
178
+ Will cook in 'next'.
179
+
180
+
181
+* es/config-hooks (2020-05-21) 4 commits
182
+ - hook: add --porcelain to list command
183
+ - hook: add list command
184
+ - hook: scaffolding for git-hook subcommand
185
+ - doc: propose hooks managed by the config
186
+
187
+
188
+* rs/checkout-b-track-error (2020-05-24) 2 commits
189
+ - checkout: improve error messages for -b with extra argument
190
+ - checkout: add tests for -b and --track
191
+
192
+ The error message from "git checkout -b foo -t bar baz" was
193
+ confusing.
194
+
195
+ Will merge to 'next'.
196
+
197
+
198
+* lo/sparse-universal-zero-init (2020-05-24) 1 commit
199
+ (merged to 'next' on 2020-05-24 at 1f4ea6b348)
200
+ + sparse: allow '{ 0 }' to be used without warnings
201
+
202
+ We've adopted a convention that any on-stack structure can be
203
+ initialized to have zero values in all fields with "= { 0 }", even
204
+ when the first field happens to be a pointer, but sparse complained
205
+ that a null pointer should be spelled NULL for a long time. Start
206
+ using -Wno-universal-initializer option to squelch it.
207
+
208
+ Will cook in 'next'.
209
210
--------------------------------------------------
211
[Stalled]
@@ -150,19 +223,6 @@ of the repositories listed at
223
cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
224
225
153
-* pw/rebase-i-more-options (2020-04-29) 5 commits
154
- - rebase: add --reset-author-date
155
- - rebase -i: support --ignore-date
156
- - sequencer: rename amend_author to author_to_free
157
- - rebase -i: support --committer-date-is-author-date
158
- - rebase -i: add --ignore-whitespace flag
159
-
160
- "git rebase -i" learns a bit more options.
161
-
162
- Expecting a reroll.
163
- cf. <c3dad0e2-e381-499a-af02-ef3f49207c49@gmail.com>
164
-
165
-
226
* jk/complete-git-switch (2020-04-28) 11 commits
227
- completion: complete remote branches for git switch --track
228
- completion: recognize -c/-C when completing for git switch
@@ -182,16 +242,19 @@ of the repositories listed at
242
Needs review.
243
244
185
-* dl/test-must-fail-fixes-5 (2020-05-05) 4 commits
245
+* dl/test-must-fail-fixes-5 (2020-05-21) 5 commits
246
- lib-submodule-update: pass OVERWRITING_FAIL
247
+ - SQUASH??? <20200521112545.GB581643@generichostname>
248
- lib-submodule-update: prepend "git" to $command
249
- lib-submodule-update: consolidate --recurse-submodules
250
- lib-submodule-update: add space after function name
251
252
The effort to avoid using test_must_fail on non-git command continues.
253
193
- Needs review.
194
- cf. <cover.1588162842.git.liu.denton@gmail.com>
254
+ Waiting for a review thread to settle.
255
+ cf. <20200521182928.GA1308647@coredump.intra.peff.net>
256
+ The last step is a bit too ugly to live; Peff seems to have better
257
+ ideas.
258
259
260
* mr/bisect-in-c-2 (2020-04-23) 12 commits
@@ -210,7 +273,8 @@ of the repositories listed at
273
274
Rewrite of the remainder of "git bisect" script in C continues.
275
213
- Needs review.
276
+ Expecting a response to reviews.
277
+ cf. <nycvar.QRO.7.76.6.2005230007260.56@tvgsbejvaqbjf.bet>
278
279
280
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
@@ -223,6 +287,19 @@ of the repositories listed at
287
--------------------------------------------------
288
[Cooking]
289
290
+* pw/rebase-i-more-options (2020-05-24) 5 commits
291
+ - rebase: add --reset-author-date
292
+ - rebase -i: support --ignore-date
293
+ - sequencer: rename amend_author to author_to_free
294
+ - rebase -i: support --committer-date-is-author-date
295
+ - rebase -i: add --ignore-whitespace flag
296
+
297
+ "git rebase -i" learns a bit more options.
298
+
299
+ Expecting the final touch
300
+ cf. <20200523155203.GA10163@danh.dev>
301
+
302
+
303
* an/merge-single-strategy-optim (2020-05-19) 1 commit
304
(merged to 'next' on 2020-05-20 at 8d5cacc8d1)
305
+ merge: optimization to skip evaluate_result for single strategy
@@ -250,7 +327,7 @@ of the repositories listed at
327
Code clean-up.
328
329
253
-* dl/remote-curl-deadlock-fix (2020-05-19) 7 commits
330
+* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
331
- stateless-connect: send response end packet
332
- pkt-line: define PACKET_READ_RESPONSE_END
333
- remote-curl: error on incomplete packet
@@ -267,87 +344,44 @@ of the repositories listed at
344
Will merge to 'next'.
345
346
270
-* gp/hppa-stack-test-fix (2020-05-18) 1 commit
271
- (merged to 'next' on 2020-05-20 at 57ed63b4ad)
272
- + tests: skip small-stack tests on hppa architecture
273
-
274
- Platform dependent tweak to a test for HP-PA.
275
-
276
- Will merge to 'master'.
277
-
278
-
347
* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
280
- - ci/config: correct instruction for CI preferences
348
+ (merged to 'next' on 2020-05-24 at 5f1f5ef66a)
349
+ + ci/config: correct instruction for CI preferences
350
351
Dev support.
352
284
- Will merge to 'next'.
353
+ Will cook in 'next'.
354
355
287
-* la/diff-relative-config (2020-05-19) 1 commit
356
+* la/diff-relative-config (2020-05-24) 1 commit
357
- diff: add config option relative
358
359
The commands in the "diff" family learned to honor "diff.relative"
360
configuration variable.
361
293
- Almost there.
294
- cf. <20200519230124.GA12509@danh.dev>
295
-
296
-
297
-* ma/doc-fixes (2020-05-18) 5 commits
298
- - git-sparse-checkout.txt: add missing '
299
- - git-credential.txt: use list continuation
300
- - git-commit-graph.txt: fix list rendering
301
- - git-commit-graph.txt: fix grammo
302
- - date-formats.txt: fix list continuation
303
-
304
- Various doc fixes.
305
-
306
- Will merge to 'next' and then to 'master'.
307
-
308
-
309
-* dd/t5703-grep-a-fix (2020-05-19) 1 commit
310
- - t5703: replace "grep -a" usage by perl
311
-
312
- Update an unconditional use of "grep -a" with a perl script in a test.
313
-
314
- Will merge to 'next' and then to 'master'.
315
-
316
-
317
-* ds/multi-pack-verify (2020-05-19) 1 commit
318
- - fsck: use ERROR_MULTI_PACK_INDEX
319
-
320
- Fix for a copy-and-paste error introduced during 2.20 era.
321
-
322
- Will merge to 'next' and then to 'master'.
323
-
324
-
325
-* jt/avoid-prefetch-when-able-in-diff (2020-05-19) 1 commit
326
- - t4067: make rename detection test output raw diff
327
-
328
- Test-coverage enhancement.
329
-
330
- Will merge to 'next' and then to 'master'.
362
+ Will merge to 'next'.
363
364
365
* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
334
- - t4210: detect REG_ILLSEQ dynamically and skip affected tests
335
- - t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
366
+ (merged to 'next' on 2020-05-24 at c03b4095fa)
367
+ + t4210: detect REG_ILLSEQ dynamically and skip affected tests
368
+ + t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
369
337
- As FreeBSD is not the only platform whose regexp library needs
338
- REG_ILLSEQ prerequisite, add a logic to detect the prerequisite
339
- automatically.
370
+ As FreeBSD is not the only platform whose regexp library reports
371
+ a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
372
+ automatically and skip the affected tests.
373
341
- Will merge to 'next'.
374
+ Will cook in 'next'.
375
376
377
* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
345
- - git-p4.py: fix --prepare-p4-only error with multiple commits
378
+ (merged to 'next' on 2020-05-24 at c1b4644b04)
379
+ + git-p4.py: fix --prepare-p4-only error with multiple commits
380
381
The "--prepare-p4-only" option is supposed to stop after replaying
382
one changeset, but kept going (by mistake?)
383
350
- Will merge to 'next'.
384
+ Will cook in 'next'.
385
cf. <CAE5ih797YYxsR2H0TA65w9W-1jF4jQLayja_nGjQMGtc=PB6Jw@mail.gmail.com>
386
387
@@ -370,7 +404,8 @@ of the repositories listed at
404
"git grep" has been tweaked to be limited to the sparse checkout
405
paths.
406
373
- Expecting a reroll.
407
+ Expecting further polishing.
408
+ cf. <CAHd-oW6BoHkMSAQVquHR+H7=g84VE-qmXGYcDmWwFxuLyqZSzg@mail.gmail.com>
409
410
411
* bc/sha-256-part-2 (2020-05-13) 44 commits
@@ -423,12 +458,13 @@ of the repositories listed at
458
459
460
* es/bugreport-shell (2020-05-12) 2 commits
426
- - bugreport: include user interactive shell
427
- - help: add shell-path to --build-options
461
+ (merged to 'next' on 2020-05-24 at 79c5c8308b)
462
+ + bugreport: include user interactive shell
463
+ + help: add shell-path to --build-options
464
465
"git bugreport" learns to report what shell is in use.
466
431
- Will merge to 'next'.
467
+ Will cook in 'next'.
468
We may want to learn more details than just the path, but
469
that can come later.
470
cf. <20200512235924.GC6605@camp.crustytoothpaste.net>
@@ -449,18 +485,19 @@ of the repositories listed at
485
486
487
* tb/commit-graph-no-check-oids (2020-05-18) 8 commits
452
- - commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
453
- - t5318: reorder test below 'graph_read_expect'
454
- - commit-graph.c: simplify 'fill_oids_from_commits'
455
- - builtin/commit-graph.c: dereference tags in builtin
456
- - builtin/commit-graph.c: extract 'read_one_commit()'
457
- - commit-graph.c: peel refs in 'add_ref_to_set'
458
- - commit-graph.c: show progress of finding reachable commits
459
- - commit-graph.c: extract 'refs_cb_data'
488
+ (merged to 'next' on 2020-05-24 at 72bd1063ca)
489
+ + commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
490
+ + t5318: reorder test below 'graph_read_expect'
491
+ + commit-graph.c: simplify 'fill_oids_from_commits'
492
+ + builtin/commit-graph.c: dereference tags in builtin
493
+ + builtin/commit-graph.c: extract 'read_one_commit()'
494
+ + commit-graph.c: peel refs in 'add_ref_to_set'
495
+ + commit-graph.c: show progress of finding reachable commits
496
+ + commit-graph.c: extract 'refs_cb_data'
497
498
Clean-up the commit-graph codepath.
499
463
- Will merge to 'next'.
500
+ Will cook in 'next'.
501
502
503
* jx/proc-receive-hook (2020-05-18) 11 commits
@@ -483,18 +520,19 @@ of the repositories listed at
520
521
522
* hn/refs-cleanup (2020-05-20) 6 commits
486
- - reftable: define version 2 of the spec to accomodate SHA256
487
- - reftable: clarify how empty tables should be written
488
- - reftable: file format documentation
489
- - refs: improve documentation for ref iterator
490
- - t: use update-ref and show-ref to reading/writing refs
491
- - refs.h: clarify reflog iteration order
523
+ (merged to 'next' on 2020-05-24 at dd9b665698)
524
+ + reftable: define version 2 of the spec to accomodate SHA256
525
+ + reftable: clarify how empty tables should be written
526
+ + reftable: file format documentation
527
+ + refs: improve documentation for ref iterator
528
+ + t: use update-ref and show-ref to reading/writing refs
529
+ + refs.h: clarify reflog iteration order
530
(this branch is used by hn/reftable.)
531
532
Preliminary clean-ups around refs API, plus file format
533
specification documentation for the reftable backend.
534
497
- Will merge to 'next'.
535
+ Will cook in 'next'.
536
537
538
* hn/reftable (2020-05-20) 9 commits