What's cooking (2020/05 #10)
Junio C Hamano committed
May 31, 2020 at 13:17 UTC
b965c39e126cd15dfce9807c6b211643813fdc46
1 file changed
+162
-76
whats-cooking.txt
+162
-76
@@ -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, #09; Tue, 26)
4
-X-master-at: 2d5e9f31ac46017895ce6a183467037d29ceb9d3
5
-X-next-at: 90737beb8258c0a99181b6308eef898d77979c71
3
+Subject: What's cooking in git.git (May 2020, #10; Sun, 31)
4
+X-master-at: 56219baf1eae50134ee05eaa64e26e7f1207042c
5
+X-next-at: 5238fbb8ea3e0d9159ed431f9042d31285ea2d15
6
7
-What's cooking in git.git (May 2020, #09; Tue, 26)
7
+What's cooking in git.git (May 2020, #10; Sun, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,7 @@ 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-rc2 has been tagged.
15
+Git 2.27 final soon.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -22,21 +22,91 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
25
-* ss/faq-ignore (2020-05-25) 1 commit
26
- (merged to 'next' on 2020-05-25 at f2f7dd2ff6)
27
- + gitfaq: avoid validation error with older asciidoc
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
29
- Doc markup fix.
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
42
+
43
+ Dev support.
44
+
45
+
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`
49
+
50
+ Docfix.
51
52
--------------------------------------------------
53
[New Topics]
54
34
-* en/sparse-with-submodule-doc (2020-05-25) 1 commit
35
- - git-sparse-checkout: clarify interactions with submodules
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.)
69
+
70
+ Further code clean-up.
71
+
72
+
73
+* en/fast-import-looser-date (2020-05-31) 1 commit
74
+ (merged to 'next' on 2020-05-31 at 49de9c07c5)
75
+ + fast-import: add new --date-format=raw-permissive format
76
+
77
+ Some repositories in the wild have commits that record nonsense
78
+ committer timezone (e.g. rails.git); "git fast-import" learned an
79
+ option to pass these nonsense timestamps intact to allow recreating
80
+ existing repositories as-is.
81
82
+ Will cook in 'next'.
83
38
-* ma/rev-list-options-docfix (2020-05-26) 1 commit
39
- - rev-list-options.txt: start a list for `show-pulls`
84
+
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
88
+
89
+ "git checkout -p" did not handle a newly added path at all.
90
+
91
+ Will cook in 'next'.
92
+
93
+
94
+* mt/zsh-completion-optim (2020-05-28) 1 commit
95
+ (merged to 'next' on 2020-05-31 at f5d02a5498)
96
+ + completion: use native ZSH array pattern matching
97
+
98
+ Command line completion (incontrib/) update.
99
+
100
+ Will cook in 'next'.
101
+
102
+
103
+* xl/upgrade-repo-format (2020-05-29) 1 commit
104
+ - fetch: allow adding a filter after initial clone
105
+
106
+ Allow runtime upgrade of the repository format version, which needs
107
+ to be done carefully.
108
+
109
+ Almost there.
110
111
--------------------------------------------------
112
[Stalled]
@@ -54,25 +124,6 @@ of the repositories listed at
124
cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
125
126
57
-* jk/complete-git-switch (2020-04-28) 11 commits
58
- - completion: complete remote branches for git switch --track
59
- - completion: recognize -c/-C when completing for git switch
60
- - completion: fix completion for git switch with no options
61
- - completion: perform DWIM logic directly in __git_complete_refs
62
- - completion: extract function __git_dwim_remote_heads
63
- - completion: rename --track option of __git_complete_refs
64
- - completion: stop completing refs for git switch --orphan
65
- - completion: add tests showing lack of support for git switch -c/-C
66
- - completion: add test highlighting subpar git switch --track completion
67
- - completion: add test showing subpar git switch completion
68
- - completion: add some simple test cases for git switch completion
69
-
70
- The command line completion (in contrib/) learned to complete
71
- options that the "git switch" command takes.
72
-
73
- Needs review.
74
-
75
-
127
* dl/test-must-fail-fixes-5 (2020-05-21) 5 commits
128
- lib-submodule-update: pass OVERWRITING_FAIL
129
- SQUASH??? <20200521112545.GB581643@generichostname>
@@ -118,6 +169,36 @@ of the repositories listed at
169
--------------------------------------------------
170
[Cooking]
171
172
+* jk/complete-git-switch (2020-05-28) 16 commits
173
+ - completion: improve handling of --orphan option of switch/checkout
174
+ - completion: improve handling of -c/-C and -b/-B in switch/checkout
175
+ - completion: improve handling of --track in switch/checkout
176
+ - completion: improve handling of --detach in checkout
177
+ - completion: improve completion for git switch with no options
178
+ - completion: improve handling of DWIM mode for switch/checkout
179
+ - completion: perform DWIM logic directly in __git_complete_refs
180
+ - completion: extract function __git_dwim_remote_heads
181
+ - completion: replace overloaded track term for __git_complete_refs
182
+ - completion: add tests showing subpar switch/checkout --orphan logic
183
+ - completion: add tests showing subpar -c/C argument completion
184
+ - completion: add tests showing subpar -c/-C startpoint completion
185
+ - completion: add tests showing subpar switch/checkout --track logic
186
+ - completion: add tests showing subar checkout --detach logic
187
+ - completion: add tests showing subpar DWIM logic for switch/checkout
188
+ - completion: add test showing subpar git switch completion
189
+
190
+ The command line completion (in contrib/) learned to complete
191
+ options that the "git switch" command takes.
192
+
193
+
194
+* en/sparse-with-submodule-doc (2020-05-25) 1 commit
195
+ - git-sparse-checkout: clarify interactions with submodules
196
+
197
+ The effect of sparse checkout settings on submodules is documented.
198
+
199
+ Needs review.
200
+
201
+
202
* bc/filter-process (2020-05-21) 2 commits
203
(merged to 'next' on 2020-05-24 at 3d51328096)
204
+ t2060: add a test for switch with --orphan and --discard-changes
@@ -234,7 +315,7 @@ of the repositories listed at
315
Will cook in 'next'.
316
317
237
-* pw/rebase-i-more-options (2020-05-24) 5 commits
318
+* pw/rebase-i-more-options (2020-05-27) 5 commits
319
- rebase: add --reset-author-date
320
- rebase -i: support --ignore-date
321
- sequencer: rename amend_author to author_to_free
@@ -243,8 +324,8 @@ of the repositories listed at
324
325
"git rebase -i" learns a bit more options.
326
246
- Expecting the final touch
247
- cf. <20200523155203.GA10163@danh.dev>
327
+ Not quite
328
+ cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
329
330
331
* an/merge-single-strategy-optim (2020-05-19) 1 commit
@@ -257,22 +338,26 @@ of the repositories listed at
338
339
340
* cc/upload-pack-data (2020-05-18) 13 commits
260
- - upload-pack: use upload_pack_data fields in receive_needs()
261
- - upload-pack: pass upload_pack_data to create_pack_file()
262
- - upload-pack: remove static variable 'stateless_rpc'
263
- - upload-pack: pass upload_pack_data to check_non_tip()
264
- - upload-pack: pass upload_pack_data to send_ref()
265
- - upload-pack: move symref to upload_pack_data
266
- - upload-pack: use upload_pack_data writer in receive_needs()
267
- - upload-pack: pass upload_pack_data to receive_needs()
268
- - upload-pack: pass upload_pack_data to get_common_commits()
269
- - upload-pack: use 'struct upload_pack_data' in upload_pack()
270
- - upload-pack: move 'struct upload_pack_data' around
271
- - upload-pack: move {want,have}_obj to upload_pack_data
272
- - upload-pack: remove unused 'wants' from upload_pack_data
341
+ (merged to 'next' on 2020-05-29 at 66008d9209)
342
+ + upload-pack: use upload_pack_data fields in receive_needs()
343
+ + upload-pack: pass upload_pack_data to create_pack_file()
344
+ + upload-pack: remove static variable 'stateless_rpc'
345
+ + upload-pack: pass upload_pack_data to check_non_tip()
346
+ + upload-pack: pass upload_pack_data to send_ref()
347
+ + upload-pack: move symref to upload_pack_data
348
+ + upload-pack: use upload_pack_data writer in receive_needs()
349
+ + upload-pack: pass upload_pack_data to receive_needs()
350
+ + upload-pack: pass upload_pack_data to get_common_commits()
351
+ + upload-pack: use 'struct upload_pack_data' in upload_pack()
352
+ + upload-pack: move 'struct upload_pack_data' around
353
+ + upload-pack: move {want,have}_obj to upload_pack_data
354
+ + upload-pack: remove unused 'wants' from upload_pack_data
355
+ (this branch is used by cc/upload-pack-data-2.)
356
357
Code clean-up.
358
359
+ Will cook in 'next'.
360
+
361
362
* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
363
(merged to 'next' on 2020-05-26 at 072714ca7f)
@@ -292,15 +377,6 @@ of the repositories listed at
377
Will cook in 'next'.
378
379
295
-* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
296
- (merged to 'next' on 2020-05-24 at 5f1f5ef66a)
297
- + ci/config: correct instruction for CI preferences
298
-
299
- Dev support.
300
-
301
- Will merge to 'master'.
302
-
303
-
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
@@ -344,23 +420,26 @@ of the repositories listed at
420
Expecting further work on optionally disabling redacting authinfo
421
422
347
-* mt/grep-sparse-checkout (2020-05-11) 4 commits
423
+* mt/grep-sparse-checkout (2020-05-28) 5 commits
424
- config: add setting to ignore sparsity patterns in some cmds
425
- grep: honor sparse checkout patterns
350
- - config: load the correct config.worktree file
426
+ - config: correctly read worktree configs in submodules
427
+ - t/helper/test-config: return exit codes consistently
428
- doc: grep: unify info on configuration variables
429
430
"git grep" has been tweaked to be limited to the sparse checkout
431
paths.
432
433
Expecting further polishing.
357
- cf. <CAHd-oW6BoHkMSAQVquHR+H7=g84VE-qmXGYcDmWwFxuLyqZSzg@mail.gmail.com>
434
+ cf. <cover.1590627264.git.matheus.bernardino@usp.br>
435
+ cf. <CABPp-BFsCPPNOZ92JQRJeGyNd0e-TCW-LcLyr0i_+VSQJP+GCg@mail.gmail.com>
436
437
360
-* bc/sha-256-part-2 (2020-05-13) 44 commits
438
+* bc/sha-256-part-2 (2020-05-27) 44 commits
439
- remote-testgit: adapt for object-format
440
- bundle: detect hash algorithm when reading refs
441
- t5300: pass --object-format to git index-pack
442
+ - t5704: send object-format capability with SHA-256
443
- t5703: use object-format serve option
444
- t5702: offer an object-format capability in the test
445
- t/helper: initialize the repository for test-sha1-array
@@ -381,7 +460,6 @@ of the repositories listed at
460
- t3200: mark assertion with SHA1 prerequisite
461
- setup: set the_repository's hash algo when checking format
462
- fetch-pack: parse and advertise the object-format capability
384
- - t5704: send object-format capability with SHA-256
463
- t5562: pass object-format in synthesized test data
464
- builtin/clone: initialize hash algorithm properly
465
- remote-curl: implement object-format extensions
@@ -468,7 +546,9 @@ of the repositories listed at
546
Needs review.
547
548
471
-* hn/refs-cleanup (2020-05-20) 6 commits
549
+* hn/refs-cleanup (2020-05-27) 7 commits
550
+ (merged to 'next' on 2020-05-27 at aada2199e1)
551
+ + reftable doc: use link: and urlencode to avoid dead links
552
(merged to 'next' on 2020-05-24 at dd9b665698)
553
+ reftable: define version 2 of the spec to accomodate SHA256
554
+ reftable: clarify how empty tables should be written
@@ -482,18 +562,24 @@ of the repositories listed at
562
specification documentation for the reftable backend.
563
564
Will cook in 'next'.
485
-
486
-
487
-* hn/reftable (2020-05-20) 9 commits
488
- - Add reftable testing infrastructure
489
- - vcxproj: adjust for the reftable changes
490
- - Add GIT_DEBUG_REFS debugging mechanism
491
- - Reftable support for git-core
492
- - Add reftable library
493
- - Add .gitattributes for the reftable/ directory
494
- - Iterate over the "refs/" namespace in for_each_[raw]ref
495
- - Move REF_LOG_ONLY to refs-internal.h
496
- - Write pseudorefs through ref backends.
565
+ We probably would want to squash the fix at the tip to an earlier
566
+ step when we rewind the 'next' branch.
567
+
568
+
569
+* hn/reftable (2020-05-28) 13 commits
570
+ . Add reftable testing infrastructure
571
+ . vcxproj: adjust for the reftable changes
572
+ . Add GIT_DEBUG_REFS debugging mechanism
573
+ . Reftable support for git-core
574
+ . Add reftable library
575
+ . Add .gitattributes for the reftable/ directory
576
+ . Iterate over the "refs/" namespace in for_each_[raw]ref
577
+ . Move REF_LOG_ONLY to refs-internal.h
578
+ . Treat REVERT_HEAD as a pseudo ref
579
+ . Treat CHERRY_PICK_HEAD as a pseudo ref
580
+ . Treat BISECT_HEAD as a pseudo ref
581
+ . Make refs_ref_exists public
582
+ . Write pseudorefs through ref backends.
583
(this branch uses hn/refs-cleanup.)
584
585
A new refs backend "reftable" to replace the traditional
@@ -501,7 +587,7 @@ of the repositories listed at
587
has been implemented and integrated for improved performance and
588
atomicity.
589
504
- Needs review.
590
+ Not quite--does not pass tests by itself.
591
592
--------------------------------------------------
593
[Discarded]