What's cooking (2020/05 #07)
Junio C Hamano committed
May 20, 2020 at 11:55 UTC
e34a969479b566af167c2149adccc7cbb97b09ab
1 file changed
+178
-158
whats-cooking.txt
+178
-158
@@ -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, #06; Tue, 19)
4
-X-master-at: efcab5b7a3d2ce2ae4bf808b335938098b18d960
5
-X-next-at: ede8c892b8d8194a9b64c2cfd62396141e5199d2
3
+Subject: What's cooking in git.git (May 2020, #07; Wed, 20)
4
+X-master-at: 87680d32efb6d14f162e54ad3bda4e3d6c908559
5
+X-next-at: 8d5cacc8d1ede34c079dff20da097c4e1f481d2c
6
7
-What's cooking in git.git (May 2020, #06; Tue, 19)
7
+What's cooking in git.git (May 2020, #07; Wed, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,10 @@ 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 tomorrow, with topics scheduled to be in 'master'
16
-(listed below). I am paying less attention than usual for topics
17
-that are not in 'next', but it would be good to have well-reviewed
18
-topics cooking in 'next' when the feature-freeze ends.
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.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -23,39 +23,7 @@ of the repositories listed at
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
--------------------------------------------------
26
-[New Topics]
27
-
28
-* ds/trace-log-progress-fix (2020-05-15) 1 commit
29
- (merged to 'next' on 2020-05-15 at d82c1fd03f)
30
- + progress: call trace2_region_leave() only after calling _enter()
31
-
32
- Last-minute fix for our recent change to allow use of progress API
33
- as a traceable region.
34
-
35
- Will merge to 'master'.
36
-
37
-
38
-* en/sparse-checkout (2020-05-15) 1 commit
39
- (merged to 'next' on 2020-05-15 at d4b3058787)
40
- + unpack-trees: also allow get_progress() to work on a different index
41
-
42
- Consistency fix to a topic already in 'master'.
43
-
44
- Will merge to 'master'.
45
-
46
-
47
-* jc/fix-tap-output-under-bash (2020-05-15) 3 commits
48
- (merged to 'next' on 2020-05-15 at de8f92d652)
49
- + Revert "tests: when run in Bash, annotate test failures with file name/line number"
50
- + Revert "ci: add a problem matcher for GitHub Actions"
51
- + Revert "t/test_lib: avoid naked bash arrays in file_lineno"
52
-
53
- A recent attempt to make the test output nicer to view on CI
54
- systems broke TAP output under bash. The effort has been reverted
55
- to be re-attempted in the next cycle.
56
-
57
- Will merge to 'master'.
58
-
26
+[Graduated to "master"]
27
28
* ak/slab-decl-cleanup (2020-05-18) 1 commit
29
(merged to 'next' on 2020-05-19 at 7de41005de)
@@ -63,50 +31,45 @@ of the repositories listed at
31
32
Code clean-up.
33
66
- Will merge to 'master'.
34
35
+* cb/no-more-gmtime (2020-05-14) 1 commit
36
+ (merged to 'next' on 2020-05-15 at 160e0ada09)
37
+ + compat: remove gmtime
38
69
-* an/merge-single-strategy-optim (2020-05-19) 1 commit
70
- - merge: optimization to skip evaluate_result for single strategy
39
+ Code clean-up by removing a compatibility implementation of a
40
+ function we no longer use.
41
72
- Code optimization for a common case.
42
74
- Will merge to 'next'.
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
46
47
+ A few tests were not i18n clean.
48
77
-* cc/upload-pack-data (2020-05-18) 13 commits
78
- - upload-pack: use upload_pack_data fields in receive_needs()
79
- - upload-pack: pass upload_pack_data to create_pack_file()
80
- - upload-pack: remove static variable 'stateless_rpc'
81
- - upload-pack: pass upload_pack_data to check_non_tip()
82
- - upload-pack: pass upload_pack_data to send_ref()
83
- - upload-pack: move symref to upload_pack_data
84
- - upload-pack: use upload_pack_data writer in receive_needs()
85
- - upload-pack: pass upload_pack_data to receive_needs()
86
- - upload-pack: pass upload_pack_data to get_common_commits()
87
- - upload-pack: use 'struct upload_pack_data' in upload_pack()
88
- - upload-pack: move 'struct upload_pack_data' around
89
- - upload-pack: move {want,have}_obj to upload_pack_data
90
- - upload-pack: remove unused 'wants' from upload_pack_data
49
92
- Code clean-up.
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()
53
54
+ Last-minute fix for our recent change to allow use of progress API
55
+ as a traceable region.
56
95
-* dl/remote-curl-deadlock-fix (2020-05-19) 7 commits
96
- - stateless-connect: send response end packet
97
- - pkt-line: define PACKET_READ_RESPONSE_END
98
- - remote-curl: error on incomplete packet
99
- - pkt-line: extern packet_length()
100
- - transport: extract common fetch_pack() call
101
- - remote-curl: remove label indentation
102
- - remote-curl: fix typo
57
104
- On-the-wire protocol v2 easily falls into a deadlock between the
105
- remote-curl helper and the fetch-pack process when the server side
106
- prematurely throws an error and disconnects. The communication has
107
- been updated to make it more robust.
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
61
109
- Will merge to 'next'.
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.
66
+
67
+
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
71
+
72
+ Consistency fix to a topic already in 'master'.
73
74
75
* es/bugreport (2020-05-18) 1 commit
@@ -115,67 +78,59 @@ of the repositories listed at
78
79
Doc fix.
80
118
- Will merge to 'master'.
119
-
120
-
121
-* gp/hppa-stack-test-fix (2020-05-18) 1 commit
122
- - tests: skip small-stack tests on hppa architecture
123
-
124
- Platform dependent tweak to a test for HP-PA.
125
-
126
- Will merge to 'next'.
127
-
81
129
-* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
130
- - ci/config: correct instruction for CI preferences
131
-
132
- Dev support.
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"
87
134
- Will merge to 'next'.
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.
91
92
137
-* la/diff-relative-config (2020-05-19) 1 commit
138
- - diff: add config option relative
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
96
140
- The commands in the "diff" family learned to honor "diff.relative"
141
- configuration variable.
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.
101
143
- Almost there.
144
- cf. <20200519230124.GA12509@danh.dev>
102
+--------------------------------------------------
103
+[New Topics]
104
105
+* bc/faq (2020-05-20) 1 commit
106
+ - command-list.txt: add gitfaq to the list of guides
107
147
-* ma/doc-fixes (2020-05-18) 5 commits
148
- - git-sparse-checkout.txt: add missing '
149
- - git-credential.txt: use list continuation
150
- - git-commit-graph.txt: fix list rendering
151
- - git-commit-graph.txt: fix grammo
152
- - date-formats.txt: fix list continuation
108
+ "git help guides" now includes the newly added FAQ document.
109
154
- Various doc fixes.
110
+ Will merge to 'next' and then to 'master'.
111
156
- Will merge to 'next'.
112
113
+* cb/bisect-replay-with-dos-fix (2020-05-20) 1 commit
114
+ - bisect: avoid tailing CR characters from revision in replay
115
159
-* dd/t5703-grep-a-fix (2020-05-19) 1 commit
160
- - t5703: replace "grep -a" usage by perl
116
+ Re-fix longstanding "edited bisect log may confuse bisect replay
117
+ with trailing carriage-return" issue.
118
162
- Update an unconditional use of "grep -a" with a perl script in a test.
119
+ Will merge to 'next' and then to 'master'.
120
164
- Will merge to 'next'.
121
122
+* dl/merge-autostash (2020-05-20) 1 commit
123
+ - t5520: avoid alternation in grep's BRE (not POSIX)
124
167
-* ds/multi-pack-verify (2020-05-19) 1 commit
168
- - fsck: use ERROR_MULTI_PACK_INDEX
125
+ Test fix.
126
170
- Fix for a copy-and-paste error introduced during 2.20 era.
171
-
172
- Will merge to 'next'.
127
+ Will merge to 'next' and then to 'master'.
128
129
175
-* jt/avoid-prefetch-when-able-in-diff (2020-05-19) 1 commit
176
- - t4067: make rename detection test output raw diff
130
+* gs/commit-graph-path-filter (2020-05-20) 1 commit
131
+ - t4216: avoid unnecessary subshell in test_bloom_filters_not_used
132
178
- Test-coverage enhancement.
133
+ Test fix.
134
135
Will merge to 'next' and then to 'master'.
136
@@ -204,7 +159,8 @@ of the repositories listed at
159
160
"git rebase -i" learns a bit more options.
161
207
- Needs review.
162
+ Expecting a reroll.
163
+ cf. <c3dad0e2-e381-499a-af02-ef3f49207c49@gmail.com>
164
165
166
* jk/complete-git-switch (2020-04-28) 11 commits
@@ -267,16 +223,113 @@ of the repositories listed at
223
--------------------------------------------------
224
[Cooking]
225
270
-* cb/no-more-gmtime (2020-05-14) 1 commit
271
- (merged to 'next' on 2020-05-15 at 160e0ada09)
272
- + compat: remove gmtime
226
+* an/merge-single-strategy-optim (2020-05-19) 1 commit
227
+ (merged to 'next' on 2020-05-20 at 8d5cacc8d1)
228
+ + merge: optimization to skip evaluate_result for single strategy
229
274
- Code clean-up by removing a compatibility implementation of a
275
- function we no longer use.
230
+ Code optimization for a common case.
231
+
232
+ Will cook in 'next'.
233
+
234
+
235
+* cc/upload-pack-data (2020-05-18) 13 commits
236
+ - upload-pack: use upload_pack_data fields in receive_needs()
237
+ - upload-pack: pass upload_pack_data to create_pack_file()
238
+ - upload-pack: remove static variable 'stateless_rpc'
239
+ - upload-pack: pass upload_pack_data to check_non_tip()
240
+ - upload-pack: pass upload_pack_data to send_ref()
241
+ - upload-pack: move symref to upload_pack_data
242
+ - upload-pack: use upload_pack_data writer in receive_needs()
243
+ - upload-pack: pass upload_pack_data to receive_needs()
244
+ - upload-pack: pass upload_pack_data to get_common_commits()
245
+ - upload-pack: use 'struct upload_pack_data' in upload_pack()
246
+ - upload-pack: move 'struct upload_pack_data' around
247
+ - upload-pack: move {want,have}_obj to upload_pack_data
248
+ - upload-pack: remove unused 'wants' from upload_pack_data
249
+
250
+ Code clean-up.
251
+
252
+
253
+* dl/remote-curl-deadlock-fix (2020-05-19) 7 commits
254
+ - stateless-connect: send response end packet
255
+ - pkt-line: define PACKET_READ_RESPONSE_END
256
+ - remote-curl: error on incomplete packet
257
+ - pkt-line: extern packet_length()
258
+ - transport: extract common fetch_pack() call
259
+ - remote-curl: remove label indentation
260
+ - remote-curl: fix typo
261
+
262
+ On-the-wire protocol v2 easily falls into a deadlock between the
263
+ remote-curl helper and the fetch-pack process when the server side
264
+ prematurely throws an error and disconnects. The communication has
265
+ been updated to make it more robust.
266
+
267
+ Will merge to 'next'.
268
+
269
+
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
279
+* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
280
+ - ci/config: correct instruction for CI preferences
281
+
282
+ Dev support.
283
+
284
+ Will merge to 'next'.
285
+
286
+
287
+* la/diff-relative-config (2020-05-19) 1 commit
288
+ - diff: add config option relative
289
+
290
+ The commands in the "diff" family learned to honor "diff.relative"
291
+ configuration variable.
292
+
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'.
331
+
332
+
333
* 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)
@@ -288,18 +341,6 @@ of the repositories listed at
341
Will merge to 'next'.
342
343
291
-* en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
292
- (merged to 'next' on 2020-05-15 at 7e1ddfa3c9)
293
- + merge-recursive: fix rename/rename(1to2) for working tree with a binary
294
-
295
- When a binary file gets modified and renamed on both sides of history
296
- to different locations, both files would be written to the working
297
- tree but both would have the contents from "ours". This has been
298
- corrected so that the path from each side gets their original content.
299
-
300
- Will merge to 'master'.
301
-
302
-
344
* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
345
- git-p4.py: fix --prepare-p4-only error with multiple commits
346
@@ -332,18 +373,6 @@ of the repositories listed at
373
Expecting a reroll.
374
375
335
-* js/ci-sdk-download-fix (2020-05-15) 1 commit
336
- (merged to 'next' on 2020-05-15 at 9b28f7ec87)
337
- + ci: avoid pounding on the poor ci-artifacts container
338
-
339
- Instead of downloading Windows SDK for CI jobs for windows builds
340
- from an external site (wingit.blob.core.windows.net), use the one
341
- created in the windows-build job, to work around quota issues at
342
- the external site.
343
-
344
- Will merge to 'master'.
345
-
346
-
376
* bc/sha-256-part-2 (2020-05-13) 44 commits
377
- remote-testgit: adapt for object-format
378
- bundle: detect hash algorithm when reading refs
@@ -393,15 +422,6 @@ of the repositories listed at
422
SHA-256 migration work continues.
423
424
396
-* dd/t1509-i18n-fix (2020-05-13) 1 commit
397
- (merged to 'next' on 2020-05-15 at a6342455c1)
398
- + t1509: correct i18n test
399
-
400
- A few tests were not i18n clean.
401
-
402
- Will merge to 'master'.
403
-
404
-
425
* es/bugreport-shell (2020-05-12) 2 commits
426
- bugreport: include user interactive shell
427
- help: add shell-path to --build-options
@@ -462,11 +482,11 @@ of the repositories listed at
482
Needs review.
483
484
465
-* hn/refs-cleanup (2020-05-11) 6 commits
485
+* 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
469
- - refs: document how ref_iterator_advance_fn should handle symrefs
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
492
(this branch is used by hn/reftable.)
@@ -474,10 +494,10 @@ of the repositories listed at
494
Preliminary clean-ups around refs API, plus file format
495
specification documentation for the reftable backend.
496
477
- Almost there.
497
+ Will merge to 'next'.
498
499
480
-* hn/reftable (2020-05-18) 9 commits
500
+* hn/reftable (2020-05-20) 9 commits
501
- Add reftable testing infrastructure
502
- vcxproj: adjust for the reftable changes
503
- Add GIT_DEBUG_REFS debugging mechanism