What's cooking (2021/08 #06)
... plus an updte to MaintNotes post release.
Junio C Hamano committed
Aug 16, 2021 at 14:01 UTC
127280aedbd1d3957b1254305f2c6a2c294790f7
2 files changed
+154
-126
MaintNotes
+17
-11
@@ -165,8 +165,13 @@ viewed online at:
165
166
* How various branches are used.
167
168
-There are four branches in git.git repository that track the source tree
169
-of git: "master", "maint", "next", and "seen".
168
+There are four "integration" branches in git.git repository that track
169
+the source tree of git: "master", "maint", "next", and "seen". They
170
+however almost never get new commits made directly on them. Instead,
171
+a branch is forked from either "master" or "maint" for each "topic",
172
+whether it is a new feature or fix for a bug, and holds a set of
173
+commits that belong to the same theme, and then such a "topic branch"
174
+is merged to these integration branches.
175
176
The "master" branch is meant to contain what are very well tested and
177
ready to be used in a production setting. Every now and then, a
@@ -175,24 +180,25 @@ named with three dotted decimal digits (e.g. "1.8.5"), but we have
180
switched the versioning scheme and "feature releases" are named with
181
three-dotted decimal digits that ends with ".0" (e.g. "1.9.0").
182
178
-The last such release was 2.32 done on June 6th, 2021. You can expect
179
-that the tip of the "master" branch is always more stable than any of
180
-the released versions.
183
+The last such release was 2.33 done on August 16th, 2021. You can
184
+expect that the tip of the "master" branch is always more stable than
185
+any of the released versions.
186
187
Whenever a feature release is made, "maint" branch is forked off from
188
"master" at that point. Obvious and safe fixes after a feature
184
-release are applied to this branch and maintenance releases are cut
185
-from it. Usually the fixes are merged to the "master" branch first,
189
+release are merged to this branch and maintenance releases are cut
190
+from it. Usually these fixes are merged to the "master" branch first,
191
several days before merged to the "maint" branch, to reduce the chance
192
of last-minute issues. The maintenance releases used to be named with
193
four dotted decimal, named after the feature release they are updates
194
to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5"
195
feature release). These days, maintenance releases are named by
191
-incrementing the last digit of three-dotted decimal name (e.g. "2.29.2"
192
-was the second maintenance release for the "2.29" series).
196
+incrementing the last digit of three-dotted decimal name (e.g.
197
+"2.29.2" was the second maintenance release for the "2.29" series).
198
194
-New features never go to the 'maint' branch. It is merged into "master"
195
-primarily to propagate the description in the release notes forward.
199
+New features never go to the "maint" branch. It is merged into
200
+"master" primarily to propagate the description in the release notes
201
+forward.
202
203
A new development does not usually happen on "master". When you send a
204
series of patches, after review on the mailing list, a separate topic
whats-cooking.txt
+137
-115
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2021, #05; Thu, 12)
3
-X-master-at: 5d213e46bb7b880238ff5ea3914e940a50ae9369
4
-X-next-at: ed5fa647cd5d07bf513e4487e6352c72bffe54ea
2
+Subject: What's cooking in git.git (Aug 2021, #06; Mon, 16)
3
+X-master-at: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
4
+X-next-at: 9b09ab0cd71e3176c74aab77531d8c6b18775e2d
5
6
-What's cooking in git.git (Aug 2021, #05; Thu, 12)
6
+What's cooking in git.git (Aug 2021, #06; Mon, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -17,11 +17,7 @@ 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-rc2 has been tagged. The last couple of days, I may have
21
-ignored patches on new topics that are irrelevant to the upcoming
22
-release, and will continue to do so until the current cycle is over.
23
-Please resend them after the final release of Git 2.33 if they are
24
-still relevant.
20
+Git 2.33 (final) has been tagged.
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -54,102 +50,60 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
57
-* cb/many-alternate-optim-fixup (2021-08-11) 3 commits
58
- (merged to 'next' on 2021-08-11 at 02b3558652)
59
- + object-file: use unsigned arithmetic with bit mask
60
- (merged to 'next' on 2021-08-09 at 3572bef349)
61
- + object-store: avoid extra ';' from KHASH_INIT
62
- + oidtree: avoid nested struct oidtree_node
63
- (this branch is used by cb/ci-build-pedantic.)
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
65
- Build fix.
66
-
67
-
68
-* jn/log-m-does-not-imply-p (2021-08-09) 1 commit
69
- (merged to 'next' on 2021-08-09 at d937d09924)
70
- + Revert 'diff-merges: let "-m" imply "-p"'
71
-
72
- Earlier "git log -m" was changed to always produce patch output,
73
- which would break existing scripts, which has been reverted.
57
+ Codepath to access recently added oidtree data structure had
58
+ to make unaligned accesses to oids, which has been corrected.
59
60
--------------------------------------------------
61
[New Topics]
62
78
-* th/userdiff-more-java (2021-08-11) 1 commit
79
- - userdiff: improve java hunk header regex
80
-
81
- The userdiff pattern for "java" language has been updated.
63
+* ar/submodule-run-update-procedure (2021-08-13) 1 commit
64
+ - submodule--helper: run update procedures from C
65
83
- Will merge to 'next'.
66
+ Reimplementation of parts of "git submodule" in C continues.
67
68
86
-* zh/cherry-pick-advice (2021-08-11) 1 commit
87
- - cherry-pick: use better advice message
69
+* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit
70
+ - ci: use upload-artifacts v1 for dockerized jobs
71
89
- The advice message that "git cherry-pick" gives when it asks
90
- conflicted replay of a commit to be resolved by the end user has
91
- been updated.
92
-
93
- cf. <a510722c-d5a2-f00c-dd20-dd7f76da2408@gmail.com>
94
-
95
-
96
-* es/config-based-hooks (2021-08-11) 7 commits
97
- - hook: allow out-of-repo 'git hook' invocations
98
- - hook: include hooks from the config
99
- - hook: allow running non-native hooks
100
- - hook: introduce "git hook list"
101
- - hook: allow parallel hook execution
102
- - hook: run a list of hooks instead
103
- - Merge branch 'ab/config-based-hooks-base' into es/config-based-hooks
104
- (this branch uses ab/config-based-hooks-base.)
105
-
106
- Revamp the hooks subsystem to allow multiple of them to trigger
107
- upon the same event and control via the configuration variables.
108
-
109
-
110
-* mk/clone-recurse-submodules (2021-08-11) 1 commit
111
- - clone: set submodule.recurse=true if user enables feature.experimental flag
112
-
113
- It is proposed that in the future "git clone --recurse-submodules"
114
- unconditionally sets "submodule.recurse" configuration variable to
115
- true. Users can opt into the future early to enable this (and
116
- other new features) by setting the "feature.experimental" variable
117
- to true.
118
-
119
-
120
-* bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit
121
- - t5607: avoid using prerequisites to select algorithm
122
-
123
- The current implementation of GIT_TEST_FAIL_PREREQS is broken in
124
- that checking for the lack of a prerequisite would not work. Avoid
125
- the use of "if ! test_have_prereq X" in a test script.
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
130
-* jk/commit-edit-fixup-fix (2021-08-12) 1 commit
131
- - commit: restore --edit when combined with --fixup
132
-
133
- "git commit --fixup" now works with "--edit" again, after it was
134
- broken in v2.32.
135
-
136
- Will merge to 'next'?
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
139
-* tl/traverse-non-commits-rename (2021-08-12) 1 commit
140
- - list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
89
+ Will merge to 'next'.
90
142
- Meh.
91
144
- Will merge to 'next'.
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.
98
147
-* cb/ci-freebsd-update (2021-08-12) 1 commit
148
- - ci: update freebsd 12 cirrus job
99
150
- Update FreeBSD CI job
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
152
- Will merge to 'next'.
106
+ Various bugs in "git rebase -r" have been fixed.
107
108
--------------------------------------------------
109
[Stalled]
@@ -232,6 +186,81 @@ Release tarballs are available at:
186
--------------------------------------------------
187
[Cooking]
188
189
+* th/userdiff-more-java (2021-08-11) 1 commit
190
+ - userdiff: improve java hunk header regex
191
+
192
+ The userdiff pattern for "java" language has been updated.
193
+
194
+ Will merge to 'next'.
195
+
196
+
197
+* zh/cherry-pick-advice (2021-08-14) 1 commit
198
+ - cherry-pick: use better advice message
199
+
200
+ The advice message that "git cherry-pick" gives when it asks
201
+ conflicted replay of a commit to be resolved by the end user has
202
+ been updated.
203
+
204
+
205
+* es/config-based-hooks (2021-08-11) 7 commits
206
+ - hook: allow out-of-repo 'git hook' invocations
207
+ - hook: include hooks from the config
208
+ - hook: allow running non-native hooks
209
+ - hook: introduce "git hook list"
210
+ - hook: allow parallel hook execution
211
+ - hook: run a list of hooks instead
212
+ - Merge branch 'ab/config-based-hooks-base' into es/config-based-hooks
213
+ (this branch uses ab/config-based-hooks-base.)
214
+
215
+ Revamp the hooks subsystem to allow multiple of them to trigger
216
+ upon the same event and control via the configuration variables.
217
+
218
+
219
+* mk/clone-recurse-submodules (2021-08-14) 1 commit
220
+ - clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
221
+
222
+ After "git clone --recurse-submodules", all submodules are cloned
223
+ but they are not by default recursed into by other commands. With
224
+ submodule.stickyRecursiveClone configuration set, submodule.recurse
225
+ configuration is set to true in a repository created by "clone"
226
+ with "--recurse-submodules" option.
227
+
228
+
229
+* bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit
230
+ - t5607: avoid using prerequisites to select algorithm
231
+
232
+ The current implementation of GIT_TEST_FAIL_PREREQS is broken in
233
+ that checking for the lack of a prerequisite would not work. Avoid
234
+ the use of "if ! test_have_prereq X" in a test script.
235
+
236
+ Will merge to 'next'.
237
+
238
+
239
+* jk/commit-edit-fixup-fix (2021-08-15) 1 commit
240
+ - commit: restore --edit when combined with --fixup
241
+
242
+ "git commit --fixup" now works with "--edit" again, after it was
243
+ broken in v2.32.
244
+
245
+ Will merge to 'next'?
246
+
247
+
248
+* tl/traverse-non-commits-rename (2021-08-12) 1 commit
249
+ - list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
250
+
251
+ Meh.
252
+
253
+ Will merge to 'next'.
254
+
255
+
256
+* cb/ci-freebsd-update (2021-08-12) 1 commit
257
+ - ci: update freebsd 12 cirrus job
258
+
259
+ Update FreeBSD CI job
260
+
261
+ Will merge to 'next'.
262
+
263
+
264
* cb/builtin-merge-format-string-fix (2021-08-09) 1 commit
265
- builtin/merge: avoid -Wformat-extra-args from ancient Xcode
266
@@ -240,7 +269,7 @@ Release tarballs are available at:
269
Will merge to 'next'.
270
271
243
-* ka/want-ref-in-namespace (2021-08-09) 3 commits
272
+* ka/want-ref-in-namespace (2021-08-13) 3 commits
273
- docs: clarify the interaction of transfer.hideRefs and namespaces
274
- upload-pack.c: treat want-ref relative to namespace
275
- t5730: introduce fetch command helper
@@ -333,8 +362,9 @@ Release tarballs are available at:
362
duplicated changes.
363
364
336
-* jt/grep-wo-submodule-odb-as-alternate (2021-08-10) 7 commits
365
+* jt/grep-wo-submodule-odb-as-alternate (2021-08-13) 8 commits
366
- t7814: show lack of alternate ODB-adding
367
+ - submodule-config: pass repo upon blob config read
368
- grep: add repository to OID grep sources
369
- grep: allocate subrepos on heap
370
- grep: read submodule entry with explicit repo
@@ -406,17 +436,6 @@ Release tarballs are available at:
436
Will cook in 'next'.
437
438
409
-* cb/reftable-fixup (2021-08-02) 3 commits
410
- - openbsd: allow reftable building with zlib 1.2.3
411
- - reftable: clarify zlib version dependency
412
- - fixup! Provide zlib's uncompress2 from compat/zlib-compat.c
413
- (this branch uses hn/reftable.)
414
-
415
- Fixes to another topic.
416
-
417
- Will discard after they are picked up by the target topic.
418
-
419
-
439
* en/merge-strategy-docs (2021-08-05) 10 commits
440
- Update error message and code comment
441
- merge-strategies.txt: add coverage of the `ort` merge strategy
@@ -657,8 +676,7 @@ Release tarballs are available at:
676
Will cook in 'next'.
677
678
660
-* hn/reftable (2021-07-20) 26 commits
661
- - t7004: avoid direct filesystem access
679
+* hn/reftable (2021-08-16) 25 commits
680
- t1404: annotate test cases with REFFILES
681
- t1401,t2011: parameterize HEAD.lock for REFFILES
682
- t1301: document what needs to be done for reftable
@@ -684,13 +702,9 @@ Release tarballs are available at:
702
- reftable: RFC: add LICENSE
703
- init-db: set the_repository->hash_algo early on
704
- hash.h: provide constants for the hash IDs
687
- (this branch is used by cb/reftable-fixup.)
705
706
The "reftable" backend for the refs API.
707
691
- Seems to break CI jobs in 'seen'.
692
- cf. https://github.com/git/git/runs/3257622953?check_suite_focus=true#step:4:1685
693
-
708
709
* ab/refs-files-cleanup (2021-08-02) 11 commits
710
(merged to 'next' on 2021-08-04 at 8ca0ef1b6e)
@@ -728,15 +742,6 @@ Release tarballs are available at:
742
Will merge to 'next'.
743
744
731
-* bc/inactive-submodules (2021-07-02) 1 commit
732
- - submodule: mark submodules with update=none as inactive
733
-
734
- Usability update for inactive submodules.
735
-
736
- Retracted for now.
737
- cf. <YRMpEV/uuHrxcOug@camp.crustytoothpaste.net>
738
-
739
-
745
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
746
- fetch: fix segfault on --set-upstream while on a detached HEAD
747
@@ -1057,9 +1062,9 @@ Release tarballs are available at:
1062
[Discarded]
1063
1064
* ab/test-columns (2021-08-05) 3 commits
1060
- - test-lib.sh: use GIT_TEST_COLUMNS over COLUMNS
1061
- - test-lib-functions.sh: add a test_with_columns function
1062
- - test-lib-functions.sh: rename test_must_fail_acceptable()
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
@@ -1068,3 +1073,20 @@ Release tarballs are available at:
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>