What's cooking (2022/01 #07)
Junio C Hamano committed
Jan 24, 2022 at 10:32 UTC
4401f32e03452483690f57132bdea0d1486272d6
1 file changed
+85
-96
whats-cooking.txt
+85
-96
@@ -1,35 +1,15 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2022, #06; Fri, 21)
4
-X-master-at: 297ca895a27a6bbdb7906371d533f72a12ad25b2
5
-X-next-at: 9bf600f5edf4beea0ee980660bdc5ff523e7b5c5
3
+Subject: What's cooking in git.git (Jan 2022, #07; Mon, 24)
4
+X-master-at: 89bece5c8c96f0b962cfc89e63f82d603fd60bed
5
+X-next-at: 8bbb082509e826de6735dfa02922cfc3d7ffb8bc
6
7
-What's cooking in git.git (Jan 2022, #06; Fri, 21)
7
+What's cooking in git.git (Jan 2022, #07; Mon, 24)
8
--------------------------------------------------
9
10
-Possibly a few more last-minute fixes may want to be on 'master'
11
-before the final:
12
-
13
- - ab/checkout-branch-info-leakfix is to stop "git checkout -f
14
- <ref>" from triggering BUG() when <ref> is a symbolic ref that
15
- points at a strange place.
16
-
17
- - en/merge-ort-restart-optim-fix is to avoid triggering assertion
18
- failure when merge.renameLimit is set to a value that is too low.
19
-
20
- - js/test-unset-trace2-parents is to help those developers who run
21
- "make test" inside a git that is being traced via GIT_TRACE2
22
- mechanism.
23
-
24
- - ab/auto-detect-zlib-compress2 is to automate use of replacement
25
- uncompress2() implementation on platforms with zlib that is too
26
- old.
27
-
28
- - pb/pull-rebase-autostash-fix is to fix the remaining case where
29
- "git pull --rebase" that reused the merge machinery when the
30
- update can be fast-forwarded did not behave well.
31
-
32
-but we can probably do without many of them in the worst case.
10
+Git 2.35 final has been tagged. Let's wait for a few days to see if
11
+there are regressions that needs brown-paper-bag fixes before we
12
+start moving topics from 'next' to 'master' for the new cycle.
13
14
Here are the topics that have been cooking in my tree. Commits
15
prefixed with '+' are in 'next' (being in 'next' is a sign that a
@@ -71,29 +51,91 @@ Release tarballs are available at:
51
https://www.kernel.org/pub/software/scm/git/
52
53
--------------------------------------------------
74
-[New Topics]
75
-
76
-* ab/auto-detect-zlib-compress2 (2022-01-21) 1 commit
77
- - cache.h: auto-detect if zlib has uncompress2()
78
-
79
- Notice older zlib to enable our replacement uncompress2()
80
- automatically.
81
-
82
- Will merge to 'next'.
83
- source: <patch-v3-1.1-e9cb8763fd4-20220120T011414Z-avarab@gmail.com>
84
-
54
+[Graduated to 'master']
55
56
* ab/checkout-branch-info-leakfix (2022-01-21) 1 commit
87
- - checkout: avoid BUG() when hitting a broken repository
57
+ (merged to 'next' on 2022-01-23 at 8bbb082509)
58
+ + checkout: avoid BUG() when hitting a broken repository
59
60
We added an unrelated sanity checking that leads to a BUG() while
61
plugging a leak, which triggered in a repository with symrefs in
62
the local branch namespace that point at a ref outside. Partially
63
revert the change to avoid triggering the BUG().
93
-
94
- Will merge to 'next' and then to 'master'?
64
source: <xmqqbl04d1s9.fsf_-_@gitster.g>
65
66
+--------------------------------------------------
67
+[New Topics]
68
+
69
+* jc/mem-pool-alignment (2022-01-24) 1 commit
70
+ - mem-pool: don't assume uintmax_t is aligned enough for all types
71
+
72
+ Update the logic to compute alignment requirement for our mem-pool.
73
+
74
+ Will merge to 'next'?
75
+ source: <20220123203347.74869-1-jrtc27@jrtc27.com>
76
+
77
+--------------------------------------------------
78
+[Stalled]
79
+
80
+* je/http-better-error-output (2021-12-03) 1 commit
81
+ . http-backend: give a hint that web browser access is not supported
82
+
83
+ When the http-backend program, which is the server-side component
84
+ for the smart HTTP transport, sends a "404 Not found" error, we
85
+ deliberately did not say anything to the requesting client. We now
86
+ send a message back to the browser to tell the user that they do
87
+ not want to visit the URL via their browser, instead of a totally
88
+ blank page.
89
+
90
+ Expecting a reroll.
91
+ Breaks its self tests.
92
+ cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
93
+ source: <20211202102855.23907-1-jengelh@inai.de>
94
+
95
+
96
+* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
97
+ - fixup! editor: allow for saving/restoring terminal state
98
+ - editor: allow for saving/restoring terminal state
99
+ - terminal: teach save_term to fail when not foreground
100
+
101
+ Some editors are reported to leave the terminal in funny state
102
+ after they exit on Windows. Work it around by saving and restoring
103
+ the terminal state when needed.
104
+
105
+ Expecting a reroll.
106
+ cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
107
+ source: <20211202035446.1154-1-carenas@gmail.com>
108
+
109
+
110
+* ar/submodule-update (2021-10-13) 9 commits
111
+ . submodule--helper: rename helper functions
112
+ . submodule--helper: remove unused helpers
113
+ . submodule: move core cmd_update() logic to C
114
+ . submodule--helper: run update using child process struct
115
+ . submodule--helper: allow setting superprefix for init_submodule()
116
+ . submodule--helper: refactor get_submodule_displaypath()
117
+ . submodule--helper: rename helpers for update-clone
118
+ . submodule--helper: get remote names from any repository
119
+ . submodule--helper: split up ensure_core_worktree()
120
+
121
+ Rewrite of "git submodule update" in C.
122
+
123
+ Expecting a reroll?
124
+ cf. <YWiXL+plA7GHfuVv@google.com>
125
+ source: <20211013051805.45662-10-raykar.ath@gmail.com>
126
+
127
+--------------------------------------------------
128
+[Cooking]
129
+
130
+* ab/auto-detect-zlib-compress2 (2022-01-24) 1 commit
131
+ - compat: auto-detect if zlib has uncompress2()
132
+
133
+ Notice older zlib to enable our replacement uncompress2()
134
+ automatically.
135
+
136
+ Will merge to 'next'?
137
+ source: <xmqqr18x3s5s.fsf@gitster.g>
138
+
139
140
* en/plug-leaks-in-merge (2022-01-21) 2 commits
141
- merge: fix memory leaks in cmd_merge()
@@ -111,11 +153,10 @@ Release tarballs are available at:
153
"git clone --filter=... --recurse-submodules" only makes the
154
top-level a partial clone, while submodules are fully cloned. This
155
behaviour is changed to pass the same filter down to the submodules.
114
-
156
source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com>
157
158
118
-* js/sparse-vs-split-index (2022-01-21) 3 commits
159
+* js/sparse-vs-split-index (2022-01-23) 3 commits
160
- split-index: it really is incompatible with the sparse index
161
- t1091: disable split index
162
- sparse-index: sparse index is disallowed when split index is active
@@ -123,6 +164,7 @@ Release tarballs are available at:
164
Mark in various places in the code that the sparse index and the
165
split index features are mutually incompatible.
166
167
+ Will merge to 'next'.
168
source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>
169
170
@@ -152,61 +194,8 @@ Release tarballs are available at:
194
- parse-options: document bracketing of argh
195
196
Comment update.
155
-
197
source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>
198
158
---------------------------------------------------
159
-[Stalled]
160
-
161
-* je/http-better-error-output (2021-12-03) 1 commit
162
- . http-backend: give a hint that web browser access is not supported
163
-
164
- When the http-backend program, which is the server-side component
165
- for the smart HTTP transport, sends a "404 Not found" error, we
166
- deliberately did not say anything to the requesting client. We now
167
- send a message back to the browser to tell the user that they do
168
- not want to visit the URL via their browser, instead of a totally
169
- blank page.
170
-
171
- Expecting a reroll.
172
- Breaks its self tests.
173
- cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
174
- source: <20211202102855.23907-1-jengelh@inai.de>
175
-
176
-
177
-* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
178
- - fixup! editor: allow for saving/restoring terminal state
179
- - editor: allow for saving/restoring terminal state
180
- - terminal: teach save_term to fail when not foreground
181
-
182
- Some editors are reported to leave the terminal in funny state
183
- after they exit on Windows. Work it around by saving and restoring
184
- the terminal state when needed.
185
-
186
- Expecting a reroll.
187
- cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
188
- source: <20211202035446.1154-1-carenas@gmail.com>
189
-
190
-
191
-* ar/submodule-update (2021-10-13) 9 commits
192
- . submodule--helper: rename helper functions
193
- . submodule--helper: remove unused helpers
194
- . submodule: move core cmd_update() logic to C
195
- . submodule--helper: run update using child process struct
196
- . submodule--helper: allow setting superprefix for init_submodule()
197
- . submodule--helper: refactor get_submodule_displaypath()
198
- . submodule--helper: rename helpers for update-clone
199
- . submodule--helper: get remote names from any repository
200
- . submodule--helper: split up ensure_core_worktree()
201
-
202
- Rewrite of "git submodule update" in C.
203
-
204
- Expecting a reroll?
205
- cf. <YWiXL+plA7GHfuVv@google.com>
206
- source: <20211013051805.45662-10-raykar.ath@gmail.com>
207
-
208
---------------------------------------------------
209
-[Cooking]
199
200
* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit
201
(merged to 'next' on 2022-01-19 at 84da10b057)