What's cooking (2021/06 #02)
Junio C Hamano committed
Jun 6, 2021 at 21:05 UTC
d9bd6348a1752d07828a64892ac569d555483ddb
1 file changed
+84
-54
whats-cooking.txt
+84
-54
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2021, #01; Wed, 2)
4
-X-master-at: c09b6306c6ca275ed9d0348a8c8014b2ff723cfb
5
-X-next-at: 926086ebc4ae8f6b5c7ad3879ed2adde33d6bb1a
3
+Subject: What's cooking in git.git (Jun 2021, #02; Sun, 6)
4
+X-master-at: ebf3c04b262aa27fbb97f8a0156c2347fecafafb
5
+X-next-at: 935e593368000d8476c1712a0a3d40699d2af34b
6
7
-What's cooking in git.git (Jun 2021, #01; Wed, 2)
7
+What's cooking in git.git (Jun 2021, #02; Sun, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,8 +13,14 @@ topics that are not yet in 'next') while commits prefixed with '+'
13
are in 'next'. The ones marked with '.' do not appear in any of the
14
integration branches, but I am still holding onto them.
15
16
-Hopefully the last release candidate for this cycle, -rc3, has been
17
-tagged. A big thank-you to those who gave us the last minute fixes.
16
+Git 2.32 is out.
17
+
18
+As usual, we'll see if people notice brown-paper-bag bugs and deal
19
+with them, merge down topics that have been cooking in 'next' from
20
+simpler and obvious topics to more complex ones, and once 'next'
21
+gets depleted, rewind its tip and take more topics to it. Hopefully
22
+all of that will happen by sometime in the middle of week #2 of the
23
+next cycle (cf. https://tinyurl.com/gitCal).
24
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
@@ -47,76 +53,47 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
50
-* ab/fsck-api-cleanup (2021-06-02) 1 commit
51
- (merged to 'next' on 2021-06-02 at 51b09ce3c0)
52
- + builtin/fsck.c: don't conflate "int" and "enum" in callback
56
+* jc/fsync-can-fail-with-eintr (2021-06-05) 1 commit
57
+ (merged to 'next' on 2021-06-05 at 28992617a1)
58
+ + fsync(): be prepared to see EINTR
59
54
- Last minute compilation fix.
60
+ Last minute portability fix.
61
62
57
-* da/zsh-completion-fix-for-2.32 (2021-06-02) 1 commit
58
- (merged to 'next' on 2021-06-02 at b8b87a5505)
59
- + contrib/completion: fix zsh completion regression from 59d85a2a05
63
+* rs/parallel-checkout-test-fix (2021-06-06) 1 commit
64
+ (merged to 'next' on 2021-06-06 at 834ea5e286)
65
+ + parallel-checkout: avoid dash local bug in tests
66
61
- Fix breakages to zsh completion script (in contrib/) due to recent
62
- update to the bash completion of the same.
67
+ Test fix.
68
69
--------------------------------------------------
70
[New Topics]
71
67
-* fc/push-simple-updates (2021-06-02) 7 commits
68
- - doc: push: explain default=simple correctly
69
- - push: remove unused code in setup_push_upstream()
70
- - push: simplify setup_push_simple()
71
- - push: reorganize setup_push_simple()
72
- - push: copy code to setup_push_simple()
73
- - push: hedge code of default=simple
74
- - push: rename !triangular to same_remote
75
- (this branch is used by fc/push-simple-updates-cleanup.)
72
+* js/trace2-discard-event-docfix (2021-06-04) 1 commit
73
+ - docs: fix api-trace2 doc for "too_many_files" event
74
77
- Some code and doc clarification around "git push".
75
+ Docfix.
76
77
Will merge to 'next'.
78
79
82
-* fc/push-simple-updates-cleanup (2021-06-02) 13 commits
83
- - push: don't get a full remote object
84
- - push: only check same_remote when needed
85
- - push: remove trivial function
86
- - push: remove redundant check
87
- - push: factor out the typical case
88
- - push: get rid of all the setup_push_* functions
89
- - push: trivial simplifications
90
- - push: make setup_push_* return the dst
91
- - push: only get the branch when needed
92
- - push: factor out null branch check
93
- - push: split switch cases
94
- - push: return immediately in trivial switch case
95
- - push: create new get_upstream_ref() helper
96
- (this branch uses fc/push-simple-updates.)
80
+* tk/partial-clone-repack-doc (2021-06-04) 1 commit
81
+ - Remove warning that repack only works on non-promisor packfiles
82
98
- Some more code and doc clarification around "git push".
83
+ Docfix.
84
85
Will merge to 'next'.
86
87
103
-* tb/complete-diff-anchored (2021-05-31) 1 commit
104
- - completion: add --anchored to diff's options
88
+* zh/cat-file-batch-fix (2021-06-04) 2 commits
89
+ - cat-file: merge two block into one
90
+ - cat-file: handle trivial --batch format with --batch-all-objects
91
106
- The command line completion (in contrib/) learned that "git diff"
107
- takes the "--anchored" option.
92
+ "git cat-file --batch-all-objects"" misbehaved when "--batch" is in
93
+ use and did not ask for certain object traits.
94
95
Will merge to 'next'.
96
111
-
112
-* en/ort-perf-batch-12 (2021-06-02) 5 commits
113
- - merge-ort: miscellaneous touch-ups
114
- - Fix various issues found in comments
115
- - diffcore-rename: enable limiting rename detection to relevant destinations
116
- - diffcore-rename: avoid unnecessary strdup'ing in break_idx
117
- - merge-ort: replace string_list_df_name_compare with faster alternative
118
- (this branch uses en/ort-perf-batch-11.)
119
-
97
--------------------------------------------------
98
[Stalled]
99
@@ -395,6 +372,59 @@ Release tarballs are available at:
372
--------------------------------------------------
373
[Cooking]
374
375
+* fc/push-simple-updates (2021-06-02) 7 commits
376
+ - doc: push: explain default=simple correctly
377
+ - push: remove unused code in setup_push_upstream()
378
+ - push: simplify setup_push_simple()
379
+ - push: reorganize setup_push_simple()
380
+ - push: copy code to setup_push_simple()
381
+ - push: hedge code of default=simple
382
+ - push: rename !triangular to same_remote
383
+ (this branch is used by fc/push-simple-updates-cleanup.)
384
+
385
+ Some code and doc clarification around "git push".
386
+
387
+ Will merge to 'next'.
388
+
389
+
390
+* fc/push-simple-updates-cleanup (2021-06-02) 13 commits
391
+ - push: don't get a full remote object
392
+ - push: only check same_remote when needed
393
+ - push: remove trivial function
394
+ - push: remove redundant check
395
+ - push: factor out the typical case
396
+ - push: get rid of all the setup_push_* functions
397
+ - push: trivial simplifications
398
+ - push: make setup_push_* return the dst
399
+ - push: only get the branch when needed
400
+ - push: factor out null branch check
401
+ - push: split switch cases
402
+ - push: return immediately in trivial switch case
403
+ - push: create new get_upstream_ref() helper
404
+ (this branch uses fc/push-simple-updates.)
405
+
406
+ Some more code and doc clarification around "git push".
407
+
408
+ Will merge to 'next'.
409
+
410
+
411
+* tb/complete-diff-anchored (2021-05-31) 1 commit
412
+ - completion: add --anchored to diff's options
413
+
414
+ The command line completion (in contrib/) learned that "git diff"
415
+ takes the "--anchored" option.
416
+
417
+ Will merge to 'next'.
418
+
419
+
420
+* en/ort-perf-batch-12 (2021-06-04) 4 commits
421
+ - merge-ort: miscellaneous touch-ups
422
+ - merge-ort: fix various issues found in comments
423
+ - diffcore-rename: avoid unnecessary strdup'ing in break_idx
424
+ - merge-ort: replace string_list_df_name_compare with faster alternative
425
+ (this branch uses en/ort-perf-batch-11.)
426
+
427
+
428
* zh/ref-filter-raw-data (2021-05-31) 2 commits
429
. ref-filter: add %(raw) atom
430
. ref-filter: add obj-type check in grab contents