What's cooking (2023/09 #05)
Junio C Hamano committed
Sep 15, 2023 at 16:32 UTC
e9a185d825c60f4de000025ee6bf3fc487c44bf5
1 file changed
+307
-219
whats-cooking.txt
+307
-219
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2023, #04; Tue, 12)
3
-X-master-at: 94e83dcf5b5faaa22e32729305f8fd7090bfdfed
4
-X-next-at: 461bb28fbd1decdee16a6abbeec79832ca32638f
2
+Subject: What's cooking in git.git (Sep 2023, #05; Fri, 15)
3
+X-master-at: bda494f4043963b9ec9a1ecd4b19b7d1cd9a0518
4
+X-next-at: 380fc7ccd1acc85fe06785a0a56d9f99d56dc306
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2023, #04; Tue, 12)
7
+What's cooking in git.git (Sep 2023, #05; Fri, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,16 +45,256 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* ak/pretty-decorate-more (2023-08-21) 8 commits
52
+ (merged to 'next' on 2023-09-07 at 6f5e14cef2)
53
+ + decorate: use commit color for HEAD arrow
54
+ + pretty: add pointer and tag options to %(decorate)
55
+ + pretty: add %(decorate[:<options>]) format
56
+ + decorate: color each token separately
57
+ + decorate: avoid some unnecessary color overhead
58
+ + decorate: refactor format_decorations()
59
+ + pretty-formats: enclose options in angle brackets
60
+ + pretty-formats: define "literal formatting code"
61
+
62
+ "git log --format" has been taught the %(decorate) placeholder.
63
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
64
+
65
+
66
+* bc/more-git-var (2023-09-05) 1 commit
67
+ (merged to 'next' on 2023-09-06 at d8af32874c)
68
+ + var: avoid a segmentation fault when `HOME` is unset
69
+
70
+ Fix-up for a topic that already has graduated.
71
+ source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
72
+
73
+
74
+* ew/hash-with-openssl-evp (2023-08-31) 1 commit
75
+ (merged to 'next' on 2023-09-05 at 1ddc0078c8)
76
+ + treewide: fix various bugs w/ OpenSSL 3+ EVP API
77
+
78
+ Fix-up new-ish code to support OpenSSL EVP API.
79
+ source: <20230901020928.M610756@dcvr>
80
+
81
+
82
+* jk/tree-name-and-depth-limit (2023-08-31) 10 commits
83
+ (merged to 'next' on 2023-09-07 at 7ad767ab0d)
84
+ + lower core.maxTreeDepth default to 2048
85
+ + tree-diff: respect max_allowed_tree_depth
86
+ + list-objects: respect max_allowed_tree_depth
87
+ + read_tree(): respect max_allowed_tree_depth
88
+ + traverse_trees(): respect max_allowed_tree_depth
89
+ + add core.maxTreeDepth config
90
+ + fsck: detect very large tree pathnames
91
+ + tree-walk: rename "error" variable
92
+ + tree-walk: drop MAX_TRAVERSE_TREES macro
93
+ + tree-walk: reduce stack size for recursive functions
94
+
95
+ We now limit depth of the tree objects and maximum length of
96
+ pathnames recorded in tree objects.
97
+ source: <20230831061735.GA2702156@coredump.intra.peff.net>
98
+
99
+
100
+* jk/unused-post-2.42-part2 (2023-09-05) 10 commits
101
+ (merged to 'next' on 2023-09-05 at 308ca3a052)
102
+ + parse-options: mark unused parameters in noop callback
103
+ + interpret-trailers: mark unused "unset" parameters in option callbacks
104
+ + parse-options: add more BUG_ON() annotations
105
+ + merge: do not pass unused opt->value parameter
106
+ + parse-options: mark unused "opt" parameter in callbacks
107
+ + parse-options: prefer opt->value to globals in callbacks
108
+ + checkout-index: delay automatic setting of to_tempfile
109
+ + format-patch: use OPT_STRING_LIST for to/cc options
110
+ + merge: simplify parsing of "-n" option
111
+ + merge: make xopts a strvec
112
+
113
+ Unused parameters to functions are marked as such, and/or removed,
114
+ in order to bring us closer to -Wunused-parameter clean.
115
+ source: <20230831211637.GA949188@coredump.intra.peff.net>
116
+
117
+
118
+* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
119
+ (merged to 'next' on 2023-09-06 at aa4d156366)
120
+ + ref-filter: sort numerically when ":size" is used
121
+
122
+ "git for-each-ref --sort='contents:size'" sorts the refs according
123
+ to size numerically, giving a ref that points at a blob twelve-byte
124
+ (12) long before showing a blob hundred-byte (100) long.
125
+ source: <20230902090155.8978-1-five231003@gmail.com>
126
+
127
+
128
+* ob/revert-of-revert-is-reapply (2023-09-02) 2 commits
129
+ (merged to 'next' on 2023-09-07 at 9a54f66511)
130
+ + git-revert.txt: add discussion
131
+ + sequencer: beautify subject of reverts of reverts
132
+
133
+ The default log message created by "git revert", when reverting a
134
+ commit that records a revert, has been tweaked.
135
+ source: <20230821170720.577850-1-oswald.buddenhagen@gmx.de>
136
+ source: <20230902072035.652549-1-oswald.buddenhagen@gmx.de>
137
+
138
+
139
+* ob/sequencer-reword-error-message (2023-09-05) 1 commit
140
+ (merged to 'next' on 2023-09-06 at c5154b7aa2)
141
+ + sequencer: fix error message on failure to copy SQUASH_MSG
142
+
143
+ Update an error message (which would probably never been seen).
144
+ source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
145
+
146
+
147
+* pw/rebase-i-after-failure (2023-09-06) 7 commits
148
+ (merged to 'next' on 2023-09-07 at 3cbc3c4d63)
149
+ + rebase -i: fix adding failed command to the todo list
150
+ + rebase --continue: refuse to commit after failed command
151
+ + rebase: fix rewritten list for failed pick
152
+ + sequencer: factor out part of pick_commits()
153
+ + sequencer: use rebase_path_message()
154
+ + rebase -i: remove patch file after conflict resolution
155
+ + rebase -i: move unlink() calls
156
+
157
+ Various fixes to the behaviour of "rebase -i" when the command got
158
+ interrupted by conflicting changes.
159
+ cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de>
160
+ source: <pull.1492.v4.git.1694013771.gitgitgadget@gmail.com>
161
+
162
+
163
+* rs/grep-parseopt-simplify (2023-09-05) 1 commit
164
+ (merged to 'next' on 2023-09-06 at 249b69cfd2)
165
+ + grep: use OPT_INTEGER_F for --max-depth
166
+
167
+ Simplify use of parse-options API a bit.
168
+ source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
169
+
170
+
171
+* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
172
+ (merged to 'next' on 2023-09-06 at 9b251a5392)
173
+ + name-rev: use OPT_HIDDEN_BOOL for --peel-tag
174
+
175
+ Simplify use of parse-options API a bit.
176
+ source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
177
+
178
+
179
+* so/diff-doc-for-patch-update (2023-09-06) 1 commit
180
+ (merged to 'next' on 2023-09-07 at 6da5e9defd)
181
+ + doc/diff-options: fix link to generating patch section
182
+
183
+ References from description of the `--patch` option in various
184
+ manual pages have been simplified and improved.
185
+ source: <87msxzpybo.fsf_-_@osv.gnss.ru>
186
+
187
--------------------------------------------------
188
[New Topics]
189
190
+* ob/sequencer-remove-dead-code (2023-09-12) 1 commit
191
+ (merged to 'next' on 2023-09-13 at 1f6c2b336b)
192
+ + sequencer: remove unreachable exit condition in pick_commits()
193
+
194
+ Code clean-up.
195
+
196
+ Will merge to 'master'.
197
+ source: <20230912105541.272917-1-oswald.buddenhagen@gmx.de>
198
+
199
+
200
+* ob/t3404-typofix (2023-09-12) 1 commit
201
+ (merged to 'next' on 2023-09-13 at b17fa78c3f)
202
+ + t3404-rebase-interactive.sh: fix typos in title of a rewording test
203
+
204
+ Code clean-up.
205
+
206
+ Will merge to 'master'.
207
+ source: <20230912104237.271616-1-oswald.buddenhagen@gmx.de>
208
+
209
+
210
+* jk/ort-unused-parameter-cleanups (2023-09-14) 4 commits
211
+ - merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
212
+ - merge-ort: drop unused parameters from detect_and_process_renames()
213
+ - merge-ort: stop passing "opt" to read_oid_strbuf()
214
+ - merge-ort: drop custom err() function
215
+
216
+ Code clean-up.
217
+
218
+ Needs review.
219
+ source: <20230914093409.GA2254811@coredump.intra.peff.net>
220
+
221
+
222
+* jc/fake-lstat (2023-09-14) 1 commit
223
+ - cache: add fake_lstat()
224
+
225
+ A new helper to let us pretend that we called lstat() when we know
226
+ our cache_entry is up-to-date via fsmonitor.
227
+
228
+ Needs review.
229
+ source: <xmqqcyykig1l.fsf@gitster.g>
230
+
231
+
232
+* jk/redact-h2h3-headers-fix (2023-09-15) 2 commits
233
+ - http: update curl http/2 info matching for curl 8.3.0
234
+ - http: factor out matching of curl http/2 trace lines
235
+
236
+ HTTP Header redaction code has been adjusted for a newer version of
237
+ cURL library that shows its traces differently from earlier
238
+ versions.
239
+
240
+ Will merge to 'next'.
241
+ source: <20230915113237.GA3531328@coredump.intra.peff.net>
242
+
243
+
244
+* ch/clean-docfix (2023-09-15) 1 commit
245
+ - git-clean doc: fix "without do cleaning" typo
246
+
247
+ Typofix.
248
+
249
+ Will merge to 'next'.
250
+ source: <pull.1572.git.git.1694800409471.gitgitgadget@gmail.com>
251
+
252
+
253
+* eg/config-type-path-docfix (2023-09-15) 1 commit
254
+ - git-config: fix misworded --type=path explanation
255
+
256
+ Typofix.
257
+
258
+ Will merge to 'next'.
259
+ source: <20230915202610.21206-1-evan.gates@gmail.com>
260
+
261
+
262
+* kn/rev-list-ignore-missing-links (2023-09-15) 1 commit
263
+ - revision: add `--ignore-missing-links` user option
264
+
265
+ Surface the .ignore_missing_links bit that stops the revision
266
+ traversal from stopping and dying when encountering a missing
267
+ object to a new command line option of "git rev-list", so that the
268
+ objects that are required but are missing can be enumerated.
269
+
270
+ Waiting for review response.
271
+ source: <20230915083415.263187-1-knayak@gitlab.com>
272
+
273
+--------------------------------------------------
274
+[Stalled]
275
+
276
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
277
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
278
+
279
+ "git cherry-pick A" that replays a single commit stopped before
280
+ clobbering local modification, but "git cherry-pick A..B" did not,
281
+ which has been corrected.
282
+
283
+ Expecting a reroll.
284
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
285
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
286
+
287
+--------------------------------------------------
288
+[Cooking]
289
+
290
* js/systemd-timers-wsl-fix (2023-09-11) 1 commit
52
- - maintenance(systemd): support the Windows Subsystem for Linux
291
+ (merged to 'next' on 2023-09-12 at 71c4cbb1df)
292
+ + maintenance(systemd): support the Windows Subsystem for Linux
293
294
Update "git maintainance" timers' implementation based on systemd
295
timers to work with WSL.
296
57
- Will merge to 'next'.
297
+ Will merge to 'master'.
298
source: <pull.1586.git.1694334620260.gitgitgadget@gmail.com>
299
300
@@ -63,16 +303,20 @@ Release tarballs are available at:
303
304
"git range-diff --notes=foo" compared "log --notes=foo --notes" of
305
the two ranges, instead of using just the specified notes tree.
306
+
307
+ Expecting a reroll.
308
+ cf. <dd2958c5-58bf-86dd-b666-9033259a8e1a@gmx.de>
309
source: <a37dfb3748e23b4f5081bc9a3c80a5c546101f1d.1694383248.git.code@khaugsbakk.name>
310
311
312
* pw/diff-no-index-from-named-pipes (2023-09-11) 1 commit
70
- - diff --no-index: fix -R with stdin
313
+ (merged to 'next' on 2023-09-12 at 135ecd136f)
314
+ + diff --no-index: fix -R with stdin
315
316
"git diff --no-index -R <(one) <(two)" did not work correctly,
317
which has been corrected.
318
75
- Will merge to 'next'.
319
+ Will merge to 'master'.
320
source: <22fdfa3b-f90e-afcc-667c-705fb7670245@web.de>
321
322
@@ -82,6 +326,8 @@ Release tarballs are available at:
326
327
A bit of type safety for the "value" pointer used in the
328
parse-options API.
329
+
330
+ What's the status of this one?
331
source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>
332
333
@@ -91,46 +337,34 @@ Release tarballs are available at:
337
338
Teach a new "-d" option that shows the patch against the first
339
parent for merge commits (which is "--diff-merges=first-parent -p").
340
+
341
+ Needs more work.
342
source: <20230909125446.142715-1-sorganov@gmail.com>
343
344
345
* js/diff-cached-fsmonitor-fix (2023-09-11) 1 commit
98
- - diff-lib: fix check_removed when fsmonitor is on
346
+ (merged to 'next' on 2023-09-12 at 7479278da0)
347
+ + diff-lib: fix check_removed when fsmonitor is on
348
349
"git diff --cached" codepath did not fill the necessary stat
350
information for a file when fsmonitor knows it is clean and ended
351
up behaving as if it is not clean, which has been corrected.
352
104
- Will merge to 'next'.
353
+ Will merge to 'master'.
354
source: <20230911170901.49050-2-sokcevic@google.com>
355
356
108
-* pb/completion-aliases-doc (2023-09-11) 1 commit
109
- - completion: improve doc for complex aliases
357
+* pb/completion-aliases-doc (2023-09-12) 1 commit
358
+ (merged to 'next' on 2023-09-13 at b248a5bc26)
359
+ + completion: improve doc for complex aliases
360
361
Clarify how "alias.foo = : git cmd ; aliased-command-string" should
362
be spelled with necessary whitespaces around punctuation marks to
363
work.
364
115
- Will merge to 'next'.
116
- source: <pull.1585.git.1694274592854.gitgitgadget@gmail.com>
117
-
118
---------------------------------------------------
119
-[Stalled]
120
-
121
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
122
- - cherry-pick: refuse cherry-pick sequence if index is dirty
123
-
124
- "git cherry-pick A" that replays a single commit stopped before
125
- clobbering local modification, but "git cherry-pick A..B" did not,
126
- which has been corrected.
127
-
128
- Expecting a reroll.
129
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
130
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
365
+ Will merge to 'master'.
366
+ source: <pull.1585.v2.git.1694538135853.gitgitgadget@gmail.com>
367
132
---------------------------------------------------
133
-[Cooking]
368
369
* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-11) 9 commits
370
. gc: add `gc.repackFilterTo` config option
@@ -151,48 +385,41 @@ Release tarballs are available at:
385
386
387
* la/trailer-cleanups (2023-09-11) 6 commits
154
- - trailer: use offsets for trailer_start/trailer_end
155
- - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
156
- - trailer: teach find_patch_start about --no-divider
157
- - trailer: split process_command_line_args into separate functions
158
- - trailer: split process_input_file into separate pieces
159
- - trailer: separate public from internal portion of trailer_iterator
388
+ (merged to 'next' on 2023-09-12 at 779c4a097a)
389
+ + trailer: use offsets for trailer_start/trailer_end
390
+ + trailer: rename *_DEFAULT enums to *_UNSPECIFIED
391
+ + trailer: teach find_patch_start about --no-divider
392
+ + trailer: split process_command_line_args into separate functions
393
+ + trailer: split process_input_file into separate pieces
394
+ + trailer: separate public from internal portion of trailer_iterator
395
396
Code clean-up.
397
163
- Will merge to 'next'.
164
- source: <pull.1563.v2.git.1694240177.gitgitgadget@gmail.com>
165
-
166
-
167
-* so/diff-doc-for-patch-update (2023-09-06) 1 commit
168
- (merged to 'next' on 2023-09-07 at 6da5e9defd)
169
- + doc/diff-options: fix link to generating patch section
170
-
171
- References from description of the `--patch` option in various
172
- manual pages have been simplified and improved.
173
-
398
Will merge to 'master'.
175
- source: <87msxzpybo.fsf_-_@osv.gnss.ru>
399
+ source: <pull.1563.v2.git.1694240177.gitgitgadget@gmail.com>
400
401
178
-* tb/repack-existing-packs-cleanup (2023-09-06) 8 commits
179
- - builtin/repack.c: extract common cruft pack loop
180
- - builtin/repack.c: drop `DELETE_PACK` macro
181
- - builtin/repack.c: store existing cruft packs separately
182
- - builtin/repack.c: extract `has_existing_non_kept_packs()`
183
- - builtin/repack.c: extract redundant pack cleanup for existing packs
184
- - builtin/repack.c: extract redundant pack cleanup for --geometric
185
- - builtin/repack.c: extract marking packs for deletion
186
- - builtin/repack.c: extract structure to store existing packs
402
+* tb/repack-existing-packs-cleanup (2023-09-13) 8 commits
403
+ (merged to 'next' on 2023-09-14 at bb8065e89c)
404
+ + builtin/repack.c: extract common cruft pack loop
405
+ + builtin/repack.c: avoid directly inspecting "util"
406
+ + builtin/repack.c: store existing cruft packs separately
407
+ + builtin/repack.c: extract `has_existing_non_kept_packs()`
408
+ + builtin/repack.c: extract redundant pack cleanup for existing packs
409
+ + builtin/repack.c: extract redundant pack cleanup for --geometric
410
+ + builtin/repack.c: extract marking packs for deletion
411
+ + builtin/repack.c: extract structure to store existing packs
412
413
The code to keep track of existing packs in the repository while
414
repacking has been refactored.
415
191
- Will merge to 'next'?
192
- source: <cover.1693946195.git.me@ttaylorr.com>
416
+ Will merge to 'master'.
417
+ source: <cover.1694632644.git.me@ttaylorr.com>
418
419
195
-* pb/complete-commit-trailers (2023-09-07) 1 commit
420
+* pb/complete-commit-trailers (2023-09-12) 2 commits
421
+ (merged to 'next' on 2023-09-13 at 9a0ec17606)
422
+ + completion: commit: complete trailers tokens more robustly
423
(merged to 'next' on 2023-09-08 at 842587016d)
424
+ completion: commit: complete configured trailer tokens
425
@@ -200,7 +427,7 @@ Release tarballs are available at:
427
complete "git commit --trailer=" for possible trailer keys.
428
429
Will merge to 'master'.
203
- source: <pull.1583.git.1694108551683.gitgitgadget@gmail.com>
430
+ source: <pull.1583.v2.git.1694539827.gitgitgadget@gmail.com>
431
432
433
* pw/rebase-sigint (2023-09-07) 1 commit
@@ -213,7 +440,8 @@ Release tarballs are available at:
440
user intended. "git" learned to ignore SIGINT and SIGQUIT while
441
waiting for these subprocesses.
442
216
- Will merge to 'next'?
443
+ Expecting a reroll.
444
+ cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
445
source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
446
447
@@ -253,6 +481,7 @@ Release tarballs are available at:
481
482
Needs more work.
483
cf. <xmqqy1hfrk6p.fsf@gitster.g>
484
+ cf. <20230915183927.1597414-1-jonathantanmy@google.com>
485
source: <20230908174134.1026823-1-calvinwan@google.com>
486
487
@@ -273,6 +502,11 @@ Release tarballs are available at:
502
- replay: introduce new builtin
503
- t6429: remove switching aspects of fast-rebase
504
505
+ Waiting for review response.
506
+ cf. <52277471-4ddd-b2e0-62ca-c2a5b59ae418@gmx.de>
507
+ cf. <58daa706-7efb-51dd-9061-202ef650b96a@gmx.de>
508
+ cf. <f0e75d47-c277-9fbb-7bcd-53e4e5686f3c@gmx.de>
509
+ May want to wait until tb/repack-existing-packs-cleanup stabilizes.
510
source: <20230907092521.733746-1-christian.couder@gmail.com>
511
512
@@ -295,115 +529,6 @@ Release tarballs are available at:
529
source: <pull.1564.v3.git.1694125209.gitgitgadget@gmail.com>
530
531
298
-* ak/pretty-decorate-more (2023-08-21) 8 commits
299
- (merged to 'next' on 2023-09-07 at 6f5e14cef2)
300
- + decorate: use commit color for HEAD arrow
301
- + pretty: add pointer and tag options to %(decorate)
302
- + pretty: add %(decorate[:<options>]) format
303
- + decorate: color each token separately
304
- + decorate: avoid some unnecessary color overhead
305
- + decorate: refactor format_decorations()
306
- + pretty-formats: enclose options in angle brackets
307
- + pretty-formats: define "literal formatting code"
308
-
309
- "git log --format" has been taught the %(decorate) placeholder.
310
-
311
- Will merge to 'master'.
312
- source: <20230820185009.20095-1-andy.koppe@gmail.com>
313
-
314
-
315
-* bc/more-git-var (2023-09-05) 1 commit
316
- (merged to 'next' on 2023-09-06 at d8af32874c)
317
- + var: avoid a segmentation fault when `HOME` is unset
318
-
319
- Fix-up for a topic that already has graduated.
320
-
321
- Will merge to 'master'.
322
- source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
323
-
324
-
325
-* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
326
- (merged to 'next' on 2023-09-06 at aa4d156366)
327
- + ref-filter: sort numerically when ":size" is used
328
-
329
- "git for-each-ref --sort='contents:size'" sorts the refs according
330
- to size numerically, giving a ref that points at a blob twelve-byte
331
- (12) long before showing a blob hundred-byte (100) long.
332
-
333
- Will merge to 'master'.
334
- source: <20230902090155.8978-1-five231003@gmail.com>
335
-
336
-
337
-* ob/sequencer-reword-error-message (2023-09-05) 1 commit
338
- (merged to 'next' on 2023-09-06 at c5154b7aa2)
339
- + sequencer: fix error message on failure to copy SQUASH_MSG
340
-
341
- Update an error message (which would probably never been seen).
342
-
343
- Will merge to 'master'.
344
- source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
345
-
346
-
347
-* rs/grep-parseopt-simplify (2023-09-05) 1 commit
348
- (merged to 'next' on 2023-09-06 at 249b69cfd2)
349
- + grep: use OPT_INTEGER_F for --max-depth
350
-
351
- Simplify use of parse-options API a bit.
352
-
353
- Will merge to 'master'.
354
- source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
355
-
356
-
357
-* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
358
- (merged to 'next' on 2023-09-06 at 9b251a5392)
359
- + name-rev: use OPT_HIDDEN_BOOL for --peel-tag
360
-
361
- Simplify use of parse-options API a bit.
362
-
363
- Will merge to 'master'.
364
- source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
365
-
366
-
367
-* jk/unused-post-2.42-part2 (2023-09-05) 10 commits
368
- (merged to 'next' on 2023-09-05 at 308ca3a052)
369
- + parse-options: mark unused parameters in noop callback
370
- + interpret-trailers: mark unused "unset" parameters in option callbacks
371
- + parse-options: add more BUG_ON() annotations
372
- + merge: do not pass unused opt->value parameter
373
- + parse-options: mark unused "opt" parameter in callbacks
374
- + parse-options: prefer opt->value to globals in callbacks
375
- + checkout-index: delay automatic setting of to_tempfile
376
- + format-patch: use OPT_STRING_LIST for to/cc options
377
- + merge: simplify parsing of "-n" option
378
- + merge: make xopts a strvec
379
-
380
- Unused parameters to functions are marked as such, and/or removed,
381
- in order to bring us closer to -Wunused-parameter clean.
382
-
383
- Will merge to 'master'.
384
- source: <20230831211637.GA949188@coredump.intra.peff.net>
385
-
386
-
387
-* jk/tree-name-and-depth-limit (2023-08-31) 10 commits
388
- (merged to 'next' on 2023-09-07 at 7ad767ab0d)
389
- + lower core.maxTreeDepth default to 2048
390
- + tree-diff: respect max_allowed_tree_depth
391
- + list-objects: respect max_allowed_tree_depth
392
- + read_tree(): respect max_allowed_tree_depth
393
- + traverse_trees(): respect max_allowed_tree_depth
394
- + add core.maxTreeDepth config
395
- + fsck: detect very large tree pathnames
396
- + tree-walk: rename "error" variable
397
- + tree-walk: drop MAX_TRAVERSE_TREES macro
398
- + tree-walk: reduce stack size for recursive functions
399
-
400
- We now limit depth of the tree objects and maximum length of
401
- pathnames recorded in tree objects.
402
-
403
- Will merge to 'master'.
404
- source: <20230831061735.GA2702156@coredump.intra.peff.net>
405
-
406
-
532
* js/doc-unit-tests (2023-08-17) 3 commits
533
- ci: run unit tests in CI
534
- unit tests: add TAP unit test framework
@@ -412,7 +537,8 @@ Release tarballs are available at:
537
538
Process to add some form of low-level unit tests has started.
539
415
- Comments?
540
+ Waiting for review response.
541
+ cf. <xmqq350hw6n7.fsf@gitster.g>
542
source: <cover.1692297001.git.steadmon@google.com>
543
544
@@ -424,17 +550,9 @@ Release tarballs are available at:
550
(this branch uses js/doc-unit-tests.)
551
552
Update the base topic to work with CMake builds.
427
- source: <pull.1579.git.1693462532.gitgitgadget@gmail.com>
553
429
-
430
-* ew/hash-with-openssl-evp (2023-08-31) 1 commit
431
- (merged to 'next' on 2023-09-05 at 1ddc0078c8)
432
- + treewide: fix various bugs w/ OpenSSL 3+ EVP API
433
-
434
- Fix-up new-ish code to support OpenSSL EVP API.
435
-
436
- Will merge to 'master'.
437
- source: <20230901020928.M610756@dcvr>
554
+ Waiting for the base topic to settle.
555
+ source: <pull.1579.git.1693462532.gitgitgadget@gmail.com>
556
557
558
* tb/path-filter-fix (2023-08-30) 15 commits
@@ -458,7 +576,7 @@ Release tarballs are available at:
576
on systems whose "char" is unsigned; update the implementation and
577
bump the format version to 2.
578
461
- Needs more work?
579
+ Needs more work.
580
cf. <20230830200218.GA5147@szeder.dev>
581
source: <cover.1693413637.git.jonathantanmy@google.com>
582
@@ -476,29 +594,17 @@ Release tarballs are available at:
594
source: <cover.1692827403.git.steadmon@google.com>
595
596
479
-* jc/update-index-show-index-version (2023-08-18) 3 commits
480
- - test-tool: retire "index-version"
481
- - update-index: add --show-index-version
482
- - update-index doc: v4 is OK with JGit and libgit2
597
+* jc/update-index-show-index-version (2023-09-12) 3 commits
598
+ (merged to 'next' on 2023-09-13 at b754554df8)
599
+ + test-tool: retire "index-version"
600
+ + update-index: add --show-index-version
601
+ + update-index doc: v4 is OK with JGit and libgit2
602
603
"git update-index" learns "--show-index-version" to inspect
604
the index format version used by the on-disk index file.
605
487
- Needs review.
488
- source: <20230818233729.2766281-1-gitster@pobox.com>
489
-
490
-
491
-* ob/revert-of-revert-is-reapply (2023-09-02) 2 commits
492
- (merged to 'next' on 2023-09-07 at 9a54f66511)
493
- + git-revert.txt: add discussion
494
- + sequencer: beautify subject of reverts of reverts
495
-
496
- The default log message created by "git revert", when reverting a
497
- commit that records a revert, has been tweaked.
498
-
606
Will merge to 'master'.
500
- source: <20230821170720.577850-1-oswald.buddenhagen@gmx.de>
501
- source: <20230902072035.652549-1-oswald.buddenhagen@gmx.de>
607
+ source: <20230912193235.776292-1-gitster@pobox.com>
608
609
610
* jc/rerere-cleanup (2023-08-25) 4 commits
@@ -514,24 +620,6 @@ Release tarballs are available at:
620
source: <20230731224409.4181277-1-gitster@pobox.com>
621
622
517
-* pw/rebase-i-after-failure (2023-09-06) 7 commits
518
- (merged to 'next' on 2023-09-07 at 3cbc3c4d63)
519
- + rebase -i: fix adding failed command to the todo list
520
- + rebase --continue: refuse to commit after failed command
521
- + rebase: fix rewritten list for failed pick
522
- + sequencer: factor out part of pick_commits()
523
- + sequencer: use rebase_path_message()
524
- + rebase -i: remove patch file after conflict resolution
525
- + rebase -i: move unlink() calls
526
-
527
- Various fixes to the behaviour of "rebase -i" when the command got
528
- interrupted by conflicting changes.
529
-
530
- Will merge to 'master'.
531
- cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de>
532
- source: <pull.1492.v4.git.1694013771.gitgitgadget@gmail.com>
533
-
534
-
623
* jc/unresolve-removal (2023-07-31) 7 commits
624
- checkout: allow "checkout -m path" to unmerge removed paths
625
- checkout/restore: add basic tests for --merge