What's cooking (2021/11 #03)
Junio C Hamano committed
Nov 9, 2021 at 13:57 UTC
3c025b6fa35fa3089b8e2174ac78d79fabb3e829
1 file changed
+106
-92
whats-cooking.txt
+106
-92
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2021, #02; Wed, 3)
4
-X-master-at: 876b1423317071f43c99666f3fc3db3642dfbe14
5
-X-next-at: 1ee627454180a9cdee044e51a3e50dd415a92f4b
3
+Subject: What's cooking in git.git (Nov 2021, #03; Tue, 9)
4
+X-master-at: 6c220937e2b26d85920bf2d38ff2464a0d57fd6b
5
+X-next-at: 773e6cccef14fb4ef03dc964d7f80ceb691c12be
6
7
-What's cooking in git.git (Nov 2021, #02; Wed, 3)
7
+What's cooking in git.git (Nov 2021, #03; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,7 +18,7 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
21
-Git 2.34-rc1 has been tagged with a handful of regression fixes.
21
+Git 2.34-rc2 has been tagged with a few more regression fixes.
22
Thank you all for finding, reporting and fixing them so quickly.
23
24
Copies of the source code to Git live in many repositories, and the
@@ -50,59 +50,83 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
53
-[Graduated to 'master']
53
+[New Topics]
54
55
-* ds/add-rm-with-sparse-index (2021-11-03) 1 commit
56
- (merged to 'next' on 2021-11-03 at 827a7d774b)
57
- + dir: fix directory-matching bug
55
+* ak/fetch-not-overwrite-any-current-branch (2021-11-08) 2 commits
56
+ - receive-pack: protect current branch for bare repository worktree
57
+ - fetch: protect branches checked out in all worktrees
58
59
- Regression fix.
59
+ "git fetch" without the "--update-head-ok" option ought to protect
60
+ a checked out branch from getting updated, to prevent the working
61
+ tree that checks it out to go out of sync. The code was written
62
+ before the use of "git worktree" got widespread, and only checked
63
+ the branch that was checked out in the current worktree, which has
64
+ been updated.
65
66
+ Reroll exists.
67
62
-* jx/message-fixes (2021-10-31) 1 commit
63
- (merged to 'next' on 2021-11-01 at f27cf92855)
64
- + i18n: fix typos found during l10n for git 2.34.0
65
- (this branch is used by ab/mark-leak-free-tests-even-more.)
68
67
- Fixes to recently added messages.
69
+* jk/test-bitmap-fix (2021-11-05) 1 commit
70
+ - test_bitmap_hashes(): handle repository without bitmaps
71
72
+ Tighten code for testing pack-bitmap.
73
70
-* pw/rebase-r-fixes (2021-11-03) 1 commit
71
- (merged to 'next' on 2021-11-03 at 928f9c05d8)
72
- + rebase -i: fix rewording with --committer-date-is-author-date
74
+ Will merge to 'next'.
75
74
- Regression fix.
76
77
+* jk/jump-merge-with-pathspec (2021-11-09) 1 commit
78
+ - git-jump: pass "merge" arguments to ls-files
79
77
-* rs/ssh-signing-fix (2021-11-01) 2 commits
78
- (merged to 'next' on 2021-11-01 at f50e78f952)
79
- + gpg-interface: avoid buffer overrun in parse_ssh_output()
80
- + gpg-interface: handle missing " with " gracefully in parse_ssh_output()
80
+ The "merge" subcommand of "git jump" (in contrib/) silently ignored
81
+ pathspec and other parameters.
82
82
- Fixes to recently merged topic.
83
+ Will merge to 'next'.
84
85
--------------------------------------------------
85
-[New Topics]
86
+[Graduated to 'master']
87
87
-* jk/strbuf-addftime-seconds-since-epoch (2021-11-03) 1 commit
88
- - strbuf_addftime(): handle "%s" manually
88
+* ab/parse-options-cleanup (2021-11-09) 1 commit
89
+ (merged to 'next' on 2021-11-09 at b2b859289b)
90
+ + parse-options.[ch]: revert use of "enum" for parse_options()
91
90
- The "--date=format:<strftime>" gained a workaround for the lack of
91
- system support for a non-local timezone to handle "%s" placeholder.
92
+ Last minute fix to the update already in 'master'.
93
94
94
-* js/ci-no-directional-formatting (2021-11-03) 1 commit
95
- - ci: disallow directional formatting
95
+* ad/ssh-signing-testfix (2021-11-05) 1 commit
96
+ (merged to 'next' on 2021-11-09 at f5ff9c35ad)
97
+ + t/lib-git.sh: fix ACL-related permissions failure
98
97
- CI has been taught to catch some Unicode directional formatting
98
- sequence that can be used in certain mischief.
99
+ Fix ssh-signing test to work on a platform where the default ACL is
100
+ overly loose to upset OpenSSH (reported on an installation of Cygwin).
101
102
101
-* tw/var-default-branch (2021-11-03) 1 commit
102
- - var: add GIT_DEFAULT_BRANCH variable
103
+* ar/fix-git-pull-no-verify (2021-10-28) 1 commit
104
+ (merged to 'next' on 2021-11-01 at 74677b0a76)
105
+ + pull: honor --no-verify and do not call the commit-msg hook
106
+
107
+ "git pull --no-verify" did not affect the underlying "git merge".
108
104
- "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
105
- the newly created branch if "git init" is run.
109
+
110
+* ar/no-verify-doc (2021-10-29) 1 commit
111
+ (merged to 'next' on 2021-11-01 at f6809a9ddb)
112
+ + Document positive variant of commit and merge option "--no-verify"
113
+
114
+ Doc update.
115
+
116
+
117
+* rd/http-backend-code-simplification (2021-10-25) 1 commit
118
+ (merged to 'next' on 2021-11-01 at f45b33890c)
119
+ + http-backend: remove a duplicated code branch
120
+
121
+ Code simplification.
122
+
123
+
124
+* vd/pthread-setspecific-g11-fix (2021-11-03) 1 commit
125
+ (merged to 'next' on 2021-11-03 at b4fce69914)
126
+ + async_die_is_recursing: work around GCC v11.x issue on Fedora
127
+
128
+ One CI task based on Fedora image noticed a not-quite-kosher
129
+ consturct recently, which has been corrected.
130
131
--------------------------------------------------
132
[Stalled]
@@ -150,6 +174,27 @@ Release tarballs are available at:
174
--------------------------------------------------
175
[Cooking]
176
177
+* jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit
178
+ - strbuf_addftime(): handle "%s" manually
179
+
180
+ The "--date=format:<strftime>" gained a workaround for the lack of
181
+ system support for a non-local timezone to handle "%s" placeholder.
182
+
183
+
184
+* js/ci-no-directional-formatting (2021-11-04) 1 commit
185
+ - ci: disallow directional formatting
186
+
187
+ CI has been taught to catch some Unicode directional formatting
188
+ sequence that can be used in certain mischief.
189
+
190
+
191
+* tw/var-default-branch (2021-11-03) 1 commit
192
+ - var: add GIT_DEFAULT_BRANCH variable
193
+
194
+ "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
195
+ the newly created branch if "git init" is run.
196
+
197
+
198
* ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits
199
- leak tests: mark some fast-import tests as passing with SANITIZE=leak
200
- leak tests: mark some config tests as passing with SANITIZE=leak
@@ -170,15 +215,6 @@ Release tarballs are available at:
215
More tests are marked as leak-free.
216
217
173
-* ar/fix-git-pull-no-verify (2021-10-28) 1 commit
174
- (merged to 'next' on 2021-11-01 at 74677b0a76)
175
- + pull: honor --no-verify and do not call the commit-msg hook
176
-
177
- "git pull --no-verify" did not affect the underlying "git merge".
178
-
179
- Will merge to 'master'.
180
-
181
-
218
* if/redact-packfile-uri (2021-10-29) 2 commits
219
- http-fetch: redact url on die() message
220
- fetch-pack: redact packfile urls in traces
@@ -186,22 +222,13 @@ Release tarballs are available at:
222
Redact the path part of packfile URI that appears in the trace output.
223
224
189
-* ar/no-verify-doc (2021-10-29) 1 commit
190
- (merged to 'next' on 2021-11-01 at f6809a9ddb)
191
- + Document positive variant of commit and merge option "--no-verify"
192
-
193
- Doc update.
194
-
195
- Will merge to 'master'.
196
-
197
-
225
* ew/test-wo-fsync (2021-10-29) 1 commit
226
- tests: disable fsync everywhere
227
228
Allow running our tests while disabling internal fsync.
229
230
204
-* ja/doc-cleanup (2021-10-28) 10 commits
231
+* ja/doc-cleanup (2021-11-09) 10 commits
232
- init doc: --shared=0xxx does not give umask but perm bits
233
- doc: git-init: clarify file modes in octal.
234
- doc: git-http-push: describe the refs as pattern pairs
@@ -215,7 +242,7 @@ Release tarballs are available at:
242
243
Doc update.
244
218
- Under discussion.
245
+ Will merge to 'next'.
246
247
248
* re/color-default-reset (2021-10-28) 3 commits
@@ -245,19 +272,20 @@ Release tarballs are available at:
272
273
274
* mc/clean-smudge-with-llp64 (2021-11-03) 8 commits
248
- - clean/smudge: allow clean filters to process extremely large files
249
- - odb: guard against data loss checking out a huge file
250
- - git-compat-util: introduce more size_t helpers
251
- - odb: teach read_blob_entry to use size_t
252
- - t1051: introduce a smudge filter test for extremely large files
253
- - test-lib: add prerequisite for 64-bit platforms
254
- - test-tool genzeros: generate large amounts of data more efficiently
255
- - test-genzeros: allow more than 2G zeros in Windows
275
+ (merged to 'next' on 2021-11-03 at fe5160a170)
276
+ + clean/smudge: allow clean filters to process extremely large files
277
+ + odb: guard against data loss checking out a huge file
278
+ + git-compat-util: introduce more size_t helpers
279
+ + odb: teach read_blob_entry to use size_t
280
+ + t1051: introduce a smudge filter test for extremely large files
281
+ + test-lib: add prerequisite for 64-bit platforms
282
+ + test-tool genzeros: generate large amounts of data more efficiently
283
+ + test-genzeros: allow more than 2G zeros in Windows
284
285
The clean/smudge conversion code path has been prepared to better
286
work on platforms where ulong is narrower than size_t.
287
260
- Will merge to 'next'.
288
+ Will cook in 'next'.
289
290
291
* pw/diff-color-moved-fix (2021-10-27) 15 commits
@@ -281,8 +309,8 @@ Release tarballs are available at:
309
--color-moved" feature.
310
311
284
-* ab/generate-command-list (2021-10-23) 10 commits
285
- - generate-cmdlist.sh: replace "cut", "tr" and "grep" with pure-shell
312
+* ab/generate-command-list (2021-11-05) 10 commits
313
+ - generate-cmdlist.sh: don't parse command-list.txt thrice
314
- generate-cmdlist.sh: replace "grep' invocation with a shell version
315
- generate-cmdlist.sh: do not shell out to "sed"
316
- generate-cmdlist.sh: stop sorting category lines
@@ -295,9 +323,6 @@ Release tarballs are available at:
323
324
Build optimization.
325
298
- Getting there.
299
- cf. <xmqqsfwr8j66.fsf@gitster.g>
300
-
326
327
* jc/fix-pull-ff-only-when-already-up-to-date (2021-10-29) 1 commit
328
(merged to 'next' on 2021-10-29 at ad4753e668)
@@ -313,16 +338,17 @@ Release tarballs are available at:
338
339
340
* ab/sh-retire-helper-functions (2021-10-21) 6 commits
316
- - git-sh-setup: remove "sane_grep", it's not needed anymore
317
- - git-sh-setup: remove unused sane_egrep() function
318
- - git-instaweb: unconditionally assume that gitweb is mod_perl capable
319
- - Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
320
- - Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
321
- - Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
341
+ (merged to 'next' on 2021-11-03 at 4b49d9f4be)
342
+ + git-sh-setup: remove "sane_grep", it's not needed anymore
343
+ + git-sh-setup: remove unused sane_egrep() function
344
+ + git-instaweb: unconditionally assume that gitweb is mod_perl capable
345
+ + Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
346
+ + Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
347
+ + Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
348
349
Make a few helper functions unused and then lose them.
350
325
- Will merge to 'next'.
351
+ Will cook in 'next'.
352
353
354
* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
@@ -385,15 +411,6 @@ Release tarballs are available at:
411
on, and hint/nudge contributors to read others' changes.
412
413
388
-* rd/http-backend-code-simplification (2021-10-25) 1 commit
389
- (merged to 'next' on 2021-11-01 at f45b33890c)
390
- + http-backend: remove a duplicated code branch
391
-
392
- Code simplification.
393
-
394
- Will merge to 'master'.
395
-
396
-
414
* gc/remote-with-fewer-static-global-variables (2021-10-28) 6 commits
415
- remote: add struct repository parameter to external functions
416
- remote: die if branch is not found in repository
@@ -597,7 +614,7 @@ Release tarballs are available at:
614
Various operating modes of "git reset" have been made to work
615
better with the sparse index.
616
600
- Ready?
617
+ Will merge to 'next'?
618
619
620
* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
@@ -622,7 +639,7 @@ Release tarballs are available at:
639
protect the fixes.
640
641
625
-* es/superproject-aware-submodules (2021-10-14) 4 commits
642
+* es/superproject-aware-submodules (2021-11-04) 4 commits
643
- submodule: record superproject gitdir during 'update'
644
- submodule: record superproject gitdir during absorbgitdirs
645
- introduce submodule.superprojectGitDir record
@@ -631,9 +648,6 @@ Release tarballs are available at:
648
A configuration variable in a submodule points at the location of
649
the superproject it is bound to (RFC).
650
634
- Under discussion.
635
- cf. <911ab2c1-8a11-d9d0-4b28-fc801112f6da@gmail.com>
636
-
651
652
* tp/send-email-completion (2021-10-28) 2 commits
653
(merged to 'next' on 2021-11-01 at 7104356cc0)