What's cooking (2022/03 #02)
Junio C Hamano committed
Mar 7, 2022 at 14:38 UTC
39d7f421319a8b1ab01dae4d2a9ef3fdf99036f6
1 file changed
+357
-337
whats-cooking.txt
+357
-337
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2022, #01; Thu, 3)
4
-X-master-at: 715d08a9e51251ad8290b181b6ac3b9e1f9719d7
5
-X-next-at: 4982287a3110faff562d8f552d63eb9647ce28a7
3
+Subject: What's cooking in git.git (Mar 2022, #02; Mon, 7)
4
+X-master-at: c2162907e9aa884bdb70208389cb99b181620d51
5
+X-next-at: 4b3deeb25d03f55d1d605c96f19e40bb89b562d1
6
7
-What's cooking in git.git (Mar 2022, #01; Thu, 3)
7
+What's cooking in git.git (Mar 2022, #02; Mon, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,15 +46,265 @@ Release tarballs are available at:
46
47
https://www.kernel.org/pub/software/scm/git/
48
49
+--------------------------------------------------
50
+[Graduated to 'master']
51
+
52
+* ab/c99-designated-initializers (2022-02-24) 9 commits
53
+ (merged to 'next' on 2022-02-28 at 5ff6d5b26f)
54
+ + fast-import.c: use designated initializers for "partial" struct assignments
55
+ + refspec.c: use designated initializers for "struct refspec_item"
56
+ + convert.c: use designated initializers for "struct stream_filter*"
57
+ + userdiff.c: use designated initializers for "struct userdiff_driver"
58
+ + archive-*.c: use designated initializers for "struct archiver"
59
+ + object-file: use designated initializers for "struct git_hash_algo"
60
+ + trace2: use designated initializers for "struct tr2_dst"
61
+ + trace2: use designated initializers for "struct tr2_tgt"
62
+ + imap-send.c: use designated initializers for "struct imap_server_conf"
63
+
64
+ Use designated initializers we started using in mid 2017 in more
65
+ parts of the codebase that are relatively quiescent.
66
+ source: <cover-00.12-00000000000-20220224T092805Z-avarab@gmail.com>
67
+
68
+
69
+* ab/hook-tests (2022-02-19) 2 commits
70
+ (merged to 'next' on 2022-02-28 at bb6b7d1c24)
71
+ + hook tests: use a modern style for "pre-push" tests
72
+ + hook tests: test for exact "pre-push" hook input
73
+
74
+ Test modernization.
75
+ source: <cover-0.2-00000000000-20220218T204719Z-avarab@gmail.com>
76
+
77
+
78
+* ab/test-leak-diag (2022-02-28) 4 commits
79
+ (merged to 'next' on 2022-02-28 at 3019aad7fe)
80
+ + test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS
81
+ + test-lib: make $GIT_BUILD_DIR an absolute path
82
+ + test-lib: correct and assert TEST_DIRECTORY overriding
83
+ + test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS
84
+
85
+ Random test-framework clean-up.
86
+ source: <cover-v4-0.4-00000000000-20220227T102256Z-avarab@gmail.com>
87
+
88
+
89
+* ac/usage-string-fixups (2022-02-23) 1 commit
90
+ (merged to 'next' on 2022-02-28 at 5e8fa3f846)
91
+ + amend remaining usage strings according to style guide
92
+
93
+ Usage-string normalization.
94
+ source: <f425e36b7ea4a310a8ad93d47ead4c1713117388.1645626455.git.gitgitgadget@gmail.com>
95
+
96
+
97
+* ah/advice-switch-requires-detach-to-detach (2022-02-25) 1 commit
98
+ (merged to 'next' on 2022-02-28 at 941ee621cf)
99
+ + switch: mention the --detach option when dying due to lack of a branch
100
+
101
+ The error message given by "git switch HEAD~4" has been clarified
102
+ to suggest the "--detach" option that is required.
103
+ source: <20220226061213.1590341-1-alexhenrie24@gmail.com>
104
+
105
+
106
+* cg/t3903-modernize (2022-02-23) 3 commits
107
+ (merged to 'next' on 2022-02-23 at 0d5a844b40)
108
+ + tests: make the code more readable
109
+ + tests: allow testing if a path is truly a file or a directory
110
+ + t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*
111
+
112
+ Test modernization.
113
+ source: <20220222215430.605254-1-cogoni.guillaume@gmail.com>
114
+
115
+
116
+* ds/worktree-docs (2022-02-23) 11 commits
117
+ (merged to 'next' on 2022-02-28 at b7d23cb1a5)
118
+ + worktree: use 'worktree' over 'working tree'
119
+ + worktree: use 'worktree' over 'working tree'
120
+ + worktree: use 'worktree' over 'working tree'
121
+ + worktree: use 'worktree' over 'working tree'
122
+ + worktree: use 'worktree' over 'working tree'
123
+ + worktree: use 'worktree' over 'working tree'
124
+ + worktree: use 'worktree' over 'working tree'
125
+ + worktree: extract checkout_worktree()
126
+ + worktree: extract copy_sparse_checkout()
127
+ + worktree: extract copy_filtered_worktree_config()
128
+ + worktree: combine two translatable messages
129
+
130
+ Tighten the language around "working tree" and "worktree" in the
131
+ docs.
132
+ source: <pull.1154.v3.git.1645626559.gitgitgadget@gmail.com>
133
+
134
+
135
+* en/merge-ort-plug-leaks (2022-02-20) 2 commits
136
+ (merged to 'next' on 2022-02-28 at d7afb6b624)
137
+ + merge-ort: fix small memory leak in unique_path()
138
+ + merge-ort: fix small memory leak in detect_and_process_renames()
139
+
140
+ Leakfix.
141
+ source: <pull.1152.v2.git.1645320591.gitgitgadget@gmail.com>
142
+
143
+
144
+* en/sparse-checkout-fixes (2022-02-20) 5 commits
145
+ (merged to 'next' on 2022-02-28 at 7307431c62)
146
+ + sparse-checkout: reject arguments in cone-mode that look like patterns
147
+ + sparse-checkout: error or warn when given individual files
148
+ + sparse-checkout: pay attention to prefix for {set, add}
149
+ + sparse-checkout: correctly set non-cone mode when expected
150
+ + sparse-checkout: correct reapply's handling of options
151
+
152
+ Further polishing of "git sparse-checkout".
153
+ source: <pull.1118.v5.git.1645289086.gitgitgadget@gmail.com>
154
+
155
+
156
+* gc/stash-on-branch-with-multi-level-name (2022-02-24) 1 commit
157
+ (merged to 'next' on 2022-02-28 at 1a94306611)
158
+ + stash: strip "refs/heads/" with skip_prefix
159
+
160
+ "git checkout -b branch/with/multi/level/name && git stash" only
161
+ recorded the last level component of the branch name, which has
162
+ been corrected.
163
+ source: <20220124205342.41450-1-chooglen@google.com>
164
+
165
+
166
+* jc/rerere-train-modernise (2022-02-27) 1 commit
167
+ (merged to 'next' on 2022-02-28 at d86d29733d)
168
+ + rerere-train: two fixes to the use of "git show -s"
169
+
170
+ Small modernization of the rerere-train script (in contrib/).
171
+ source: <20220227220924.2144325-1-gitster@pobox.com>
172
+
173
+
174
+* jt/ls-files-stage-recurse (2022-02-23) 1 commit
175
+ (merged to 'next' on 2022-02-28 at 4ad82bfdf6)
176
+ + ls-files: support --recurse-submodules --stage
177
+
178
+ Many output modes of "ls-files" do not work with its
179
+ "--recurse-submodules" option, but the "-s" mode has been taught to
180
+ work with it.
181
+ source: <20220224002303.2363189-1-jonathantanmy@google.com>
182
+
183
+
184
+* mc/index-pack-report-max-size (2022-02-23) 1 commit
185
+ (merged to 'next' on 2022-02-28 at 31b907844b)
186
+ + index-pack: clarify the breached limit
187
+
188
+ When "index-pack" dies due to incoming data exceeding the maximum
189
+ allowed input size, include the value of the limit in the error
190
+ message.
191
+ source: <pull.1158.v2.git.1645661240356.gitgitgadget@gmail.com>
192
+
193
+
194
+* rs/bisect-executable-not-found (2022-01-19) 4 commits
195
+ (merged to 'next' on 2022-02-28 at c74bff7954)
196
+ + bisect--helper: double-check run command on exit code 126 and 127
197
+ + bisect: document run behavior with exit codes 126 and 127
198
+ + bisect--helper: release strbuf and strvec on run error
199
+ + bisect--helper: report actual bisect_state() argument on error
200
+
201
+ A not-so-common mistake is to write a script to feed "git bisect
202
+ run" without making it executable, in which case all tests will
203
+ exit with 126 or 127 error codes, even on revisions that are marked
204
+ as good. Try to recognize this situation and stop iteration early.
205
+ source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
206
+
207
--------------------------------------------------
208
[New Topics]
209
52
-* jd/userdiff-kotlin (2022-03-03) 1 commit
53
- - userdiff: add builtin diff driver for Kotlin language.
210
+* ab/grep-patterntype (2022-03-04) 1 commit
211
+ - log tests: fix "abort tests early" regression in ff37a60c369
212
55
- A new built-in userdiff driver for kotlin.
213
+ Test fix-up for a topic already in master.
214
57
- source: <20220303181517.70682-1-jaydeepjd.8914@gmail.com>
215
+ Will merge to 'next' and then to 'master'.
216
+ source: <patch-1.1-3b41c1a26d4-20220304T093323Z-avarab@gmail.com>
217
+
218
+
219
+* mf/fix-type-in-config-h (2022-03-03) 1 commit
220
+ - config: correct "--type" option in "git config -h" output
221
+
222
+ "git config -h" did not describe the "--type" option correctly.
223
+
224
+ Will merge to 'next'.
225
+ source: <pull.1220.v2.git.git.1646368313714.gitgitgadget@gmail.com>
226
+
227
+
228
+* ab/racy-hooks (2022-03-07) 2 commits
229
+ - hooks: fix an obscure TOCTOU "did we just run a hook?" race
230
+ - merge: don't run post-hook logic on --no-verify
231
+
232
+ Code clean-up to allow callers of run_commit_hook() to learn if it
233
+ got "success" because the hook succeeded or because there wasn't
234
+ any hook.
235
+
236
+ Will merge to 'next'.
237
+ source: <cover-v2-0.2-00000000000-20220307T123244Z-avarab@gmail.com>
238
+
239
+
240
+* ab/string-list-count-in-size-t (2022-03-07) 2 commits
241
+ - string-list API: change "nr" and "alloc" to "size_t"
242
+ - gettext API users: don't explicitly cast ngettext()'s "n"
243
+
244
+ Count string_list items in size_t, not "unsigned int".
245
+
246
+ Will merge to 'next'?
247
+ source: <cover-v2-0.2-00000000000-20220307T152316Z-avarab@gmail.com>
248
+
249
+--------------------------------------------------
250
+[Stalled]
251
+
252
+* tl/ls-tree-oid-only (2022-03-04) 12 commits
253
+ - ls-tree: support --object-only option for "git-ls-tree"
254
+ - ls-tree: introduce "--format" option
255
+ - cocci: allow padding with `strbuf_addf()`
256
+ - ls-tree: introduce struct "show_tree_data"
257
+ - ls-tree: slightly refactor `show_tree()`
258
+ - ls-tree: fix "--name-only" and "--long" combined use bug
259
+ - ls-tree: simplify nesting if/else logic in "show_tree()"
260
+ - ls-tree: rename "retval" to "recurse" in "show_tree()"
261
+ - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"
262
+ - ls-tree: use "enum object_type", not {blob,tree,commit}_type
263
+ - ls-tree: add missing braces to "else" arms
264
+ - ls-tree: remove commented-out code
265
+
266
+ "git ls-tree" learns "--oid-only" option, similar to "--name-only",
267
+ and more generalized "--format" option.
268
+ source: <cover.1646390152.git.dyroneteng@gmail.com>
269
+
270
+
271
+* je/http-better-error-output (2021-12-03) 1 commit
272
+ . http-backend: give a hint that web browser access is not supported
273
+
274
+ When the http-backend program, which is the server-side component
275
+ for the smart HTTP transport, sends a "404 Not found" error, we
276
+ deliberately did not say anything to the requesting client. We now
277
+ send a message back to the browser to tell the user that they do
278
+ not want to visit the URL via their browser, instead of a totally
279
+ blank page.
280
+
281
+ Expecting a reroll.
282
+ Breaks its self tests.
283
+ cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
284
+ source: <20211202102855.23907-1-jengelh@inai.de>
285
+
286
+
287
+* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
288
+ - fixup! editor: allow for saving/restoring terminal state
289
+ - editor: allow for saving/restoring terminal state
290
+ - terminal: teach save_term to fail when not foreground
291
+
292
+ Some editors are reported to leave the terminal in funny state
293
+ after they exit on Windows. Work it around by saving and restoring
294
+ the terminal state when needed.
295
+
296
+ Expecting a reroll.
297
+ cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
298
+ source: <20211202035446.1154-1-carenas@gmail.com>
299
+
300
+--------------------------------------------------
301
+[Cooking]
302
+
303
+* jd/userdiff-kotlin (2022-03-06) 1 commit
304
+ - userdiff: add builtin diff driver for kotlin language.
305
+
306
+ A new built-in userdiff driver for kotlin.
307
+ source: <20220306111031.335489-2-jaydeepjd.8914@gmail.com>
308
309
310
* ps/fetch-mirror-optim (2022-03-01) 6 commits
@@ -79,12 +329,11 @@ Release tarballs are available at:
329
Teach "test-chmtime" to work on a directory and use it to avoid
330
having to wait for a second in a few places in tests.
331
82
- Expecting a reroll.
83
- cf. <37f66fae-911a-62f1-4711-c9f6c7794911@jeffhostetler.com>
84
- source: <pull.1166.v2.git.1646127910.gitgitgadget@gmail.com>
332
+ Will merge to 'next'.
333
+ source: <pull.1166.v3.git.1646201124.gitgitgadget@gmail.com>
334
335
87
-* ab/hook-tests-updates (2022-03-02) 10 commits
336
+* ab/hook-tests-updates (2022-03-07) 10 commits
337
- tests: change "cat && chmod +x" to use "test_hook"
338
- tests: change "mkdir -p && write_script" to use "test_hook"
339
- test-lib-functions: add and use a "test_hook" wrapper
@@ -98,13 +347,11 @@ Release tarballs are available at:
347
348
Update tests around the use of hook scripts.
349
101
- Expecting a reroll.
102
- cf. <xmqqzgm8hwwc.fsf@gitster.g>
103
- cf. <xmqq1qzkhv87.fsf@gitster.g>
104
- source: <cover-00.10-00000000000-20220302T131859Z-avarab@gmail.com>
350
+ Will merge to 'next'?
351
+ source: <cover-v2-00.10-00000000000-20220307T123909Z-avarab@gmail.com>
352
353
107
-* ab/keep-git-exit-codes-in-tests (2022-03-02) 15 commits
354
+* ab/keep-git-exit-codes-in-tests (2022-03-07) 15 commits
355
- rev-list simplify tests: don't ignore "git" exit code
356
- checkout tests: don't ignore "git <cmd>" exit code
357
- apply tests: don't ignore "git ls-files" exit code, drop sub-shell
@@ -123,61 +370,62 @@ Release tarballs are available at:
370
371
Updates tests around the use of "test $(git cmd) = constant".
372
126
- Expecting a reroll.
127
- cf. <xmqqsfryah42.fsf@gitster.g>
128
- source: <cover-00.15-00000000000-20220302T171755Z-avarab@gmail.com>
129
-
130
-
131
-* ab/plug-random-leaks (2022-03-02) 14 commits
132
- - repository.c: free the "path cache" in repo_clear()
133
- - range-diff: plug memory leak in read_patches()
134
- - range-diff: plug memory leak in common invocation
135
- - lockfile API users: simplify and don't leak "path"
136
- - commit-graph: stop fill_oids_from_packs() progress on error and free()
137
- - commit-graph: fix memory leak in misused string_list API
138
- - submodule--helper: fix trivial leak in module_add()
139
- - transport: stop needlessly copying bundle header references
140
- - bundle: call strvec_clear() on allocated strvec
141
- - remote-curl.c: free memory in cmd_main()
142
- - urlmatch.c: add and use a *_release() function
143
- - diff.c: free "buf" in diff_words_flush()
144
- - merge-base: free() allocated "struct commit **" list
145
- - index-pack: fix memory leaks
373
+ Will merge to 'next'?
374
+ source: <cover-v2-00.15-00000000000-20220307T124817Z-avarab@gmail.com>
375
+
376
+
377
+* ab/plug-random-leaks (2022-03-04) 14 commits
378
+ (merged to 'next' on 2022-03-04 at f461b7a6b5)
379
+ + repository.c: free the "path cache" in repo_clear()
380
+ + range-diff: plug memory leak in read_patches()
381
+ + range-diff: plug memory leak in common invocation
382
+ + lockfile API users: simplify and don't leak "path"
383
+ + commit-graph: stop fill_oids_from_packs() progress on error and free()
384
+ + commit-graph: fix memory leak in misused string_list API
385
+ + submodule--helper: fix trivial leak in module_add()
386
+ + transport: stop needlessly copying bundle header references
387
+ + bundle: call strvec_clear() on allocated strvec
388
+ + remote-curl.c: free memory in cmd_main()
389
+ + urlmatch.c: add and use a *_release() function
390
+ + diff.c: free "buf" in diff_words_flush()
391
+ + merge-base: free() allocated "struct commit **" list
392
+ + index-pack: fix memory leaks
393
394
Plug random memory leaks.
395
149
- Will merge to 'next'.
150
- source: <cover-00.14-00000000000-20220302T170718Z-avarab@gmail.com>
396
+ Will merge to 'master'.
397
+ source: <cover-v2-00.14-00000000000-20220304T182902Z-avarab@gmail.com>
398
399
400
* en/merge-ort-align-verbosity-with-recursive (2022-03-01) 1 commit
154
- - merge-ort: exclude messages from inner merges by default
401
+ (merged to 'next' on 2022-03-04 at e2c7eabab6)
402
+ + merge-ort: exclude messages from inner merges by default
403
404
Align the level of verbose output from the ort backend during inner
405
merge to that of the recursive backend.
406
159
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
source: <pull.1167.git.1646194761463.gitgitgadget@gmail.com>
409
410
163
-* ep/test-malloc-check-with-glibc-2.34 (2022-03-03) 1 commit
411
+* ep/test-malloc-check-with-glibc-2.34 (2022-03-04) 1 commit
412
- test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34
413
414
The method to trigger malloc check used in our tests no longer work
415
with newer versions of glibc.
416
169
- Expecting a reroll.
170
- cf. <xmqq8rtq8z41.fsf@gitster.g>
171
- source: <20220303090640.190307-1-gitter.spiros@gmail.com>
417
+ Will merge to 'next'.
418
+ source: <20220304133702.26706-1-gitter.spiros@gmail.com>
419
420
421
* gc/parse-tree-indirect-errors (2022-03-01) 1 commit
175
- - checkout, clone: die if tree cannot be parsed
422
+ (merged to 'next' on 2022-03-04 at f8d60e5253)
423
+ + checkout, clone: die if tree cannot be parsed
424
425
Check the return value from parse_tree_indirect() to turn segfaults
426
into calls to die().
427
180
- Will merge to 'next'.
428
+ Will merge to 'master'.
429
source: <20220302003613.15567-1-chooglen@google.com>
430
431
@@ -187,7 +435,6 @@ Release tarballs are available at:
435
"git am" can read from the standard input when no mailbox is given
436
on the command line, but the end-user gets no indication when it
437
happens, making Git appear stuck.
190
-
438
source: <xmqqlexq8zqo.fsf@gitster.g>
439
440
@@ -200,26 +447,28 @@ Release tarballs are available at:
447
reflog_delete() function, instead of invoking "git reflog delete"
448
via run_command() API.
449
203
- Will merge to 'next'?
450
+ Will merge to 'next'.
451
source: <pull.1218.v4.git.git.1646260044.gitgitgadget@gmail.com>
452
453
454
* nj/read-tree-doc-reffix (2022-03-03) 1 commit
208
- - Documentation: git-read-tree: separate links using commas
455
+ (merged to 'next' on 2022-03-04 at 9b183b3e3e)
456
+ + Documentation: git-read-tree: separate links using commas
457
458
Documentation mark-up fix.
459
212
- Will merge to 'next'.
460
+ Will merge to 'master'.
461
source: <20220303161542.11616-1-nihal@nihaljere.xyz>
462
463
464
* ps/fetch-atomic-fixup (2022-03-03) 1 commit
217
- - t5503: simplify setup of test which exercises failure of backfill
465
+ (merged to 'next' on 2022-03-04 at cb279e84df)
466
+ + t5503: simplify setup of test which exercises failure of backfill
467
(this branch uses ps/fetch-atomic.)
468
469
Test simplification.
470
222
- Will merge to 'next'.
471
+ Will merge to 'master' together with ps/fetch-atomic.
472
source: <cover.1645102965.git.ps@pks.im>
473
474
@@ -246,7 +495,7 @@ Release tarballs are available at:
495
instead of ejecting them into loose form to be reclaimed later, has
496
been introduced.
497
249
- Will merge to 'next'?
498
+ Will merge to 'next'.
499
source: <cover.1646266835.git.me@ttaylorr.com>
500
501
@@ -261,60 +510,6 @@ Release tarballs are available at:
510
Will merge to 'next'?
511
source: <d5b0a4b71027619123b7284611692d3a9c128518.1646346287.git.me@ttaylorr.com>
512
264
---------------------------------------------------
265
-[Stalled]
266
-
267
-* tl/ls-tree-oid-only (2022-02-08) 13 commits
268
- - ls-tree.c: support --object-only option for "git-ls-tree"
269
- - ls-tree: introduce function "fast_path()"
270
- - ls-tree.c: introduce "--format" option
271
- - cocci: allow padding with `strbuf_addf()`
272
- - ls-tree: introduce struct "show_tree_data"
273
- - ls-tree: slightly refactor `show_tree()`
274
- - ls-tree: fix "--name-only" and "--long" combined use bug
275
- - ls-tree: simplify nesting if/else logic in "show_tree()"
276
- - ls-tree: rename "retval" to "recurse" in "show_tree()"
277
- - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"
278
- - ls-tree: use "enum object_type", not {blob,tree,commit}_type
279
- - ls-tree: add missing braces to "else" arms
280
- - ls-tree: remove commented-out code
281
-
282
- "git ls-tree" learns "--oid-only" option, similar to "--name-only",
283
- and more generalized "--format" option.
284
- source: <cover.1644319434.git.dyroneteng@gmail.com>
285
-
286
-
287
-* je/http-better-error-output (2021-12-03) 1 commit
288
- . http-backend: give a hint that web browser access is not supported
289
-
290
- When the http-backend program, which is the server-side component
291
- for the smart HTTP transport, sends a "404 Not found" error, we
292
- deliberately did not say anything to the requesting client. We now
293
- send a message back to the browser to tell the user that they do
294
- not want to visit the URL via their browser, instead of a totally
295
- blank page.
296
-
297
- Expecting a reroll.
298
- Breaks its self tests.
299
- cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
300
- source: <20211202102855.23907-1-jengelh@inai.de>
301
-
302
-
303
-* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
304
- - fixup! editor: allow for saving/restoring terminal state
305
- - editor: allow for saving/restoring terminal state
306
- - terminal: teach save_term to fail when not foreground
307
-
308
- Some editors are reported to leave the terminal in funny state
309
- after they exit on Windows. Work it around by saving and restoring
310
- the terminal state when needed.
311
-
312
- Expecting a reroll.
313
- cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
314
- source: <20211202035446.1154-1-carenas@gmail.com>
315
-
316
---------------------------------------------------
317
-[Cooking]
513
514
* js/ci-github-workflow-markup (2022-03-01) 9 commits
515
- ci: call `finalize_test_case_output` a little later
@@ -343,7 +538,8 @@ Release tarballs are available at:
538
the lower bound of searching commits used to explain the revision,
539
when available, instead of committer time.
540
346
- Will merge to 'next'?
541
+ Breaks linux-TEST-vars job at CI?
542
+ cf. <xmqqilsvet82.fsf@gitster.g>
543
source: <20220228215025.325904-2-jacob.e.keller@intel.com>
544
545
@@ -358,18 +554,6 @@ Release tarballs are available at:
554
source: <20220217225408.GB7@edef91d97c94>
555
556
361
-* jt/ls-files-stage-recurse (2022-02-23) 1 commit
362
- (merged to 'next' on 2022-02-28 at 4ad82bfdf6)
363
- + ls-files: support --recurse-submodules --stage
364
-
365
- Many output modes of "ls-files" does not work with its
366
- "--recurse-submodules" option, but the "-s" mode has taught to work
367
- with it.
368
-
369
- Will merge to 'master'.
370
- source: <20220224002303.2363189-1-jonathantanmy@google.com>
371
-
372
-
557
* ab/c99-variadic-macros (2022-02-21) 2 commits
558
(merged to 'next' on 2022-03-01 at 0419a86e23)
559
+ C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code
@@ -383,72 +567,6 @@ Release tarballs are available at:
567
source: <cover-v4-0.2-00000000000-20220221T160440Z-avarab@gmail.com>
568
569
386
-* ab/hook-tests (2022-02-19) 2 commits
387
- (merged to 'next' on 2022-02-28 at bb6b7d1c24)
388
- + hook tests: use a modern style for "pre-push" tests
389
- + hook tests: test for exact "pre-push" hook input
390
-
391
- Test modernization.
392
-
393
- Will merge to 'master'.
394
- source: <cover-0.2-00000000000-20220218T204719Z-avarab@gmail.com>
395
-
396
-
397
-* ab/test-leak-diag (2022-02-28) 4 commits
398
- (merged to 'next' on 2022-02-28 at 3019aad7fe)
399
- + test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS
400
- + test-lib: make $GIT_BUILD_DIR an absolute path
401
- + test-lib: correct and assert TEST_DIRECTORY overriding
402
- + test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS
403
-
404
- Random test-framework clean-up.
405
-
406
- Will merge to 'master'.
407
- source: <cover-v4-0.4-00000000000-20220227T102256Z-avarab@gmail.com>
408
-
409
-
410
-* ds/worktree-docs (2022-02-23) 11 commits
411
- (merged to 'next' on 2022-02-28 at b7d23cb1a5)
412
- + worktree: use 'worktree' over 'working tree'
413
- + worktree: use 'worktree' over 'working tree'
414
- + worktree: use 'worktree' over 'working tree'
415
- + worktree: use 'worktree' over 'working tree'
416
- + worktree: use 'worktree' over 'working tree'
417
- + worktree: use 'worktree' over 'working tree'
418
- + worktree: use 'worktree' over 'working tree'
419
- + worktree: extract checkout_worktree()
420
- + worktree: extract copy_sparse_checkout()
421
- + worktree: extract copy_filtered_worktree_config()
422
- + worktree: combine two translatable messages
423
-
424
- Tighten the language around "working tree" and "worktree" in the
425
- docs.
426
-
427
- Will merge to 'master'.
428
- source: <pull.1154.v3.git.1645626559.gitgitgadget@gmail.com>
429
-
430
-
431
-* en/merge-ort-plug-leaks (2022-02-20) 2 commits
432
- (merged to 'next' on 2022-02-28 at d7afb6b624)
433
- + merge-ort: fix small memory leak in unique_path()
434
- + merge-ort: fix small memory leak in detect_and_process_renames()
435
-
436
- Leakfix.
437
-
438
- Will merge to 'master'.
439
- source: <pull.1152.v2.git.1645320591.gitgitgadget@gmail.com>
440
-
441
-
442
-* jc/rerere-train-modernise (2022-02-27) 1 commit
443
- (merged to 'next' on 2022-02-28 at d86d29733d)
444
- + rerere-train: two fixes to the use of "git show -s"
445
-
446
- Small modernization of the rerere-train script (in contrib/).
447
-
448
- Will merge to 'master'.
449
- source: <20220227220924.2144325-1-gitster@pobox.com>
450
-
451
-
570
* ab/help-fixes (2022-02-23) 9 commits
571
(merged to 'next' on 2022-03-01 at 215f5dbbfb)
572
+ help: don't print "\n" before single-section output
@@ -467,28 +585,6 @@ Release tarballs are available at:
585
source: <cover-v2-0.9-00000000000-20220221T193708Z-avarab@gmail.com>
586
587
470
-* ac/usage-string-fixups (2022-02-23) 1 commit
471
- (merged to 'next' on 2022-02-28 at 5e8fa3f846)
472
- + amend remaining usage strings according to style guide
473
-
474
- Usage-string normalization.
475
-
476
- Will merge to 'master'.
477
- source: <f425e36b7ea4a310a8ad93d47ead4c1713117388.1645626455.git.gitgitgadget@gmail.com>
478
-
479
-
480
-* mc/index-pack-report-max-size (2022-02-23) 1 commit
481
- (merged to 'next' on 2022-02-28 at 31b907844b)
482
- + index-pack: clarify the breached limit
483
-
484
- When "index-pack" dies due to incoming data exceeding the maximum
485
- allowed input size, include the value of the limit in the error
486
- message.
487
-
488
- Will merge to 'master'.
489
- source: <pull.1158.v2.git.1645661240356.gitgitgadget@gmail.com>
490
-
491
-
588
* sm/no-git-in-upstream-of-pipe-in-tests (2022-02-23) 1 commit
589
- t0003: avoid pipes with Git on LHS
590
@@ -498,25 +594,6 @@ Release tarballs are available at:
594
source: <20220223115347.3083-3-shivam828787@gmail.com>
595
596
501
-* ab/c99-designated-initializers (2022-02-24) 9 commits
502
- (merged to 'next' on 2022-02-28 at 5ff6d5b26f)
503
- + fast-import.c: use designated initializers for "partial" struct assignments
504
- + refspec.c: use designated initializers for "struct refspec_item"
505
- + convert.c: use designated initializers for "struct stream_filter*"
506
- + userdiff.c: use designated initializers for "struct userdiff_driver"
507
- + archive-*.c: use designated initializers for "struct archiver"
508
- + object-file: use designated initializers for "struct git_hash_algo"
509
- + trace2: use designated initializers for "struct tr2_dst"
510
- + trace2: use designated initializers for "struct tr2_tgt"
511
- + imap-send.c: use designated initializers for "struct imap_server_conf"
512
-
513
- Use designated initializers we started using in mid 2017 in more
514
- parts of the codebase that are relatively quiescent.
515
-
516
- Will merge to 'master'.
517
- source: <cover-00.12-00000000000-20220224T092805Z-avarab@gmail.com>
518
-
519
-
597
* ab/http-gcc-12-workaround (2022-02-25) 1 commit
598
- http API: fix dangling pointer issue noted by GCC 12.0
599
@@ -525,34 +602,25 @@ Release tarballs are available at:
602
603
604
* ab/make-optim-noop (2022-03-03) 8 commits
528
- - Makefiles: add and use wildcard "mkdir -p" template
529
- - Makefile: add "$(QUIET)" boilerplate to shared.mak
530
- - Makefile: move $(comma), $(empty) and $(space) to shared.mak
531
- - Makefile: move ".SUFFIXES" rule to shared.mak
532
- - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
533
- - Makefile: disable GNU make built-in wildcard rules
534
- - Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
535
- - scalar Makefile: use "The default target of..." pattern
605
+ (merged to 'next' on 2022-03-04 at 0419394f3d)
606
+ + Makefiles: add and use wildcard "mkdir -p" template
607
+ + Makefile: add "$(QUIET)" boilerplate to shared.mak
608
+ + Makefile: move $(comma), $(empty) and $(space) to shared.mak
609
+ + Makefile: move ".SUFFIXES" rule to shared.mak
610
+ + Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
611
+ + Makefile: disable GNU make built-in wildcard rules
612
+ + Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
613
+ + scalar Makefile: use "The default target of..." pattern
614
615
Makefile refactoring with a bit of suffixes rule stripping to
616
optimize the runtime overhead.
617
540
- Will merge to 'next'.
541
- source: <cover-v5-0.8-00000000000-20220303T160155Z-avarab@gmail.com>
542
-
543
-
544
-* ah/advice-switch-requires-detach-to-detach (2022-02-25) 1 commit
545
- (merged to 'next' on 2022-02-28 at 941ee621cf)
546
- + switch: mention the --detach option when dying due to lack of a branch
547
-
548
- The error message given by "git switch HEAD~4" has been clarified
549
- to suggest the "--detach" option that is required.
550
-
618
Will merge to 'master'.
552
- source: <20220226061213.1590341-1-alexhenrie24@gmail.com>
619
+ source: <cover-v5-0.8-00000000000-20220303T160155Z-avarab@gmail.com>
620
621
555
-* ds/commit-graph-gen-v2-fixes (2022-03-01) 5 commits
622
+* ds/commit-graph-gen-v2-fixes (2022-03-07) 6 commits
623
+ - commit-graph: declare bankruptcy on GDAT chunks
624
- commit-graph: fix generation number v2 overflow values
625
- commit-graph: start parsing generation v2 (again)
626
- commit-graph: fix ordering bug in generation numbers
@@ -561,10 +629,13 @@ Release tarballs are available at:
629
630
Fixes to the way generation number v2 in the commit-graph files are
631
(not) handled.
632
+
633
+ Will merge to 'next'.
634
source: <pull.1163.v3.git.1646164112.gitgitgadget@gmail.com>
635
636
567
-* ds/partial-bundles (2022-02-24) 11 commits
637
+* ds/partial-bundles (2022-03-07) 12 commits
638
+ - clone: fail gracefully when cloning filtered bundle
639
- bundle: unbundle promisor packs
640
- bundle: create filtered bundles
641
- rev-list: move --filter parsing into revision.c
@@ -576,41 +647,31 @@ Release tarballs are available at:
647
- pack-objects: use rev.filter when possible
648
- revision: put object filter into struct rev_info
649
- index-pack: document and test the --promisor option
579
- (this branch is used by ds/bundle-uri.)
650
651
Bundle file format gets extended to allow a partial bundle,
652
filtered by similar criteria you would give when making a
653
partial/lazy clone.
584
- source: <pull.1159.git.1645638911.gitgitgadget@gmail.com>
654
+
655
+ Will merge to 'next'?
656
+ source: <pull.1159.v2.git.1646689840.gitgitgadget@gmail.com>
657
658
587
-* fs/gpgsm-update (2022-03-02) 3 commits
588
- - t/lib-gpg: kill all gpg components, not just gpg-agent
589
- - t/lib-gpg: reload gpg components after updating trustlist
590
- - gpg-interface/gpgsm: fix for v2.3
659
+* fs/gpgsm-update (2022-03-04) 3 commits
660
+ (merged to 'next' on 2022-03-04 at 9c72508077)
661
+ + t/lib-gpg: kill all gpg components, not just gpg-agent
662
+ + t/lib-gpg: reload gpg components after updating trustlist
663
+ + gpg-interface/gpgsm: fix for v2.3
664
665
Newer version of GPGSM changed its output in a backward
666
incompatible way to break our code that parses its output. It also
667
added more processes our tests need to kill when cleaning up.
595
- Adjustments have been made to accomodate these changes.
596
-
597
- Will merge to 'next'.
598
- source: <20220224100628.612789-1-fs@gigacodes.de>
599
-
600
-
601
-* gc/stash-on-branch-with-multi-level-name (2022-02-24) 1 commit
602
- (merged to 'next' on 2022-02-28 at 1a94306611)
603
- + stash: strip "refs/heads/" with skip_prefix
604
-
605
- "git checkout -b branch/with/multi/level/name && git stash" only
606
- recorded the last level component of the branch name, which has
607
- been corrected.
668
+ Adjustments have been made to accommodate these changes.
669
670
Will merge to 'master'.
610
- source: <20220124205342.41450-1-chooglen@google.com>
671
+ source: <20220302090250.590450-1-fs@gigacodes.de>
672
673
613
-* jd/prompt-upstream-mark (2022-02-25) 4 commits
674
+* jd/prompt-upstream-mark (2022-03-03) 4 commits
675
- git-prompt: put upstream comments together
676
- git-prompt: make long upstream state indicator consistent
677
- git-prompt: make upstream state indicator location consistent
@@ -619,8 +680,8 @@ Release tarballs are available at:
680
Tweaks in the command line prompt (in contrib/) code around its
681
GIT_PS1_SHOWUPSTREAM feature.
682
622
- Needs reviews.
623
- source: <pull.1162.git.1645789446.gitgitgadget@gmail.com>
683
+ Will merge to 'next'?
684
+ source: <pull.1162.v2.git.1645991832.gitgitgadget@gmail.com>
685
686
687
* pw/worktree-list-with-z (2022-02-25) 1 commit
@@ -635,20 +696,21 @@ Release tarballs are available at:
696
source: <pull.1164.git.1645801727732.gitgitgadget@gmail.com>
697
698
638
-* rc/fetch-repair (2022-02-24) 8 commits
639
- - doc/partial-clone: mention --repair fetch option
640
- - fetch: after repair, encourage auto gc repacking
641
- - maintenance: add ability to pass config options
642
- - t5615-partial-clone: add test for fetch --repair
643
- - fetch: add --repair option
644
- - builtin/fetch-pack: add --repair option
645
- - fetch-pack: add repairing
646
- - fetch-negotiator: add specific noop initializor
699
+* rc/fetch-refetch (2022-03-04) 7 commits
700
+ - doc/partial-clone: mention --refetch fetch option
701
+ - fetch: after refetch, encourage auto gc repacking
702
+ - t5615-partial-clone: add test for fetch --refetch
703
+ - fetch: add --refetch option
704
+ - builtin/fetch-pack: add --refetch option
705
+ - fetch-pack: add refetch
706
+ - fetch-negotiator: add specific noop initializer
707
648
- "git fetch --repair" learned to fetch everything without telling
708
+ "git fetch --refetch" learned to fetch everything without telling
709
the other side what we already have, which is useful when you
710
cannot trust what you have in the local object store.
651
- source: <pull.1138.v2.git.1645719218.gitgitgadget@gmail.com>
711
+
712
+ Will merge to 'next'?
713
+ source: <pull.1138.v3.git.1646406274.gitgitgadget@gmail.com>
714
715
716
* tk/empty-untracked-cache (2022-02-28) 3 commits
@@ -705,20 +767,6 @@ Release tarballs are available at:
767
source: <pull.1157.v3.git.1646166271.gitgitgadget@gmail.com>
768
769
708
-* en/sparse-checkout-fixes (2022-02-20) 5 commits
709
- (merged to 'next' on 2022-02-28 at 7307431c62)
710
- + sparse-checkout: reject arguments in cone-mode that look like patterns
711
- + sparse-checkout: error or warn when given individual files
712
- + sparse-checkout: pay attention to prefix for {set, add}
713
- + sparse-checkout: correctly set non-cone mode when expected
714
- + sparse-checkout: correct reapply's handling of options
715
-
716
- Further polishing of "git sparse-checkout".
717
-
718
- Will merge to 'master'.
719
- source: <pull.1118.v5.git.1645289086.gitgitgadget@gmail.com>
720
-
721
-
770
* ab/commit-plug-leaks (2022-02-16) 2 commits
771
- commit: use strbuf_release() instead of UNLEAK()
772
- commit: fix "author_ident" leak
@@ -808,6 +856,7 @@ Release tarballs are available at:
856
from them were in two separate ref transactions under "--atomic",
857
which has been corrected.
858
859
+ Will merge to 'master' together with ps/fetch-atomic-fixup.
860
source: <cover.1645102965.git.ps@pks.im>
861
862
@@ -825,9 +874,7 @@ Release tarballs are available at:
874
source: <pull.1140.v2.git.1645006510.gitgitgadget@gmail.com>
875
876
828
-* gc/recursive-fetch-with-unused-submodules (2022-02-28) 12 commits
829
- - SQUASH???
830
- - SQUASH???
877
+* gc/recursive-fetch-with-unused-submodules (2022-03-03) 10 commits
878
- submodule: fix latent check_has_commit() bug
879
- fetch: fetch unpopulated, changed submodules
880
- submodule: move logic into fetch_task_create()
@@ -845,20 +892,8 @@ Release tarballs are available at:
892
in the current checkout of the superproject. We now do so for all
893
submodules that have been run "git submodule init" on.
894
848
- Expecting a reroll.
849
- source: <20220224100842.95827-1-chooglen@google.com>
850
-
851
-
852
-* cg/t3903-modernize (2022-02-23) 3 commits
853
- (merged to 'next' on 2022-02-23 at 0d5a844b40)
854
- + tests: make the code more readable
855
- + tests: allow testing if a path is truly a file or a directory
856
- + t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*
857
-
858
- Test modernization.
859
-
860
- Will merge to 'master'.
861
- source: <20220222215430.605254-1-cogoni.guillaume@gmail.com>
895
+ Will merge to 'next'?
896
+ source: <20220304005757.70107-1-chooglen@google.com>
897
898
899
* js/bisect-in-c (2022-02-23) 14 commits
@@ -879,7 +914,8 @@ Release tarballs are available at:
914
915
Final bits of "git bisect.sh" have been rewritten in C.
916
882
- Will merge to 'next'?
917
+ Expecting a reroll.
918
+ cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>
919
source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
920
921
@@ -913,16 +949,16 @@ Release tarballs are available at:
949
source: <pull.1212.v10.git.git.1645208594.gitgitgadget@gmail.com>
950
951
916
-* ar/submodule-update (2022-03-02) 13 commits
952
+* ar/submodule-update (2022-03-04) 13 commits
953
- submodule--helper update-clone: check for --filter and --init
954
- submodule update: add tests for --filter
955
+ - submodule--helper: remove ensure-core-worktree
956
- submodule--helper update-clone: learn --init
957
- submodule--helper: allow setting superprefix for init_submodule()
958
- submodule--helper: refactor get_submodule_displaypath()
959
- submodule--helper run-update-procedure: learn --remote
960
- submodule--helper: don't use bitfield indirection for parse_options()
961
- submodule--helper: get remote names from any repository
925
- - submodule--helper: remove ensure-core-worktree
962
- submodule--helper run-update-procedure: remove --suboid
963
- submodule--helper: reorganize code for sh to C conversion
964
- submodule--helper: remove update-module-mode
@@ -930,8 +966,8 @@ Release tarballs are available at:
966
967
Rewrite of "git submodule update" in C (early part).
968
933
- cf. <xmqqzgm690iu.fsf@gitster.g>
934
- source: <20220303005727.69270-1-chooglen@google.com>
969
+ Will merge to 'next'?
970
+ source: <20220305001401.20888-1-chooglen@google.com>
971
972
973
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
@@ -1020,22 +1056,6 @@ Release tarballs are available at:
1056
source: <20220210164627.279520-1-jholdsworth@nvidia.com>
1057
1058
1023
-* rs/bisect-executable-not-found (2022-01-19) 4 commits
1024
- (merged to 'next' on 2022-02-28 at c74bff7954)
1025
- + bisect--helper: double-check run command on exit code 126 and 127
1026
- + bisect: document run behavior with exit codes 126 and 127
1027
- + bisect--helper: release strbuf and strvec on run error
1028
- + bisect--helper: report actual bisect_state() argument on error
1029
-
1030
- A not-so-common mistake is to write a script to feed "git bisect
1031
- run" without making it executable, in which case all tests will
1032
- exit with 126 or 127 error codes, even on revisions that are marked
1033
- as good. Try to recognize this situation and stop iteration early.
1034
-
1035
- Will merge to 'master'.
1036
- source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
1037
-
1038
-
1059
* en/present-despite-skipped (2022-03-01) 7 commits
1060
(merged to 'next' on 2022-03-01 at 4982287a31)
1061
+ repo_read_index: add config to expect files outside sparse patterns
@@ -1124,7 +1144,7 @@ Release tarballs are available at:
1144
cf. <xmqqbkyqupg6.fsf@gitster.g>
1145
source: <20220301002613.1459916-1-emilyshaffer@google.com>
1146
1127
-------------------------------------------------------------
1147
+--------------------------------------------------
1148
[Discarded]
1149
1150
* jc/parse-options-check (2022-03-01) 1 commit