What's cooking (2023/06 #07)
Junio C Hamano committed
Jun 27, 2023 at 15:10 UTC
8cf8b60ee13420d6c98f50938dd6ad4c0ccdca2e
1 file changed
+138
-259
whats-cooking.txt
+138
-259
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2023, #06; Fri, 23)
3
-X-master-at: 6ff334181cfb6485d3ba50843038209a2a253907
4
-X-next-at: 577bbd8c9fd2f098bfa6e5dc606afb1b1ce7a55e
2
+Subject: What's cooking in git.git (Jun 2023, #07; Tue, 27)
3
+X-master-at: a9e066fa63149291a55f383cfa113d8bdbdaa6b3
4
+X-next-at: ea14687e91835d59149e0866d2a4cde22a5e5c3a
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2023, #06; Fri, 23)
7
+What's cooking in git.git (Jun 2023, #07; Tue, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,246 +48,93 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* as/dtype-compilation-fix (2023-06-12) 1 commit
52
- (merged to 'next' on 2023-06-16 at 267100947e)
53
- + statinfo.h: move DTYPE defines from dir.h
54
-
55
- Compilation fix for platforms without D_TYPE in struct dirent.
56
- source: <20230606205935.3183276-1-asedeno@google.com>
57
-
58
-
59
-* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
60
- (merged to 'next' on 2023-06-15 at 377b9f9a00)
61
- + add: test use of brackets when color is disabled
62
- + add: check color.ui for interactive add
63
-
64
- The reimplemented "git add -i" did not honor color.ui configuration.
65
- source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
66
-
67
-
68
-* ds/disable-replace-refs (2023-06-12) 3 commits
69
- (merged to 'next' on 2023-06-15 at e7baddb745)
70
- + repository: create read_replace_refs setting
71
- + replace-objects: create wrapper around setting
72
- + repository: create disable_replace_refs()
73
- (this branch uses tb/pack-bitmap-traversal-with-boundary.)
74
-
75
- Introduce a mechanism to disable replace refs globally and per
76
- repository.
77
- source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
78
-
79
-
80
-* gc/discover-not-setup (2023-06-16) 1 commit
81
- (merged to 'next' on 2023-06-16 at 27d1cd2a1b)
82
- + setup.c: don't setup in discover_git_directory()
83
-
84
- discover_git_directory() no longer touches the_repository.
85
- source: <pull.1526.git.git.1686771358484.gitgitgadget@gmail.com>
86
-
87
-
88
-* ja/worktree-orphan (2023-05-17) 8 commits
89
- (merged to 'next' on 2023-06-15 at 16bb552b79)
90
- + worktree add: emit warn when there is a bad HEAD
91
- + worktree add: extend DWIM to infer --orphan
92
- + worktree add: introduce "try --orphan" hint
93
- + worktree add: add --orphan flag
94
- + t2400: add tests to verify --quiet
95
- + t2400: refactor "worktree add" opt exclusion tests
96
- + t2400: cleanup created worktree in test
97
- + worktree add: include -B in usage docs
98
-
99
- Originally merged to 'next' on 2023-06-14
100
-
101
- 'git worktree add' learned how to create a worktree based on an
102
- orphaned branch with `--orphan`.
103
- source: <20230517214711.12467-1-jacobabel@nullpo.dev>
104
-
105
-
106
-* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
107
- (merged to 'next' on 2023-06-16 at bfc01bd5e2)
108
- + diff-lib: honor override_submodule_config flag bit
109
-
110
- Even when diff.ignoreSubmodules tells us to ignore submodule
111
- changes, "git commit" with an index that already records changes to
112
- submodules should include the submodule changes in the resulting
113
- commit, but it did not.
114
- source: <20230614164856.3186012-2-sokcevic@google.com>
115
-
116
-
117
-* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
118
- (merged to 'next' on 2023-06-16 at ebb72b9bd8)
119
- + CodingGuidelines: use octal escapes, not hex
120
-
121
- Suggest to refrain from using hex literals that are non-portable
122
- when writing printf(1) format strings.
123
- source: <20230614213145.475607-1-jonathantanmy@google.com>
124
-
125
-
126
-* la/docs-typofixes (2023-06-12) 1 commit
127
- (merged to 'next' on 2023-06-16 at 56ddcb16e6)
128
- + docs: typofixes
129
-
130
- Typofixes.
131
- source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
132
-
133
-
134
-* mh/credential-erase-improvements (2023-06-15) 2 commits
135
- (merged to 'next' on 2023-06-16 at 5a3ed25303)
136
- + credential: erase all matching credentials
137
- + credential: avoid erasing distinct password
138
-
139
- Will merge to 'master'.
140
- cf. <20230615212116.GA39325@coredump.intra.peff.net>
141
- source: <pull.1525.v4.git.git.1686856773.gitgitgadget@gmail.com>
142
-
143
-
144
-* ps/cat-file-null-output (2023-06-12) 5 commits
145
- (merged to 'next' on 2023-06-15 at e841ad2be5)
146
- + cat-file: add option '-Z' that delimits input and output with NUL
147
- + cat-file: simplify reading from standard input
148
- + strbuf: provide CRLF-aware helper to read until a specified delimiter
149
- + t1006: modernize test style to use `test_cmp`
150
- + t1006: don't strip timestamps from expected results
151
-
152
- "git cat-file --batch" and friends learned "-Z" that uses NUL
153
- delimiter for both input and output.
154
- source: <cover.1686028409.git.ps@pks.im>
155
-
156
-
157
-* rj/leakfixes (2023-06-17) 11 commits
158
- (merged to 'next' on 2023-06-17 at 49e54a88e2)
159
- + tests: mark as passing with SANITIZE=leak
160
- + config: fix a leak in git_config_copy_or_rename_section_in_file
161
- + branch: fix a leak in cmd_branch
162
- + branch: fix a leak in setup_tracking
163
- + rev-parse: fix a leak with --abbrev-ref
164
- (merged to 'next' on 2023-06-16 at d9330ea230)
165
- + branch: fix a leak in setup_tracking
166
- + branch: fix a leak in check_tracking_branch
167
- + branch: fix a leak in inherit_tracking
168
- + branch: fix a leak in dwim_and_setup_tracking
169
- + remote: fix a leak in query_matches_negative_refspec
170
- + config: fix a leak in git_config_copy_or_rename_section_in_file
171
-
172
- Leakfixes
173
- source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
174
- source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
175
-
176
-
177
-* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit
178
- (merged to 'next' on 2023-06-16 at 472c7f55c9)
179
- + ls-tree: fix documentation of %x format placeholder
180
-
181
- Doc update.
182
- source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>
183
-
184
-
185
-* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
186
- (merged to 'next' on 2023-06-16 at 6bb4425334)
187
- + run-command: report exec error even on ENOENT
188
- + t1800: loosen matching of error message for bad shebang
189
-
190
- Simplify error message when run-command fails to start a command.
191
- source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
192
-
193
-
194
-* sl/worktree-sparse (2023-06-12) 1 commit
195
- (merged to 'next' on 2023-06-16 at ca0a7edcc5)
196
- + worktree: integrate with sparse-index
51
+* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
52
+ (merged to 'next' on 2023-06-20 at 08e5f2a6b5)
53
+ + commit: pass --no-divider to interpret-trailers
54
198
- "git worktree" learned to work better with sparse index feature.
199
- source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
55
+ When "git commit --trailer=..." invokes the interpret-trailers
56
+ machinery, it knows what it feeds to interpret-trailers is a full
57
+ log message without any patch, but failed to express that by
58
+ passing the "--no-divider" option, which has been corrected.
59
+ source: <20230617042624.GA562686@coredump.intra.peff.net>
60
61
202
-* tb/gc-recent-object-hook (2023-06-12) 2 commits
203
- (merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
204
- + gc: introduce `gc.recentObjectsHook`
205
- + reachable.c: extract `obj_is_recent()`
62
+* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
63
+ (merged to 'next' on 2023-06-20 at c1247fd527)
64
+ + http: handle both "h2" and "h2h3" in curl info lines
65
207
- "git pack-objects" learned to invoke a new hook program that
208
- enumerates extra objects to be used as anchoring points to keep
209
- otherwise unreachable objects in cruft packs.
210
- source: <cover.1686178684.git.me@ttaylorr.com>
66
+ Curl library recently changed how http2 traces are shown and broke
67
+ the code to redact sensitive info header, which has been fixed.
68
69
+ The GitHub Actions CI has been broken for recent macOS jobs, so
70
+ this topic has been fast-tracked to help them.
71
+ source: <20230617051559.GD562686@coredump.intra.peff.net>
72
213
-* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
214
- (merged to 'next' on 2023-06-16 at 6546fee734)
215
- + pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
73
217
- Gracefully deal with a stale MIDX file that lists a packfile that
218
- no longer exists.
219
- source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
74
+* tb/collect-pack-filenames-fix (2023-06-12) 1 commit
75
+ (merged to 'next' on 2023-06-20 at abcc6892c8)
76
+ + builtin/repack.c: only collect fully-formed packs
77
78
+ Avoid breakage of "git pack-objects --cruft" due to inconsistency
79
+ between the way the code enumerates packfiles in the repository.
80
+ source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
81
222
-* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
223
- + pack-bitmap.c: use commit boundary during bitmap traversal
224
- + pack-bitmap.c: extract `fill_in_bitmap()`
225
- + object: add object_array initializer helper function
226
- (this branch is used by ds/disable-replace-refs.)
82
+--------------------------------------------------
83
+[New Topics]
84
228
- Originally merged to 'next' on 2023-06-15
85
+* mh/credential-erase-improvements-more (2023-06-24) 2 commits
86
+ - credential/wincred: erase matching creds only
87
+ - credential/libsecret: erase matching creds only
88
230
- The object traversal using reachability bitmap done by
231
- "pack-object" has been tweaked to take advantage of the fact that
232
- using "boundary" commits as representative of all the uninteresting
233
- ones can save quite a lot of object enumeration.
234
- source: <cover.1683567065.git.me@ttaylorr.com>
89
+ Needs review.
90
+ source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
91
92
237
-* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
238
- (merged to 'next' on 2023-06-16 at 19770e970a)
239
- + t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
93
+* tb/gc-recent-object-hook (2023-06-24) 1 commit
94
+ (merged to 'next' on 2023-06-24 at e8c295841b)
95
+ + t7701: make annotated tag unreachable
96
97
Test update.
242
- source: <20230606214707.55739-1-tmz@pobox.com>
243
-
244
---------------------------------------------------
245
-[New Topics]
246
-
247
-* ds/remove-idx-before-pack (2023-06-20) 1 commit
248
- (merged to 'next' on 2023-06-23 at fa97bf0e41)
249
- + packfile: delete .idx files before .pack files
250
-
251
- We create .pack and then .idx, we consider only packfiles that have
252
- .idx usable (those with only .pack are not ready yet), so we should
253
- remove .idx before removing .pack for consistency.
98
99
Will merge to 'master'.
256
- source: <pull.1547.git.1687287675248.gitgitgadget@gmail.com>
100
+ source: <259b1b559114ab1a9a0bd7f1ad29a4cba2612ae0.1687617197.git.me@ttaylorr.com>
101
102
259
-* bc/more-git-var (2023-06-22) 3 commits
260
- - var: add config file locations
261
- - var: add attributes files locations
262
- - var: add support for listing the shell
103
+* gc/config-context (2023-06-26) 12 commits
104
+ - config: pass source to config_parser_event_fn_t
105
+ - config: add kvi.path, use it to evaluate includes
106
+ - config.c: remove config_reader from configsets
107
+ - config: pass kvi to die_bad_number()
108
+ - trace2: plumb config kvi
109
+ - config.c: pass ctx with CLI config
110
+ - builtin/config.c: test misuse of format_config()
111
+ - config: pass ctx with config files
112
+ - config.c: pass ctx in configsets
113
+ - config: add ctx arg to config_fn_t
114
+ - urlmatch.h: use config_fn_t type
115
+ - config: inline git_color_default_config
116
264
- Add more "git var" for toolsmiths to learn various locations Git is
265
- configured with either via the configuration or hardcoded defaults.
117
+ source: <pull.1497.v4.git.git.1687803083.gitgitgadget@gmail.com>
118
267
- Expecting a reroll.
268
- source: <20230622195059.320593-1-sandals@crustytoothpaste.net>
119
120
+* gc/config-partial-submodule-kvi-fix (2023-06-26) 1 commit
121
+ - config: don't BUG when both kvi and source are set
122
271
-* jc/doc-hash-object-types (2023-06-22) 1 commit
272
- - docs: add "git hash-object -t" option's possible values
123
+ source: <pull.1535.git.git.1687801297404.gitgitgadget@gmail.com>
124
274
- Doc update.
125
276
- Expecting a reroll.
277
- cf. <62B7F5FF-F85D-47C0-B553-F57B991D0BCC@gmail.com>
278
- source: <pull.1533.git.git.1687394795009.gitgitgadget@gmail.com>
126
+* pw/apply-too-large (2023-06-26) 1 commit
127
+ - apply: improve error messages when reading patch
128
129
+ source: <pull.1552.git.1687772253869.gitgitgadget@gmail.com>
130
281
-* jc/abort-ll-merge-with-a-signal (2023-06-23) 1 commit
282
- (merged to 'next' on 2023-06-23 at 9c9c37e95e)
283
- + ll-merge: killing the external merge driver aborts the merge
131
285
- When the external merge driver is killed by a signal, its output
286
- should not be trusted as a resolution with conflicts that is
287
- proposed by the driver, but the code did.
132
+* pw/diff-no-index-from-named-pipes (2023-06-27) 3 commits
133
+ . diff --no-index: support reading from named pipes
134
+ . t4054: test diff --no-index with stdin
135
+ . diff --no-index: die on error reading stdin
136
289
- Will merge to 'master'.
290
- source: <xmqq4jmzc91e.fsf_-_@gitster.g>
137
+ source: <cover.1687874975.git.phillip.wood@dunelm.org.uk>
138
139
--------------------------------------------------
140
[Stalled]
@@ -426,6 +273,70 @@ Release tarballs are available at:
273
--------------------------------------------------
274
[Cooking]
275
276
+* ds/remove-idx-before-pack (2023-06-20) 1 commit
277
+ (merged to 'next' on 2023-06-23 at fa97bf0e41)
278
+ + packfile: delete .idx files before .pack files
279
+
280
+ We create .pack and then .idx, we consider only packfiles that have
281
+ .idx usable (those with only .pack are not ready yet), so we should
282
+ remove .idx before removing .pack for consistency.
283
+
284
+ Will merge to 'master'.
285
+ source: <pull.1547.git.1687287675248.gitgitgadget@gmail.com>
286
+
287
+
288
+* bc/more-git-var (2023-06-27) 8 commits
289
+ (merged to 'next' on 2023-06-27 at ea14687e91)
290
+ + var: add config file locations
291
+ + var: add attributes files locations
292
+ + attr: expose and rename accessor functions
293
+ + var: adjust memory allocation for strings
294
+ + var: format variable structure with C99 initializers
295
+ + var: add support for listing the shell
296
+ + t: add a function to check executable bit
297
+ + var: mark unused parameters in git_var callbacks
298
+<<
299
+* bc/more-git-var (2023-06-27) 8 commits
300
+ . var: add config file locations
301
+ . var: add attributes files locations
302
+ . attr: expose and rename accessor functions
303
+ . var: adjust memory allocation for strings
304
+ . var: format variable structure with C99 initializers
305
+ . var: add support for listing the shell
306
+ . t: add a function to check executable bit
307
+ . var: mark unused parameters in git_var callbacks
308
+>>
309
+
310
+ Add more "git var" for toolsmiths to learn various locations Git is
311
+ configured with either via the configuration or hardcoded defaults.
312
+
313
+ Will merge to 'master'.
314
+ source: <20230627161902.754472-1-sandals@crustytoothpaste.net>
315
+
316
+
317
+* jc/doc-hash-object-types (2023-06-23) 1 commit
318
+ - docs: add git hash-object -t option's possible values
319
+
320
+ Doc update.
321
+
322
+ Will merge to 'next'.
323
+ source: <pull.1533.v2.git.git.1687555504551.gitgitgadget@gmail.com>
324
+
325
+
326
+* jc/abort-ll-merge-with-a-signal (2023-06-23) 2 commits
327
+ (merged to 'next' on 2023-06-24 at 685eb5d25c)
328
+ + t6406: skip "external merge driver getting killed by a signal" test on Windows
329
+ (merged to 'next' on 2023-06-23 at 9c9c37e95e)
330
+ + ll-merge: killing the external merge driver aborts the merge
331
+
332
+ When the external merge driver is killed by a signal, its output
333
+ should not be trusted as a resolution with conflicts that is
334
+ proposed by the driver, but the code did.
335
+
336
+ Will merge to 'master'.
337
+ source: <xmqq4jmzc91e.fsf_-_@gitster.g>
338
+
339
+
340
* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
341
- gc: add `gc.repackFilterTo` config option
342
- repack: implement `--filter-to` for storing filtered out objects
@@ -445,39 +356,16 @@ Release tarballs are available at:
356
357
358
* ps/revision-stdin-with-options (2023-06-15) 3 commits
448
- - revision: handle pseudo-opts in `--stdin` mode
449
- - revision: small readability improvement for reading from stdin
450
- - revision: reorder `read_revisions_from_stdin()`
359
+ (merged to 'next' on 2023-06-26 at eda3e4d0b5)
360
+ + revision: handle pseudo-opts in `--stdin` mode
361
+ + revision: small readability improvement for reading from stdin
362
+ + revision: reorder `read_revisions_from_stdin()`
363
364
The set-up code for the get_revision() API now allows feeding
365
options like --all and --not in the --stdin mode.
366
455
- Will merge to 'next'?
456
- source: <cover.1686839572.git.ps@pks.im>
457
-
458
-
459
-* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
460
- (merged to 'next' on 2023-06-20 at 08e5f2a6b5)
461
- + commit: pass --no-divider to interpret-trailers
462
-
463
- When "git commit --trailer=..." invokes the interpret-trailers
464
- machinery, it knows what it feeds to interpret-trailers is a full
465
- log message without any patch, but failed to express that by
466
- passing the "--no-divider" option, which has been corrected.
467
-
468
- Will merge to 'master'.
469
- source: <20230617042624.GA562686@coredump.intra.peff.net>
470
-
471
-
472
-* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
473
- (merged to 'next' on 2023-06-20 at c1247fd527)
474
- + http: handle both "h2" and "h2h3" in curl info lines
475
-
476
- Curl library recently changed how http2 traces are shown and broke
477
- the code to redact sensitive info header, which has been fixed.
478
-
367
Will merge to 'master'.
480
- source: <20230617051559.GD562686@coredump.intra.peff.net>
368
+ source: <cover.1686839572.git.ps@pks.im>
369
370
371
* rs/strbuf-expand-step (2023-06-18) 5 commits
@@ -488,6 +376,8 @@ Release tarballs are available at:
376
- pretty: factor out expand_separator()
377
378
Code clean-up around strbuf_expand() API.
379
+
380
+ Will merge to 'next'.
381
source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
382
383
@@ -512,14 +402,13 @@ Release tarballs are available at:
402
source: <20230604211934.1365289-1-mh@glandium.org>
403
404
515
-* pb/complete-diff-options (2023-06-12) 25 commits
405
+* pb/complete-diff-options (2023-06-26) 24 commits
406
- diff.c: mention completion above add_diff_options
407
- completion: complete --remerge-diff
408
- completion: complete --diff-merges, its options and --no-diff-merges
409
- completion: move --pickaxe-{all,regex} to __git_diff_common_options
410
- completion: complete --ws-error-highlight
411
- completion: complete --unified
522
- - completion: complete --patch-with-raw
412
- completion: complete --output-indicator-{context,new,old}
413
- completion: complete --output
414
- completion: complete --no-stat
@@ -541,20 +430,8 @@ Release tarballs are available at:
430
431
Completion updates.
432
544
- Expecting a reroll.
545
- cf. <5cba334c-4d75-0dac-20c6-9e3def1f224a@gmail.com>
546
- source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
547
-
548
-
549
-* tb/collect-pack-filenames-fix (2023-06-12) 1 commit
550
- (merged to 'next' on 2023-06-20 at abcc6892c8)
551
- + builtin/repack.c: only collect fully-formed packs
552
-
553
- Avoid breakage of "git pack-objects --cruft" due to inconsistency
554
- between the way the code enumerates packfiles in the repository.
555
-
556
- Will merge to 'master'.
557
- source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
433
+ Will merge to 'next'.
434
+ source: <pull.1543.v3.git.1687796688.gitgitgadget@gmail.com>
435
436
437
* ks/ref-filter-signature (2023-06-06) 2 commits
@@ -708,6 +585,8 @@ Release tarballs are available at:
585
586
Move functions that are not about pure string manipulation out of
587
strbuf.[ch]
588
+
589
+ Will merge to 'next'.
590
source: <20230606194720.2053551-1-calvinwan@google.com>
591
592