What's cooking (2021/11 #06)
Junio C Hamano committed
Nov 24, 2021 at 16:55 UTC
545747bfd314ea6be19bad8738a7e9c2c6597dd3
1 file changed
+177
-90
whats-cooking.txt
+177
-90
@@ -1,12 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2021, #05; Fri, 19)
4
-X-master-at: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
5
-X-next-at: b44f4d0eb0c6319e109b5f54df97d96d0d6b46fd
3
+Subject: What's cooking in git.git (Nov 2021, #06; Wed, 24)
4
+X-master-at: 35151cf0720460a897cde9b8039af364743240e7
5
+X-next-at: a245620fadb0d35540dd0d2184f0f8314eb97080
6
7
-What's cooking in git.git (Nov 2021, #05; Fri, 19)
7
+What's cooking in git.git (Nov 2021, #06; Wed, 24)
8
--------------------------------------------------
9
10
+As 2.34.0 cycle was run rather loosely, we saw our share of
11
+regressions in the release. Hopefully we have caught the major ones
12
+and fixed them all in the 2.34.1 maintenance release that was just
13
+tagged.
14
+
15
+I've marked most of the topics that are in 'next' for the 'master'
16
+branch, except for a few topics, but if there are topics that should
17
+be rethought instead, please holler. Once flushing these topics
18
+down to 'master', the tip of 'next' will be rewound and then we'll
19
+start taking new topics to it.
20
+
21
Here are the topics that have been cooking in my tree. Commits
22
prefixed with '+' are in 'next' (being in 'next' is a sign that a
23
topic is stable enough to be used and are candidate to be in a
@@ -18,8 +29,6 @@ useful"). Do not read too much into a topic being in (or not in)
29
'seen'. The ones marked with '.' do not appear in any of the
30
integration branches, but I am still holding onto them.
31
21
-The tip of the 'master' branch is still at v2.34.0.
22
-
32
A few topics for regression fixes have been merged to 'next' and
33
will be merged to 'master' shortly. There are many topics listed as
34
"New" that are in 'seen', but I haven't read many of them (and I
@@ -54,9 +63,142 @@ Release tarballs are available at:
63
64
https://www.kernel.org/pub/software/scm/git/
65
66
+--------------------------------------------------
67
+[Graduated to 'master']
68
+
69
+* ab/update-submitting-patches (2021-11-13) 1 commit
70
+ (merged to 'next' on 2021-11-19 at b44f4d0eb0)
71
+ + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section
72
+
73
+ Doc fix.
74
+
75
+
76
+* ds/add-rm-with-sparse-index (2021-11-22) 1 commit
77
+ - dir: revert "dir: select directories correctly"
78
+
79
+ Regression fix for 2.34
80
+
81
+
82
+* ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit
83
+ (merged to 'next' on 2021-11-19 at 2d8f0cd000)
84
+ + pull: should be noop when already-up-to-date
85
+
86
+ "git pull" with any strategy when the other side is behind us
87
+ should succeed as it is a no-op, but doesn't.
88
+
89
+
90
+* hm/paint-hits-in-log-grep (2021-11-19) 1 commit
91
+ (merged to 'next' on 2021-11-19 at e146d25c7c)
92
+ + Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"
93
+
94
+ "git grep" looking in a blob that has non-UTF8 payload was
95
+ completely broken when linked with versions of PCREv2 library older
96
+ than 10.34 in the latest release.
97
+
98
+
99
+* jc/save-restore-terminal-revert (2021-11-22) 1 commit
100
+ - Revert "editor: save and reset terminal after calling EDITOR"
101
+
102
+ Regression fix for 2.34
103
+
104
--------------------------------------------------
105
[New Topics]
106
107
+* ab/ci-updates (2021-11-23) 5 commits
108
+ - CI: don't run "make test" twice in one job
109
+ - CI: use "$runs_on_pool", not "$jobname" to select packages & config
110
+ - CI: rename the "Linux32" job to lower-case "linux32"
111
+ - CI: use shorter names that fit in UX tooltips
112
+ - CI: remove Travis CI support
113
+
114
+
115
+* en/keep-cwd (2021-11-20) 8 commits
116
+ - dir: avoid removing the current working directory
117
+ - stash: do not attempt to remove current working directory
118
+ - clean: do not attempt to remove current working directory
119
+ - symlinks: do not include current working directory in dir removal
120
+ - unpack-trees: add special cwd handling
121
+ - unpack-trees: refuse to remove the current working directory
122
+ - repository, setup: introduce the_cwd
123
+ - t2501: add various tests for removing the current working directory
124
+
125
+
126
+* ab/run-command (2021-11-22) 5 commits
127
+ - run-command API: remove "argv" member, always use "args"
128
+ - run-command API users: use strvec_pushl(), not argv construction
129
+ - run-command API users: use strvec_pushv(), not argv assignment
130
+ - upload-archive: use regular "struct child_process" pattern
131
+ - archive-tar: use our own cmd.buf in error message
132
+
133
+
134
+* hn/create-reflog-simplify (2021-11-22) 1 commit
135
+ - refs: drop force_create argument of create_reflog API
136
+
137
+
138
+* hn/reflog-tests (2021-11-22) 4 commits
139
+ - t1400: use test-helper ref-store to inspect reflog contents
140
+ - test-ref-store: tweaks to for-each-reflog-ent format
141
+ - refs: trim newline from reflog message
142
+ - show-branch: show reflog message
143
+
144
+
145
+* jt/midx-doc-fix (2021-11-22) 1 commit
146
+ - Doc: no midx and partial clone relation
147
+
148
+
149
+* tl/ls-tree-oid-only (2021-11-22) 1 commit
150
+ - ls-tree.c: support `--oid-only` option for "git-ls-tree"
151
+
152
+
153
+* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits
154
+ - t7006: simplify exit-code checks for sigpipe tests
155
+ - t7006: clean up SIGPIPE handling in trace2 tests
156
+ - run-command: unify signal and regular logic for wait_or_whine()
157
+
158
+ The function to cull a child process and determine the exit status
159
+ had two separate code paths for normal callers and callers in a
160
+ signal handler, and the latter did not yield correct value when the
161
+ child has caught a signal. The handling of the exit status has
162
+ been unified for these two code paths. An existing test with
163
+ flakiness has also been corrected.
164
+
165
+ Will merge to 'next'.
166
+
167
+
168
+* em/missing-pager (2021-11-24) 1 commit
169
+ - pager: fix crash when pager program doesn't exist
170
+
171
+--------------------------------------------------
172
+[Stalled]
173
+
174
+* ar/submodule-update (2021-10-13) 9 commits
175
+ . submodule--helper: rename helper functions
176
+ . submodule--helper: remove unused helpers
177
+ . submodule: move core cmd_update() logic to C
178
+ . submodule--helper: run update using child process struct
179
+ . submodule--helper: allow setting superprefix for init_submodule()
180
+ . submodule--helper: refactor get_submodule_displaypath()
181
+ . submodule--helper: rename helpers for update-clone
182
+ . submodule--helper: get remote names from any repository
183
+ . submodule--helper: split up ensure_core_worktree()
184
+
185
+ Rewrite of "git submodule update" in C.
186
+
187
+ Kicked out of 'seen' to make room for es/superproject-aware-submodules
188
+ which is among the topics this topic stomps on.
189
+
190
+
191
+* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
192
+ - fetch: fix segfault on --set-upstream while on a detached HEAD
193
+
194
+ "git fetch --set-upstream" while on detached HEAD segfaulted
195
+ instead of noticing that such an operation did not make sense.
196
+
197
+ Getting tired of waiting for a reroll; will discard.
198
+
199
+--------------------------------------------------
200
+[Cooking]
201
+
202
* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit
203
- checkout: fix "branch info" memory leaks
204
@@ -110,25 +252,20 @@ Release tarballs are available at:
252
(this branch uses ld/sparse-diff-blame and vd/sparse-reset.)
253
254
113
-* ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit
114
- (merged to 'next' on 2021-11-19 at 2d8f0cd000)
115
- + pull: should be noop when already-up-to-date
116
-
117
- "git pull" with any strategy when the other side is behind us
118
- should succeed as it is a no-op, but doesn't.
119
-
120
- Will merge to 'master'.
121
-
122
-
255
* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
256
- ssh signing: make sign/amend test more resilient
257
- ssh signing: support non ssh-* keytypes
258
259
128
-* fs/test-prereq (2021-11-18) 2 commits
260
+* fs/test-prereq (2021-11-20) 3 commits
261
+ - test-lib: make BAIL_OUT() work in tests and prereq
262
- test-lib: introduce required prereq for test runs
263
- test-lib: show missing prereq summary
264
265
+ The test framework learns to list unsatisfied test prerequisites,
266
+ and optionally error out when prerequisites that are expected to be
267
+ satisfied are not.
268
+
269
270
* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit
271
- t5319: corrupt more bytes of the midx checksum
@@ -156,8 +293,7 @@ Release tarballs are available at:
293
Bitop fix for 32-bit boxes.
294
295
159
-* xw/am-empty (2021-11-19) 3 commits
160
- - SQUASH???
296
+* xw/am-empty (2021-11-22) 2 commits
297
- am: support --empty=<option> to handle empty patches
298
- doc: git-format-patch: describe the option --always
299
@@ -168,17 +304,6 @@ Release tarballs are available at:
304
Comment fix.
305
306
171
-* hm/paint-hits-in-log-grep (2021-11-19) 1 commit
172
- (merged to 'next' on 2021-11-19 at e146d25c7c)
173
- + Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"
174
-
175
- "git grep" looking in a blob that has non-UTF8 payload was
176
- completely broken when linked with certain versions of PCREv2
177
- library in the latest release.
178
-
179
- Will merge to 'master'.
180
-
181
-
307
* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit
308
- fetch-pack: ignore SIGPIPE when writing to index-pack
309
@@ -196,36 +321,6 @@ Release tarballs are available at:
321
322
Will merge to 'next'.
323
199
---------------------------------------------------
200
-[Stalled]
201
-
202
-* ar/submodule-update (2021-10-13) 9 commits
203
- . submodule--helper: rename helper functions
204
- . submodule--helper: remove unused helpers
205
- . submodule: move core cmd_update() logic to C
206
- . submodule--helper: run update using child process struct
207
- . submodule--helper: allow setting superprefix for init_submodule()
208
- . submodule--helper: refactor get_submodule_displaypath()
209
- . submodule--helper: rename helpers for update-clone
210
- . submodule--helper: get remote names from any repository
211
- . submodule--helper: split up ensure_core_worktree()
212
-
213
- Rewrite of "git submodule update" in C.
214
-
215
- Kicked out of 'seen' to make room for es/superproject-aware-submodules
216
- which is among the topics this topic stomps on.
217
-
218
-
219
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
220
- - fetch: fix segfault on --set-upstream while on a detached HEAD
221
-
222
- "git fetch --set-upstream" while on detached HEAD segfaulted
223
- instead of noticing that such an operation did not make sense.
224
-
225
- Getting tired of waiting for a reroll; will discard.
226
-
227
---------------------------------------------------
228
-[Cooking]
324
325
* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit
326
- submodule: absorb git dir instead of dying on deinit
@@ -275,23 +370,14 @@ Release tarballs are available at:
370
Will merge to 'next'.
371
372
278
-* ab/update-submitting-patches (2021-11-13) 1 commit
279
- (merged to 'next' on 2021-11-19 at b44f4d0eb0)
280
- + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section
281
-
282
- Doc fix.
283
-
284
- Will merge to 'master'.
285
-
286
-
373
* bc/require-c99 (2021-11-18) 1 commit
288
- - git-compat-util: add a test balloon for C99 support
374
+ . git-compat-util: add a test balloon for C99 support
375
376
Weather balloon to break people with compilers that do not support
377
C99.
378
379
294
-* jc/c99-var-decl-in-for-loop (2021-11-16) 1 commit
380
+* jc/c99-var-decl-in-for-loop (2021-11-22) 1 commit
381
- revision: use C99 declaration of variable in for() loop
382
383
Weather balloon to break comiplers that do not grok variable
@@ -390,7 +476,7 @@ Release tarballs are available at:
476
477
More tests are marked as leak-free.
478
393
- Will merge to 'next'?
479
+ Will merge to 'next'.
480
481
482
* if/redact-packfile-uri (2021-11-11) 2 commits
@@ -441,7 +527,7 @@ Release tarballs are available at:
527
528
Doc update.
529
444
- Will merge to 'next'?
530
+ Will merge to 'next'.
531
532
533
* jc/unsetenv-returns-an-int (2021-10-29) 1 commit
@@ -452,7 +538,7 @@ Release tarballs are available at:
538
mimic ancient, non-POSIX, variant seen in an old glibc; it has been
539
changed to return an integer to match the more modern era.
540
455
- Will cook in 'next'.
541
+ Will merge to 'master'.
542
543
544
* mc/clean-smudge-with-llp64 (2021-11-03) 8 commits
@@ -469,7 +555,7 @@ Release tarballs are available at:
555
The clean/smudge conversion code path has been prepared to better
556
work on platforms where ulong is narrower than size_t.
557
472
- Will cook in 'next'.
558
+ Will merge to 'master'.
559
560
561
* pw/diff-color-moved-fix (2021-10-27) 15 commits
@@ -520,7 +606,7 @@ Release tarballs are available at:
606
607
Make a few helper functions unused and then lose them.
608
523
- Will cook in 'next'.
609
+ Will merge to 'master'.
610
611
612
* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
@@ -531,7 +617,7 @@ Release tarballs are available at:
617
Allow "git status --porcelain=v2" to show the number of stash
618
entries with --show-stash like the normal output does.
619
534
- Will cook in 'next'.
620
+ Will merge to 'master'.
621
622
623
* tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits
@@ -548,7 +634,7 @@ Release tarballs are available at:
634
635
Leakfix.
636
551
- Will cook in 'next'.
637
+ Will merge to 'master'.
638
639
640
* es/pretty-describe-more (2021-11-01) 3 commits
@@ -599,7 +685,7 @@ Release tarballs are available at:
685
Code clean-up to eventually allow information on remotes defined
686
for an arbitrary repository to be read.
687
602
- Will merge to 'next'?
688
+ Will merge to 'next'.
689
690
691
* jk/loosen-urlmatch (2021-10-12) 1 commit
@@ -609,10 +695,10 @@ Release tarballs are available at:
695
Treat "_" as any other URL-valid characters in an URL when matching
696
the per-URL configuration variable names.
697
612
- Will cook in 'next'.
698
+ Will merge to 'master'.
699
700
615
-* ab/config-based-hooks-2 (2021-11-01) 18 commits
701
+* ab/config-based-hooks-2 (2021-11-24) 18 commits
702
- run-command: remove old run_hook_{le,ve}() hook API
703
- receive-pack: convert push-to-checkout hook to hook.h
704
- read-cache: convert post-index-change to use hook.h
@@ -644,19 +730,20 @@ Release tarballs are available at:
730
"git stash" learned the "--staged" option to stash away what has
731
been added to the index (and nothing else).
732
647
- Will cook in 'next'.
733
+ Will merge to 'master'.
734
735
650
-* vd/sparse-sparsity-fix-on-read (2021-10-27) 3 commits
736
+* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits
737
- sparse-index: update do_read_index to ensure correct sparsity
738
- sparse-index: add ensure_correct_sparsity function
739
+ - sparse-index: avoid unnecessary cache tree clearing
740
- test-read-cache.c: prepare_repo_settings after config init
741
742
Ensure that the sparseness of the in-core index matches the
743
index.sparse configuration specified by the repository immediately
744
after the on-disk index file is read.
745
659
- Will merge to 'next'?
746
+ Will merge to 'next'.
747
748
749
* jc/fix-ref-sorting-parse (2021-10-20) 2 commits
@@ -669,7 +756,7 @@ Release tarballs are available at:
756
sort key information, no longer errors out by seeing a bogus sort
757
key.
758
672
- Will cook in 'next'.
759
+ Will merge to 'master'.
760
761
762
* jc/tutorial-format-patch-base (2021-10-23) 1 commit
@@ -679,7 +766,7 @@ Release tarballs are available at:
766
Teach and encourage first-time contributors to this project to
767
state the base commit when they submit their topic.
768
682
- Will cook in 'next'.
769
+ Will merge to 'master'.
770
771
772
* js/branch-track-inherit (2021-11-18) 1 commit
@@ -788,7 +875,7 @@ Release tarballs are available at:
875
Various operating modes of "git reset" have been made to work
876
better with the sparse index.
877
791
- Will merge to 'next'?
878
+ Will merge to 'next'.
879
880
881
* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
@@ -832,7 +919,7 @@ Release tarballs are available at:
919
The command line complation for "git send-email" options have been
920
tweaked to make it easier to keep it in sync with the command itself.
921
835
- Will cook in 'next'.
922
+ Will merge to 'master'.
923
924
925
* ns/batched-fsync (2021-10-27) 9 commits
@@ -920,7 +1007,7 @@ Release tarballs are available at:
1007
1008
The "remainder" of hn/refs-errno-cleanup topic.
1009
923
- Will cook in 'next'.
1010
+ Will merge to 'master'.
1011
1012
1013
* ab/only-single-progress-at-once (2021-11-03) 8 commits
@@ -960,4 +1047,4 @@ Release tarballs are available at:
1047
The "reftable" backend for the refs API, without integrating into
1048
the refs subsystem.
1049
963
- Will merge to 'next'?
1050
+ Will merge to 'next'.