What's cooking (2021/08 #07)
Junio C Hamano committed
Aug 20, 2021 at 10:45 UTC
e53be185f4410b2a55046b5ae2b1c95e17dd9dd5
1 file changed
+126
-144
whats-cooking.txt
+126
-144
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2021, #06; Mon, 16)
2
+Subject: What's cooking in git.git (Aug 2021, #07; Fri, 20)
3
X-master-at: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
4
-X-next-at: 9b09ab0cd71e3176c74aab77531d8c6b18775e2d
4
+X-next-at: c128427fd74129b5a9814d069c2d800d1d1e5021
5
6
-What's cooking in git.git (Aug 2021, #06; Mon, 16)
6
+What's cooking in git.git (Aug 2021, #07; Fri, 20)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +17,16 @@ useful"). Do not read too much into a topic being in (or not in)
17
'seen'. The ones marked with '.' do not appear in any of the
18
integration branches, but I am still holding onto them.
19
20
-Git 2.33 (final) has been tagged.
20
+The tip of 'next' has not been rewound yet, but I've been instead
21
+reverting a few topics out of it to prepare.
22
+
23
+Most notably, since the "errno cleanup around refs API" topics have
24
+been blocking the "reftable backend" topic, I've reverted the former
25
+out of 'next' and moved them to near the tip of 'seen', essentially
26
+giving priority to the latter. In other words, I'd expect to see
27
+that the "reftable" topic to move before the "errno cleanup" topic,
28
+and also expect that any breakage, when both are merged to 'seen',
29
+would be resolved by adjusting the "errno cleanup" topic.
30
31
Copies of the source code to Git live in many repositories, and the
32
following is a list of the ones I push into or their mirrors. Some
@@ -47,63 +56,15 @@ Release tarballs are available at:
56
57
https://www.kernel.org/pub/software/scm/git/
58
50
---------------------------------------------------
51
-[Graduated to 'master']
52
-
53
-* rs/oidtree-alignment-fix (2021-08-15) 1 commit
54
- (merged to 'next' on 2021-08-15 at f03b174faa)
55
- + oidtree: avoid unaligned access to crit-bit tree
56
-
57
- Codepath to access recently added oidtree data structure had
58
- to make unaligned accesses to oids, which has been corrected.
59
-
59
--------------------------------------------------
60
[New Topics]
61
63
-* ar/submodule-run-update-procedure (2021-08-13) 1 commit
64
- - submodule--helper: run update procedures from C
65
-
66
- Reimplementation of parts of "git submodule" in C continues.
67
-
68
-
69
-* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit
70
- - ci: use upload-artifacts v1 for dockerized jobs
71
-
72
- Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
73
- new version has a blocker bug for that architecture.
74
-
75
- Will merge to 'next'.
76
-
77
-
78
-* pw/rebase-skip-final-fix (2021-08-13) 3 commits
79
- - rebase --continue: remove .git/MERGE_MSG
80
- - rebase --apply: restore some tests
81
- - t3403: fix commit authorship
82
-
83
- Checking out all the paths from HEAD during the last conflicted
84
- step in "git rebase" and continuing would cause the step to be
85
- skipped (which is expected), but leaves MERGE_HEAD file behind in
86
- $GIT_DIR and confuses the next "git commit", which has been
87
- corrected.
88
-
89
- Will merge to 'next'.
90
-
91
-
92
-* ab/help-autocorrect-prompt (2021-08-14) 1 commit
93
- - help.c: help.autocorrect=prompt waits for user action
94
-
95
- The logic for auto-correction of misspelt subcommands learned to go
96
- interactive when the help.autocorrect configuration variable is set
97
- to true.
62
+* sg/make-fix-ar-invocation (2021-08-19) 1 commit
63
+ - Makefile: remove archives before manipulating them with 'ar'
64
65
100
-* pw/rebase-r-fixes (2021-08-15) 4 commits
101
- - rebase -r: fix merge -c with a merge strategy
102
- - rebase -r: don't write .git/MERGE_MSG when fast-forwarding
103
- - rebase -i: Add another reword test
104
- - rebase -r: make 'merge -c' behave like reword
105
-
106
- Various bugs in "git rebase -r" have been fixed.
66
+* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit
67
+ - completion: tcsh: Fix regression by drop of wrapper functions
68
69
--------------------------------------------------
70
[Stalled]
@@ -125,32 +86,20 @@ Release tarballs are available at:
86
"git maintenance" scheduler learned to use systemd timers as a
87
possible backend.
88
128
- Waiting for reviews.
129
-
130
-
131
-* fc/completion-updates (2021-06-07) 4 commits
132
- - completion: bash: add correct suffix in variables
133
- - completion: bash: fix for multiple dash commands
134
- - completion: bash: fix for suboptions with value
135
- - completion: bash: fix prefix detection in branch.*
136
-
137
- Command line completion updates.
138
-
89
Expecting a reroll.
140
- cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
90
91
143
-* es/superproject-aware-submodules (2021-06-16) 5 commits
144
- - SQUASH???
145
- - submodule: cache superproject gitdir during 'update'
146
- - submodule: cache superproject gitdir during absorbgitdirs
147
- - introduce submodule.superprojectGitDir cache
92
+* es/superproject-aware-submodules (2021-08-19) 5 commits
93
+ - fixup! introduce submodule.superprojectGitDir record
94
+ - submodule: record superproject gitdir during 'update'
95
+ - submodule: record superproject gitdir during absorbgitdirs
96
+ - introduce submodule.superprojectGitDir record
97
- t7400-submodule-basic: modernize inspect() helper
98
99
A configuration variable in a submodule points at the location of
100
the superproject it is bound to (RFC).
101
153
- Waiting for reviews.
102
+ Looking good.
103
104
105
* en/zdiff3 (2021-06-15) 2 commits
@@ -186,6 +135,63 @@ Release tarballs are available at:
135
--------------------------------------------------
136
[Cooking]
137
138
+* fc/completion-updates (2021-08-18) 4 commits
139
+ - completion: bash: add correct suffix in variables
140
+ - completion: bash: fix for multiple dash commands
141
+ - completion: bash: fix for suboptions with value
142
+ - completion: bash: fix prefix detection in branch.*
143
+
144
+ Command line completion updates.
145
+
146
+ Will merge to 'next'?
147
+
148
+
149
+* ar/submodule-run-update-procedure (2021-08-13) 1 commit
150
+ - submodule--helper: run update procedures from C
151
+
152
+ Reimplementation of parts of "git submodule" in C continues.
153
+
154
+
155
+* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit
156
+ - ci: use upload-artifacts v1 for dockerized jobs
157
+
158
+ Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
159
+ new version has a blocker bug for that architecture.
160
+
161
+ Will merge to 'next'.
162
+
163
+
164
+* pw/rebase-skip-final-fix (2021-08-13) 3 commits
165
+ - rebase --continue: remove .git/MERGE_MSG
166
+ - rebase --apply: restore some tests
167
+ - t3403: fix commit authorship
168
+
169
+ Checking out all the paths from HEAD during the last conflicted
170
+ step in "git rebase" and continuing would cause the step to be
171
+ skipped (which is expected), but leaves MERGE_MSG file behind in
172
+ $GIT_DIR and confuses the next "git commit", which has been
173
+ corrected.
174
+
175
+ Will merge to 'next'.
176
+
177
+
178
+* ab/help-autocorrect-prompt (2021-08-14) 1 commit
179
+ - help.c: help.autocorrect=prompt waits for user action
180
+
181
+ The logic for auto-correction of misspelt subcommands learned to go
182
+ interactive when the help.autocorrect configuration variable is set
183
+ to true.
184
+
185
+
186
+* pw/rebase-r-fixes (2021-08-15) 4 commits
187
+ - rebase -r: fix merge -c with a merge strategy
188
+ - rebase -r: don't write .git/MERGE_MSG when fast-forwarding
189
+ - rebase -i: Add another reword test
190
+ - rebase -r: make 'merge -c' behave like reword
191
+
192
+ Various bugs in "git rebase -r" have been fixed.
193
+
194
+
195
* th/userdiff-more-java (2021-08-11) 1 commit
196
- userdiff: improve java hunk header regex
197
@@ -202,7 +208,7 @@ Release tarballs are available at:
208
been updated.
209
210
205
-* es/config-based-hooks (2021-08-11) 7 commits
211
+* es/config-based-hooks (2021-08-19) 7 commits
212
- hook: allow out-of-repo 'git hook' invocations
213
- hook: include hooks from the config
214
- hook: allow running non-native hooks
@@ -215,8 +221,11 @@ Release tarballs are available at:
221
Revamp the hooks subsystem to allow multiple of them to trigger
222
upon the same event and control via the configuration variables.
223
224
+ Will merge to 'next'?
225
+
226
219
-* mk/clone-recurse-submodules (2021-08-14) 1 commit
227
+* mk/clone-recurse-submodules (2021-08-18) 2 commits
228
+ - fixup! clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
229
- clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
230
231
After "git clone --recurse-submodules", all submodules are cloned
@@ -225,6 +234,8 @@ Release tarballs are available at:
234
configuration is set to true in a repository created by "clone"
235
with "--recurse-submodules" option.
236
237
+ cf. <4103806f-6d88-2756-8853-7e16e56ad425@gmail.com>
238
+
239
240
* bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit
241
- t5607: avoid using prerequisites to select algorithm
@@ -242,7 +253,7 @@ Release tarballs are available at:
253
"git commit --fixup" now works with "--edit" again, after it was
254
broken in v2.32.
255
245
- Will merge to 'next'?
256
+ Will merge to 'next'.
257
258
259
* tl/traverse-non-commits-rename (2021-08-12) 1 commit
@@ -426,14 +437,15 @@ Release tarballs are available at:
437
Build update.
438
439
429
-* jk/refs-files-cleanup-cleanup (2021-08-06) 1 commit
430
- (merged to 'next' on 2021-08-09 at 37b0b8c910)
431
- + refs: drop unused "flags" parameter to lock_ref_oid_basic()
432
- (this branch uses ab/refs-files-cleanup.)
440
+* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit
441
+ - refs: drop unused "flags" parameter to lock_ref_oid_basic()
442
+ (this branch is used by hn/refs-errno-cleanup; uses ab/refs-files-cleanup.)
443
444
Code cleanup.
445
436
- Will cook in 'next'.
446
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
447
+ I suspect that ab/refs-files-cleanup can fix its commit by
448
+ squashing it in, but I'll leave that to the owner of the topic.
449
450
451
* en/merge-strategy-docs (2021-08-05) 10 commits
@@ -676,11 +688,11 @@ Release tarballs are available at:
688
Will cook in 'next'.
689
690
679
-* hn/reftable (2021-08-16) 25 commits
691
+* hn/reftable (2021-08-18) 25 commits
692
- t1404: annotate test cases with REFFILES
693
- t1401,t2011: parameterize HEAD.lock for REFFILES
694
- t1301: document what needs to be done for reftable
683
- - Add "test-tool dump-reftable" command.
695
+ - reftable: add "test-tool dump-reftable" command.
696
- git-prompt: prepare for reftable refs backend
697
- refs: RFC: Reftable support for git-core
698
- reftable: add dump utility
@@ -694,7 +706,7 @@ Release tarballs are available at:
706
- reftable: write reftable files
707
- reftable: a generic binary tree implementation
708
- reftable: reading/writing blocks
697
- - Provide zlib's uncompress2 from compat/zlib-compat.c
709
+ - compat: provide zlib's uncompress2 from compat/zlib-compat.c
710
- reftable: (de)serialization for the polymorphic record type.
711
- reftable: add blocksource, an abstraction for random access reads
712
- reftable: utility functions
@@ -706,22 +718,25 @@ Release tarballs are available at:
718
The "reftable" backend for the refs API.
719
720
709
-* ab/refs-files-cleanup (2021-08-02) 11 commits
710
- (merged to 'next' on 2021-08-04 at 8ca0ef1b6e)
711
- + refs/files: remove unused "errno != ENOTDIR" condition
712
- + refs/files: remove unused "errno == EISDIR" code
713
- + refs/files: remove unused "oid" in lock_ref_oid_basic()
714
- + reflog expire: don't lock reflogs using previously seen OID
715
- + refs/files: add a comment about refs_reflog_exists() call
716
- + refs: make repo_dwim_log() accept a NULL oid
717
- + refs/debug: re-indent argument list for "prepare"
718
- + refs/files: remove unused "skip" in lock_raw_ref() too
719
- + refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
720
- + refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
721
- + refs/packet: add missing BUG() invocations to reflog callbacks
721
+* ab/refs-files-cleanup (2021-08-19) 11 commits
722
+ - refs/files: remove unused "errno != ENOTDIR" condition
723
+ - refs/files: remove unused "errno == EISDIR" code
724
+ - refs/files: remove unused "oid" in lock_ref_oid_basic()
725
+ - reflog expire: don't lock reflogs using previously seen OID
726
+ - refs/files: add a comment about refs_reflog_exists() call
727
+ - refs: make repo_dwim_log() accept a NULL oid
728
+ - refs/debug: re-indent argument list for "prepare"
729
+ - refs/files: remove unused "skip" in lock_raw_ref() too
730
+ - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
731
+ - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
732
+ - refs/packet: add missing BUG() invocations to reflog callbacks
733
(this branch is used by hn/refs-errno-cleanup and jk/refs-files-cleanup-cleanup.)
734
724
- Will cook in 'next'.
735
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
736
+
737
+ I suspect that jk/refs-files-cleanup-cleanup should be squashed
738
+ into the commits in this topic, but I'll leave that to the owner of
739
+ the topic.
740
741
742
* en/pull-conflicting-options (2021-07-22) 8 commits
@@ -917,24 +932,24 @@ Release tarballs are available at:
932
Long-overdue correctness and performance update to "diff
933
--color-moved" feature.
934
920
- Will cook in 'next'.
935
+ Eject for reroll.
936
+ cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
937
938
923
-* hn/refs-errno-cleanup (2021-08-02) 7 commits
924
- (merged to 'next' on 2021-08-04 at 7fe3c31e7f)
925
- + refs: make errno output explicit for refs_resolve_ref_unsafe
926
- + refs: explicitly return failure_errno from parse_loose_ref_contents
927
- + refs: add failure_errno to refs_read_raw_ref() signature
928
- + refs: make errno output explicit for read_raw_ref_fn
929
- + refs/files-backend: stop setting errno from lock_ref_oid_basic
930
- + refs: remove EINVAL errno output from specification of read_raw_ref_fn
931
- + refs file backend: move raceproof_create_file() here
932
- (this branch uses ab/refs-files-cleanup.)
939
+* hn/refs-errno-cleanup (2021-08-19) 7 commits
940
+ - refs: make errno output explicit for refs_resolve_ref_unsafe
941
+ - refs: explicitly return failure_errno from parse_loose_ref_contents
942
+ - refs: add failure_errno to refs_read_raw_ref() signature
943
+ - refs: make errno output explicit for read_raw_ref_fn
944
+ - refs/files-backend: stop setting errno from lock_ref_oid_basic
945
+ - refs: remove EINVAL errno output from specification of read_raw_ref_fn
946
+ - refs file backend: move raceproof_create_file() here
947
+ (this branch uses ab/refs-files-cleanup and jk/refs-files-cleanup-cleanup.)
948
949
Futz with the way 'errno' is relied on in the refs API to carry the
950
failure modes up the callchain.
951
937
- Will cook in 'next'.
952
+ Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.
953
954
955
* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
@@ -1057,36 +1072,3 @@ Release tarballs are available at:
1072
actual types of an object better.
1073
1074
Needs review.
1060
-
1061
---------------------------------------------------
1062
-[Discarded]
1063
-
1064
-* ab/test-columns (2021-08-05) 3 commits
1065
- . test-lib.sh: use GIT_TEST_COLUMNS over COLUMNS
1066
- . test-lib-functions.sh: add a test_with_columns function
1067
- . test-lib-functions.sh: rename test_must_fail_acceptable()
1068
-
1069
- Shells that adjust COLUMNS (e.g. bash with checkwinsize shell
1070
- option), affect and break tests on progress meters and anything
1071
- that depends on term_columns(). An test-only environment variable
1072
- has been introduced as a workaround.
1073
-
1074
- Seems too involved for a last-minute fix.
1075
- cf. <20210804212825.GH23408@szeder.dev>
1076
-
1077
-
1078
-* cb/reftable-fixup (2021-08-02) 3 commits
1079
- . openbsd: allow reftable building with zlib 1.2.3
1080
- . reftable: clarify zlib version dependency
1081
- . fixup! Provide zlib's uncompress2 from compat/zlib-compat.c
1082
-
1083
- Fix-up for hn/reftable topic (no longer applicable).
1084
-
1085
-
1086
-* bc/inactive-submodules (2021-07-02) 1 commit
1087
- . submodule: mark submodules with update=none as inactive
1088
-
1089
- Usability update for inactive submodules.
1090
-
1091
- Retracted for now.
1092
- cf. <YRMpEV/uuHrxcOug@camp.crustytoothpaste.net>