What's cooking (2022/01 #06)
Junio C Hamano committed
Jan 21, 2022 at 19:05 UTC
181785487ecd48c7a3760ca31a6a245aabb2cbc8
1 file changed
+163
-139
whats-cooking.txt
+163
-139
@@ -1,15 +1,35 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2022, #05; Wed, 19)
4
-X-master-at: 50b2d72e110cad39ecaf2322bfdf1b60cd13dd96
5
-X-next-at: 594b6da22c98ab74f60dd322406863ad10d5d798
3
+Subject: What's cooking in git.git (Jan 2022, #06; Fri, 21)
4
+X-master-at: 297ca895a27a6bbdb7906371d533f72a12ad25b2
5
+X-next-at: 9bf600f5edf4beea0ee980660bdc5ff523e7b5c5
6
7
-What's cooking in git.git (Jan 2022, #05; Wed, 19)
7
+What's cooking in git.git (Jan 2022, #06; Fri, 21)
8
--------------------------------------------------
9
10
-We are at -rc2 now. A few more topics are now in 'next' but it is
11
-not a big deal anyway, as they are not about any regression fixes
12
-and will not go anywhere during the prerelease freeze.
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.
33
34
Here are the topics that have been cooking in my tree. Commits
35
prefixed with '+' are in 'next' (being in 'next' is a sign that a
@@ -51,38 +71,142 @@ Release tarballs are available at:
71
https://www.kernel.org/pub/software/scm/git/
72
73
--------------------------------------------------
54
-[Graduated to 'master']
74
+[New Topics]
75
56
-* da/rhel7-lacks-uncompress2-and-c99 (2022-01-16) 1 commit
57
- (merged to 'next' on 2022-01-16 at 1aeeab2aa6)
58
- + build: centos/RHEL 7 ships with an older gcc and zlib
76
+* ab/auto-detect-zlib-compress2 (2022-01-21) 1 commit
77
+ - cache.h: auto-detect if zlib has uncompress2()
78
60
- Adjust build on RHEL 7 to explicitly ask C99 support and use
61
- the fallback implementation of uncompress2 we ship.
62
- source: <20220116020520.26895-1-davvid@gmail.com>
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
65
-* jc/freebsd-without-c99-only-build (2022-01-18) 1 commit
66
- (merged to 'next' on 2022-01-18 at 6ab02e9ee4)
67
- + Makefile: FreeBSD cannot do C99-or-below build
85
69
- FreeBSD 13.0 headers have unconditional dependency on C11 language
70
- features, and adding -std=gnu99 to DEVELOPER_CFLAGS would just
71
- break the developer build.
72
- source: <xmqq1r15szpg.fsf_-_@gitster.g>
86
+* ab/checkout-branch-info-leakfix (2022-01-21) 1 commit
87
+ - checkout: avoid BUG() when hitting a broken repository
88
89
+ We added an unrelated sanity checking that leads to a BUG() while
90
+ plugging a leak, which triggered in a repository with symrefs in
91
+ the local branch namespace that point at a ref outside. Partially
92
+ revert the change to avoid triggering the BUG().
93
75
-* js/branch-track-inherit (2022-01-18) 1 commit
76
- (merged to 'next' on 2022-01-18 at 6a6a1b2bbf)
77
- + branch,checkout: fix --track usage strings
94
+ Will merge to 'next' and then to 'master'?
95
+ source: <xmqqbl04d1s9.fsf_-_@gitster.g>
96
79
- "git branch -h" incorrectly said "--track[=direct|inherit]",
80
- implying that "--trackinherit" is a valid option, which has been
81
- corrected.
82
- source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
97
+
98
+* en/plug-leaks-in-merge (2022-01-21) 2 commits
99
+ - merge: fix memory leaks in cmd_merge()
100
+ - merge-ort: fix memory leak in merge_ort_internal()
101
+
102
+ Leakfix.
103
+
104
+ Will merge to 'next'.
105
+ source: <pull.1200.git.git.1642664835.gitgitgadget@gmail.com>
106
+
107
+
108
+* js/apply-partial-clone-filters-recursively (2022-01-21) 1 commit
109
+ - clone, submodule: pass partial clone filters to submodules
110
+
111
+ "git clone --filter=... --recurse-submodules" only makes the
112
+ top-level a partial clone, while submodules are fully cloned. This
113
+ behaviour is changed to pass the same filter down to the submodules.
114
+
115
+ source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com>
116
+
117
+
118
+* js/sparse-vs-split-index (2022-01-21) 3 commits
119
+ - split-index: it really is incompatible with the sparse index
120
+ - t1091: disable split index
121
+ - sparse-index: sparse index is disallowed when split index is active
122
+
123
+ Mark in various places in the code that the sparse index and the
124
+ split index features are mutually incompatible.
125
+
126
+ source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>
127
+
128
+
129
+* js/test-unset-trace2-parents (2022-01-20) 1 commit
130
+ (merged to 'next' on 2022-01-20 at ebb085e3e4)
131
+ + test-lib: unset trace2 parent envvars
132
+
133
+ Avoid tests that are run under GIT_TRACE2 set from failing
134
+ unnecessarily.
135
+
136
+ Will cook in 'next'.
137
+ source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>
138
+
139
+
140
+* jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit
141
+ - sparse-checkout: create leading directory
142
+
143
+ "git sparse-checkout init" failed to write into $GIT_DIR/info
144
+ directory when the repository was created without one, which has
145
+ been corrected to auto-create it.
146
+
147
+ Will merge to 'next'.
148
+ source: <20220121174441.3991963-1-jonathantanmy@google.com>
149
+
150
+
151
+* rs/parse-options-lithelp-help (2022-01-20) 1 commit
152
+ - parse-options: document bracketing of argh
153
+
154
+ Comment update.
155
+
156
+ source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>
157
158
--------------------------------------------------
85
-[New Topics]
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]
210
211
* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit
212
(merged to 'next' on 2022-01-19 at 84da10b057)
@@ -157,58 +281,6 @@ Release tarballs are available at:
281
282
source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
283
160
---------------------------------------------------
161
-[Stalled]
162
-
163
-* je/http-better-error-output (2021-12-03) 1 commit
164
- . http-backend: give a hint that web browser access is not supported
165
-
166
- When the http-backend program, which is the server-side component
167
- for the smart HTTP transport, sends a "404 Not found" error, we
168
- deliberately did not say anything to the requesting client. We now
169
- send a message back to the browser to tell the user that they do
170
- not want to visit the URL via their browser, instead of a totally
171
- blank page.
172
-
173
- Expecting a reroll.
174
- Breaks its self tests.
175
- cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
176
- source: <20211202102855.23907-1-jengelh@inai.de>
177
-
178
-
179
-* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
180
- - fixup! editor: allow for saving/restoring terminal state
181
- - editor: allow for saving/restoring terminal state
182
- - terminal: teach save_term to fail when not foreground
183
-
184
- Some editors are reported to leave the terminal in funny state
185
- after they exit on Windows. Work it around by saving and restoring
186
- the terminal state when needed.
187
-
188
- Expecting a reroll.
189
- cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
190
- source: <20211202035446.1154-1-carenas@gmail.com>
191
-
192
-
193
-* ar/submodule-update (2021-10-13) 9 commits
194
- . submodule--helper: rename helper functions
195
- . submodule--helper: remove unused helpers
196
- . submodule: move core cmd_update() logic to C
197
- . submodule--helper: run update using child process struct
198
- . submodule--helper: allow setting superprefix for init_submodule()
199
- . submodule--helper: refactor get_submodule_displaypath()
200
- . submodule--helper: rename helpers for update-clone
201
- . submodule--helper: get remote names from any repository
202
- . submodule--helper: split up ensure_core_worktree()
203
-
204
- Rewrite of "git submodule update" in C.
205
-
206
- Expecting a reroll?
207
- cf. <YWiXL+plA7GHfuVv@google.com>
208
- source: <20211013051805.45662-10-raykar.ath@gmail.com>
209
-
210
---------------------------------------------------
211
-[Cooking]
284
285
* ds/sparse-checkout-requires-per-worktree-config (2022-01-14) 6 commits
286
. worktree: copy sparse-checkout patterns and config on add
@@ -240,7 +312,9 @@ Release tarballs are available at:
312
source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>
313
314
243
-* gc/fetch-negotiate-only-early-return (2022-01-18) 3 commits
315
+* gc/fetch-negotiate-only-early-return (2022-01-20) 4 commits
316
+ (merged to 'next' on 2022-01-20 at e7616428eb)
317
+ + fetch: help translators by reusing the same message template
318
(merged to 'next' on 2022-01-19 at 0f15147cfa)
319
+ fetch --negotiate-only: do not update submodules
320
+ fetch: skip tasks related to fetching objects
@@ -476,7 +550,8 @@ Release tarballs are available at:
550
source: <pull.1171.v7.git.git.1641425372.gitgitgadget@gmail.com>
551
552
479
-* en/remerge-diff (2021-12-30) 10 commits
553
+* en/remerge-diff (2022-01-21) 11 commits
554
+ - diff-merges: avoid history simplifications when diffing merges
555
- merge-ort: mark conflict/warning messages from inner merges as omittable
556
- show, log: include conflict/warning messages in --remerge-diff headers
557
- diff: add ability to insert additional headers for paths
@@ -491,9 +566,8 @@ Release tarballs are available at:
566
"git log --remerge-diff" shows the difference from mechanical merge
567
result and the merge result that is actually recorded.
568
494
- Plug new leaks?
495
- cf. <220119.86pmonn2mb.gmgdl@evledraar.gmail.com>
496
- source: <pull.1103.v3.git.1640907369.gitgitgadget@gmail.com>
569
+ Will merge to 'next'?
570
+ source: <pull.1103.v4.git.1642792341.gitgitgadget@gmail.com>
571
572
573
* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2021-12-22) 2 commits
@@ -521,8 +595,7 @@ Release tarballs are available at:
595
source: <20211220233459.45739-1-chooglen@google.com>
596
597
524
-* hn/reftable-coverity-fixes (2021-12-22) 18 commits
525
- - reftable: be more paranoid about 0-length memcpy calls
598
+* hn/reftable-coverity-fixes (2022-01-20) 17 commits
599
- reftable: add print functions to the record types
600
- reftable: make reftable_record a tagged union
601
- reftable: remove outdated file reftable.c
@@ -544,9 +617,8 @@ Release tarballs are available at:
617
Problems identified by Coverity in the reftable code have been
618
corrected.
619
547
- Expecting a reroll.
548
- cf. <211228.86lf04j0lg.gmgdl@evledraar.gmail.com>
549
- source: <pull.1152.v5.git.git.1640199396.gitgitgadget@gmail.com>
620
+ Will merge to 'next'.
621
+ source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
622
623
624
* tb/midx-bitmap-corruption-fix (2022-01-04) 9 commits
@@ -787,51 +859,3 @@ Release tarballs are available at:
859
860
Getting there.
861
source: <cover-v8-0.7-00000000000-20211228T150728Z-avarab@gmail.com>
790
-
791
---------------------------------------------------
792
-[Discarded]
793
-
794
-* ms/customizable-ident-expansion (2021-12-25) 2 commits
795
- . fixup! keyword expansion: make "$Id$" string configurable
796
- . keyword expansion: make "$Id$" string configurable
797
-
798
- Instead of "$Id$", user-specified string (like $FreeBSD$) can be
799
- used as an in-blob placeholder for keyword expansion.
800
-
801
- Will discard.
802
- Stalled for too long.
803
- cf. <xmqqfsuosvrh.fsf@gitster.g>
804
- cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
805
- source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
806
-
807
-
808
-* tb/cruft-packs (2021-11-29) 17 commits
809
- . sha1-file.c: don't freshen cruft packs
810
- . builtin/gc.c: conditionally avoid pruning objects via loose
811
- . builtin/repack.c: add cruft packs to MIDX during geometric repack
812
- . builtin/repack.c: use named flags for existing_packs
813
- . builtin/repack.c: allow configuring cruft pack generation
814
- . builtin/repack.c: support generating a cruft pack
815
- . builtin/pack-objects.c: --cruft with expiration
816
- . reachable: report precise timestamps from objects in cruft packs
817
- . reachable: add options to add_unseen_recent_objects_to_traversal
818
- . builtin/pack-objects.c: --cruft without expiration
819
- . builtin/pack-objects.c: return from create_object_entry()
820
- . t/helper: add 'pack-mtimes' test-tool
821
- . pack-mtimes: support writing pack .mtimes files
822
- . chunk-format.h: extract oid_version()
823
- . pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
824
- . pack-mtimes: support reading .mtimes files
825
- . Documentation/technical: add cruft-packs.txt
826
-
827
- Instead of leaving unreachable objects in loose form when packing,
828
- or ejecting them into loose form when repacking, gather them in a
829
- packfile with an auxiliary file that records the last-use time of
830
- these objects.
831
-
832
- Dropped per author request.
833
- cf. <Ydcev8HqCjycBJS+@nand.local>
834
- cf. <865b99dd-0b18-9a07-49c1-3959a777c685@gmail.com>
835
- cf. <c9437c89-9258-4034-9886-8a2aec46aa6b@gmail.com>
836
- cf. <YaqiYGM48p5F9lS1@nand.local>
837
- source: <cover.1638224692.git.me@ttaylorr.com>