What's cooking (2024/03 #05)
Junio C Hamano committed
Mar 19, 2024 at 07:52 UTC
9960e535dff28443a5bcd71cf5d763f164027494
1 file changed
+152
-218
whats-cooking.txt
+152
-218
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2024, #04; Fri, 15)
3
-X-master-at: 2953d95d402b6bff1a59c4712f4d46f1b9ea137f
4
-X-next-at: cdc2e80fe5f5dd8f872f21cdcd608126da6ccc7e
2
+Subject: What's cooking in git.git (Mar 2024, #05; Tue, 19)
3
+X-master-at: 3bd955d26919e149552f34aacf8a4e6368c26cec
4
+X-next-at: fe251e3e4dec6a6d677e61d53b316c06da172af2
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2024, #04; Fri, 15)
7
+What's cooking in git.git (Mar 2024, #05; Tue, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,199 +48,167 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* ag/t0010-modernize (2024-03-05) 1 commit
52
- (merged to 'next' on 2024-03-07 at 38339abc2d)
53
- + tests: modernize the test script t0010-racy-git.sh
51
+* jh/trace2-missing-def-param-fix (2024-03-07) 3 commits
52
+ (merged to 'next' on 2024-03-08 at a797cfea3c)
53
+ + trace2: emit 'def_param' set with 'cmd_name' event
54
+ + trace2: avoid emitting 'def_param' set more than once
55
+ + t0211: demonstrate missing 'def_param' events for certain commands
56
+
57
+ Some trace2 events that lacked def_param have learned to show it,
58
+ enriching the output.
59
+
60
+ Reviewed-by: Josh Steadmon <steadmon@google.com>
61
+ cf. <ZejkVOVQBZhLVfHW@google.com>
62
+ source: <pull.1679.v2.git.1709824949.gitgitgadget@gmail.com>
63
+
64
+
65
+* jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit
66
+ (merged to 'next' on 2024-03-08 at 2cded1c696)
67
+ + doc/gitremote-helpers: fix missing single-quote
68
+
69
+ Doc mark-up fix.
70
+ source: <20240307084313.GA2072022@coredump.intra.peff.net>
71
+
72
+
73
+* pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit
74
+ (merged to 'next' on 2024-03-08 at e806ee9493)
75
+ + rebase -i: stop setting GIT_CHERRY_PICK_HELP
76
55
- GSoC practice to modernize a test script.
56
- source: <pull.1675.v3.git.1709676557639.gitgitgadget@gmail.com>
77
+ Code simplification by getting rid of code that sets an environment
78
+ variable that is no longer used.
79
+ source: <pull.1678.git.1709042783847.gitgitgadget@gmail.com>
80
81
+--------------------------------------------------
82
+[New Topics]
83
+
84
+* bb/sh-scripts-cleanup (2024-03-16) 22 commits
85
+ (merged to 'next' on 2024-03-18 at 4501a04796)
86
+ + git-quiltimport: avoid an unnecessary subshell
87
+ + contrib/coverage-diff: avoid redundant pipelines
88
+ + t/t9*: merge "grep | sed" pipelines
89
+ + t/t8*: merge "grep | sed" pipelines
90
+ + t/t5*: merge a "grep | sed" pipeline
91
+ + t/t4*: merge a "grep | sed" pipeline
92
+ + t/t3*: merge a "grep | awk" pipeline
93
+ + t/t1*: merge a "grep | sed" pipeline
94
+ + t/t9*: avoid redundant uses of cat
95
+ + t/t8*: avoid redundant use of cat
96
+ + t/t7*: avoid redundant use of cat
97
+ + t/t6*: avoid redundant uses of cat
98
+ + t/t5*: avoid redundant uses of cat
99
+ + t/t4*: avoid redundant uses of cat
100
+ + t/t3*: avoid redundant uses of cat
101
+ + t/t1*: avoid redundant uses of cat
102
+ + t/t0*: avoid redundant uses of cat
103
+ + t/perf: avoid redundant use of cat
104
+ + t/annotate-tests.sh: avoid redundant use of cat
105
+ + t/lib-cvs.sh: avoid redundant use of cat
106
+ + contrib/subtree/t: avoid redundant use of cat
107
+ + doc: avoid redundant use of cat
108
+
109
+ Shell scripts clean-up.
110
+
111
+ Will merge to 'master'.
112
+ source: <20240315194620.10713-1-dev+git@drbeat.li>
113
59
-* as/option-names-in-messages (2024-03-05) 4 commits
60
- (merged to 'next' on 2024-03-07 at 73ab51faba)
61
- + revision.c: trivial fix to message
62
- + builtin/clone.c: trivial fix of message
63
- + builtin/remote.c: trivial fix of error message
64
- + transport-helper.c: trivial fix of error message
114
66
- Error message updates.
67
- source: <20240216101647.28837-1-ash@kambanaria.org>
115
+* bl/doc-config-fixes (2024-03-16) 2 commits
116
+ (merged to 'next' on 2024-03-18 at a9038d5a9e)
117
+ + docs: fix typo in git-config `--default`
118
+ + docs: clarify file options in git-config `--edit`
119
120
+ A few typoes in "git config --help" have been corrected.
121
70
-* gt/core-bare-in-templates (2024-03-04) 1 commit
71
- (merged to 'next' on 2024-03-06 at e54ac5acf9)
72
- + setup: remove unnecessary variable
122
+ Will merge to 'master'.
123
+ source: <20240316050149.1182867-2-brianmlyles@gmail.com>
124
74
- Code simplification.
75
- source: <20240304151811.511780-1-shyamthakkar001@gmail.com>
125
126
+* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
127
+ (merged to 'next' on 2024-03-18 at b2e1babb85)
128
+ + docs: adjust trailer `separator` and `key_value_separator` language
129
+ + docs: correct trailer `key_value_separator` description
130
78
-* hd/config-mak-os390 (2024-03-06) 1 commit
79
- (merged to 'next' on 2024-03-07 at 289d3ab691)
80
- + build: support z/OS (OS/390).
131
+ The documentation for "%(trailers[:options])" placeholder in the
132
+ "--pretty" option of commands in the "git log" family has been
133
+ updated.
134
82
- Platform specific tweaks for OS/390 has been added to
83
- config.mak.uname.
84
- source: <pull.1663.v4.git.git.1709703857881.gitgitgadget@gmail.com>
135
+ Will merge to 'master'.
136
+ source: <20240316035612.752910-1-brianmlyles@gmail.com>
137
138
87
-* jc/test-i18ngrep (2024-03-02) 1 commit
88
- (merged to 'next' on 2024-03-06 at 2c57ebc706)
89
- + test_i18ngrep: hard deprecate and forbid its use
139
+* ja/doc-formatting-fix (2024-03-16) 2 commits
140
+ (merged to 'next' on 2024-03-18 at edde7a576d)
141
+ + doc: fix some placeholders formating
142
+ + doc: format alternatives in synopsis
143
91
- With release 2.44 we got rid of all uses of test_i18ngrep and there
92
- is no in-flight topic that adds a new use of it. Make a call to
93
- test_i18ngrep a hard failure, so that we can remove it at the end
94
- of this release cycle.
95
- source: <xmqq5xy4zhdc.fsf@gitster.g>
144
+ Documentation mark-up fix.
145
146
+ Will merge to 'master'.
147
+ source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
148
98
-* jc/xwrite-cleanup (2024-03-02) 3 commits
99
- (merged to 'next' on 2024-03-07 at 43e66f7e4d)
100
- + repack: check error writing to pack-objects subprocess
101
- + sideband: avoid short write(2)
102
- + unpack: replace xwrite() loop with write_in_full()
149
104
- Uses of xwrite() helper have been audited and updated for better
105
- error checking and simpler code.
106
- source: <20240302190348.3946569-1-gitster@pobox.com>
150
+* la/hide-trailer-info (2024-03-16) 7 commits
151
+ - trailer: retire trailer_info_get() from API
152
+ - trailer: make trailer_info struct private
153
+ - trailer: make parse_trailers() return trailer_info pointer
154
+ - interpret-trailers: access trailer_info with new helpers
155
+ - sequencer: use the trailer iterator
156
+ - trailer: teach iterator about non-trailer lines
157
+ - Merge branch 'la/format-trailer-info' into la/hide-trailer-info
158
+ (this branch uses la/format-trailer-info.)
159
160
+ The trailer API has been reshuffled a bit.
161
+ source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>
162
109
-* jh/fsmonitor-icase-corner-case-fix (2024-03-06) 14 commits
110
- (merged to 'next' on 2024-03-06 at 356eafea7e)
111
- + fsmonitor: support case-insensitive events
112
- + fsmonitor: refactor bit invalidation in refresh callback
113
- + fsmonitor: trace the new invalidated cache-entry count
114
- + fsmonitor: return invalidated cache-entry count on non-directory event
115
- + fsmonitor: remove custom loop from non-directory path handler
116
- + fsmonitor: return invalidated cache-entry count on directory event
117
- + fsmonitor: move untracked-cache invalidation into helper functions
118
- + fsmonitor: refactor untracked-cache invalidation
119
- + dir: create untracked_cache_invalidate_trimmed_path()
120
- + fsmonitor: refactor refresh callback for non-directory events
121
- + fsmonitor: clarify handling of directory events in callback helper
122
- + fsmonitor: refactor refresh callback on directory events
123
- + t7527: add case-insensitve test for FSMonitor
124
- + name-hash: add index_dir_find()
163
126
- FSMonitor client code was confused when FSEvents were given in a
127
- different case on a case-insensitive filesystem, which has been
128
- corrected.
164
+* pb/advice-merge-conflict (2024-03-18) 2 commits
165
+ - builtin/am: allow disabling conflict advice
166
+ - sequencer: allow disabling conflict advice
167
130
- Acked-by: Patrick Steinhardt <ps@pks.im>
131
- cf. <ZehofMaSZyUq8S1N@tanuki>
132
- source: <pull.1662.v3.git.1708983565.gitgitgadget@gmail.com>
168
+ Hints that suggest what to do after resolving conflicts can now be
169
+ squelched by disabling advice.mergeConflict.
170
171
+ Will merge to 'next'?
172
+ source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
173
135
-* kh/branch-ref-syntax-advice (2024-03-05) 5 commits
136
- (merged to 'next' on 2024-03-07 at 914f01967b)
137
- + branch: advise about ref syntax rules
138
- + advice: use double quotes for regular quoting
139
- + advice: use backticks for verbatim
140
- + advice: make all entries stylistically consistent
141
- + t3200: improve test style
174
143
- When git refuses to create a branch because the proposed branch
144
- name is not a valid refname, an advice message is given to refer
145
- the user to exact naming rules.
146
- source: <cover.1709670287.git.code@khaugsbakk.name>
175
+* rs/t-prio-queue-fixes (2024-03-18) 2 commits
176
+ - t-prio-queue: check result array bounds
177
+ - t-prio-queue: shorten array index message
178
179
+ Test clean-up.
180
149
-* kh/doc-commentchar-is-a-byte (2024-03-05) 1 commit
150
- (merged to 'next' on 2024-03-06 at 5941655c04)
151
- + config: document `core.commentChar` as ASCII-only
181
+ Will merge to 'next'.
182
+ source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
183
+
184
+
185
+* ps/pack-refs-auto (2024-03-18) 16 commits
186
+ - builtin/gc: pack refs when using `git maintenance run --auto`
187
+ - builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
188
+ - t6500: extract objects with "17" prefix
189
+ - builtin/gc: move `struct maintenance_run_opts`
190
+ - builtin/pack-refs: introduce new "--auto" flag
191
+ - builtin/pack-refs: release allocated memory
192
+ - refs/reftable: expose auto compaction via new flag
193
+ - refs: remove `PACK_REFS_ALL` flag
194
+ - refs: move `struct pack_refs_opts` to where it's used
195
+ - t/helper: drop pack-refs wrapper
196
+ - refs/reftable: print errors on compaction failure
197
+ - reftable/stack: gracefully handle failed auto-compaction due to locks
198
+ - reftable/stack: use error codes when locking fails during compaction
199
+ - reftable/error: discern locked/outdated errors
200
+ - reftable/stack: fix error handling in `reftable_stack_init_addition()`
201
+ - Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
202
+ (this branch uses ps/reftable-stack-tempfile.)
203
+
204
+ "git pack-refs" learned the "--auto" option, which is a useful
205
+ addition to be triggered from "git gc --auto".
206
153
- The "core.commentChar" configuration variable only allows an ASCII
154
- character, which was not clearly documented, which has been
155
- corrected.
156
- source: <9633f9be5ddd9ab3df4b79ee934e1ed47e90bd1d.1709656683.git.code@khaugsbakk.name>
157
-
158
-
159
-* la/trailer-api (2024-03-01) 9 commits
160
- (merged to 'next' on 2024-03-06 at f119923ff6)
161
- + format_trailers_from_commit(): indirectly call trailer_info_get()
162
- + format_trailer_info(): move "fast path" to caller
163
- + format_trailers(): use strbuf instead of FILE
164
- + trailer_info_get(): reorder parameters
165
- + trailer: move interpret_trailers() to interpret-trailers.c
166
- + trailer: reorder format_trailers_from_commit() parameters
167
- + trailer: rename functions to use 'trailer'
168
- + shortlog: add test for de-duplicating folded trailers
169
- + trailer: free trailer_info _after_ all related usage
170
-
171
- Trailer API updates.
172
-
173
- Acked-by: Christian Couder <christian.couder@gmail.com>
174
- cf. <CAP8UFD1Zd+9q0z1JmfOf60S2vn5-sD3SafDvAJUzRFwHJKcb8A@mail.gmail.com>
175
- source: <pull.1632.v6.git.1709252086.gitgitgadget@gmail.com>
176
-
177
-
178
-* ps/reftable-iteration-perf-part2 (2024-03-04) 13 commits
179
- (merged to 'next' on 2024-03-06 at e8ba314585)
180
- + refs/reftable: precompute prefix length
181
- + reftable: allow inlining of a few functions
182
- + reftable/record: decode keys in place
183
- + reftable/record: reuse refname when copying
184
- + reftable/record: reuse refname when decoding
185
- + reftable/merged: avoid duplicate pqueue emptiness check
186
- + reftable/merged: circumvent pqueue with single subiter
187
- + reftable/merged: handle subiter cleanup on close only
188
- + reftable/merged: remove unnecessary null check for subiters
189
- + reftable/merged: make subiters own their records
190
- + reftable/merged: advance subiter on subsequent iteration
191
- + reftable/merged: make `merged_iter` structure private
192
- + reftable/pq: use `size_t` to track iterator index
193
- (this branch is used by ps/reftable-reflog-iteration-perf.)
194
-
195
- The code to iterate over refs with the reftable backend has seen
196
- some optimization.
197
- source: <cover.1709548907.git.ps@pks.im>
198
-
199
-
200
-* rj/complete-reflog (2024-03-03) 5 commits
201
- (merged to 'next' on 2024-03-06 at 0f1a25debc)
202
- + completion: reflog subcommands and options
203
- + completion: factor out __git_resolve_builtins
204
- + completion: introduce __git_find_subcommand
205
- + completion: reflog show <log-options>
206
- + completion: reflog with implicit "show"
207
-
208
- The command line completion script (in contrib/) learned to
209
- complete "git reflog" better.
210
- source: <ea6c8890-9ff3-46c9-b933-6a52083b1001@gmail.com>
211
-
212
-
213
-* rj/complete-worktree-paths-fix (2024-02-27) 1 commit
214
- (merged to 'next' on 2024-03-06 at b6ba949383)
215
- + completion: fix __git_complete_worktree_paths
216
-
217
- The logic to complete the command line arguments to "git worktree"
218
- subcommand (in contrib/) has been updated to correctly honor things
219
- like "git -C dir" etc.
220
- source: <b8f09e20-d0d3-4e0b-afe2-31affeb61052@gmail.com>
221
-
222
-
223
-* so/clean-dry-run-without-force (2024-03-04) 2 commits
224
- (merged to 'next' on 2024-03-06 at ccf2e123be)
225
- + clean: further clean-up of implementation around "--force"
226
- + clean: improve -n and -f implementation and documentation
227
-
228
- The implementation in "git clean" that makes "-n" and "-i" ignore
229
- clean.requireForce has been simplified, together with the
230
- documentation.
231
- source: <87le6ziqzb.fsf_-_@osv.gnss.ru>
232
- source: <20240303220600.2491792-1-gitster@pobox.com>
233
-
234
-
235
-* vm/t7301-use-test-path-helpers (2024-03-06) 1 commit
236
- (merged to 'next' on 2024-03-07 at e638654635)
237
- + t7301: use test_path_is_(missing|file)
238
-
239
- GSoC practice to replace "test -f" with "test_path_is_file".
240
- source: <20240304171732.64457-2-vincenzo.mezzela@gmail.com>
207
+ Needs review.
208
+ source: <cover.1710706118.git.ps@pks.im>
209
210
--------------------------------------------------
243
-[New Topics]
211
+[Cooking]
212
213
* bb/iso-strict-utc (2024-03-13) 1 commit
214
(merged to 'next' on 2024-03-14 at d2ac616873)
@@ -277,13 +245,14 @@ Release tarballs are available at:
245
source: <20240313173214.962532-1-gitster@pobox.com>
246
247
280
-* js/bugreport-no-suffix-fix (2024-03-14) 1 commit
281
- - bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
248
+* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
249
+ (merged to 'next' on 2024-03-18 at 180db8ec38)
250
+ + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
251
252
"git bugreport --no-suffix" was not supported and instead
253
segfaulted, which has been corrected.
254
286
- Will merge to 'next'?
255
+ Will merge to 'master'.
256
source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
257
258
@@ -298,13 +267,15 @@ Release tarballs are available at:
267
source: <pull.1686.git.git.1710279251901.gitgitgadget@gmail.com>
268
269
301
-* ph/diff-src-dst-prefix-config (2024-03-15) 1 commit
270
+* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
271
+ - diff.*Prefix: use camelCase in the doc and test titles
272
- diff: add diff.srcPrefix and diff.dstPrefix configuration variables
273
274
"git diff" and friends learned two extra configuration variables.
275
306
- What's the status of this thing?
276
+ Will merge to 'next'.
277
source: <20240315010310.GA1901653@quokka>
278
+ source: <xmqq8r2ioh19.fsf@gitster.g>
279
280
281
* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
@@ -357,11 +328,12 @@ Release tarballs are available at:
328
329
330
* jc/index-pack-fsck-levels (2024-03-15) 1 commit
360
- - t5300: fix test_with_bad_commit()
331
+ (merged to 'next' on 2024-03-18 at 243c5f4125)
332
+ + t5300: fix test_with_bad_commit()
333
334
Test fix.
335
364
- Will merge to 'next'.
336
+ Will merge to 'master'.
337
source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
338
339
@@ -371,6 +343,7 @@ Release tarballs are available at:
343
- format_trailer_info(): append newline for non-trailer lines
344
- format_trailer_info(): drop redundant unfold_value()
345
- format_trailer_info(): use trailer_item objects
346
+ (this branch is used by la/hide-trailer-info.)
347
348
The code to format trailers have been cleaned up.
349
@@ -391,8 +364,6 @@ Release tarballs are available at:
364
cf. <xmqq8r2jp2eq.fsf@gitster.g>
365
source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>
366
394
---------------------------------------------------
395
-[Cooking]
367
368
* jc/safe-implicit-bare (2024-03-11) 1 commit
369
(merged to 'next' on 2024-03-14 at e8bdbed1a4)
@@ -475,9 +446,8 @@ Release tarballs are available at:
446
exchange between the Git itself and its remote helpers did not
447
quite match.
448
478
- What's the conclusion of this one???
479
- cf. <20240312074513.GA47852@coredump.intra.peff.net>
480
- cf. <87ttl99e0b.fsf@gmail.froward.int.ebiederm.org>
449
+ Expecting a reroll.
450
+ cf. <20240318085208.GA604917@coredump.intra.peff.net>
451
source: <20240307084735.GA2072130@coredump.intra.peff.net>
452
453
@@ -529,16 +499,6 @@ Release tarballs are available at:
499
source: <20240312091013.GA95442@coredump.intra.peff.net>
500
501
532
-* jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit
533
- (merged to 'next' on 2024-03-08 at 2cded1c696)
534
- + doc/gitremote-helpers: fix missing single-quote
535
-
536
- Doc mark-up fix.
537
-
538
- Will merge to 'master'.
539
- source: <20240307084313.GA2072022@coredump.intra.peff.net>
540
-
541
-
502
* js/build-fuzz-more-often (2024-03-05) 3 commits
503
- SQUASH???
504
- fuzz: link fuzz programs with `make all` on Linux
@@ -596,28 +556,13 @@ Release tarballs are available at:
556
source: <pull.1682.v2.git.git.1709756493673.gitgitgadget@gmail.com>
557
558
599
-* jh/trace2-missing-def-param-fix (2024-03-07) 3 commits
600
- (merged to 'next' on 2024-03-08 at a797cfea3c)
601
- + trace2: emit 'def_param' set with 'cmd_name' event
602
- + trace2: avoid emitting 'def_param' set more than once
603
- + t0211: demonstrate missing 'def_param' events for certain commands
604
-
605
- Some trace2 events that lacked def_param have learned to show it,
606
- enriching the output.
607
-
608
- Reviewed-by: Josh Steadmon <steadmon@google.com>
609
- cf. <ZejkVOVQBZhLVfHW@google.com>
610
-
611
- Will merge to 'master'.
612
- source: <pull.1679.v2.git.1709824949.gitgitgadget@gmail.com>
613
-
614
-
559
* ps/reftable-stack-tempfile (2024-03-07) 4 commits
560
(merged to 'next' on 2024-03-13 at dcfb0cde8c)
561
+ reftable/stack: register compacted tables as tempfiles
562
+ reftable/stack: register lockfiles during compaction
563
+ reftable/stack: register new tables as tempfiles
564
+ lockfile: report when rollback fails
565
+ (this branch is used by ps/pack-refs-auto.)
566
567
The code in reftable backend that creates new table files works
568
better with the tempfile framework to avoid leaving cruft after a
@@ -658,17 +603,6 @@ Release tarballs are available at:
603
source: <cover.1696021277.git.jonathantanmy@google.com>
604
605
661
-* pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit
662
- (merged to 'next' on 2024-03-08 at e806ee9493)
663
- + rebase -i: stop setting GIT_CHERRY_PICK_HELP
664
-
665
- Code simplification by getting rid of code that sets an environment
666
- variable that is no longer used.
667
-
668
- Will merge to 'master'.
669
- source: <pull.1678.git.1709042783847.gitgitgadget@gmail.com>
670
-
671
-
606
* js/cmake-with-test-tool (2024-02-23) 2 commits
607
- cmake: let `test-tool` run the unit tests, too
608
- Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool