What's cooking (2023/04 #06)
Junio C Hamano committed
Apr 20, 2023 at 15:17 UTC
731da1602c85ca13e7bc9287589af41f6861ee07
1 file changed
+339
-277
whats-cooking.txt
+339
-277
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #05; Mon, 17)
3
-X-master-at: 667fcf4e15379790f0b609d6a83d578e69f20301
4
-X-next-at: b7802c66730735cf148f99daaa090bc171a7f8cd
2
+Subject: What's cooking in git.git (Apr 2023, #06; Thu, 20)
3
+X-master-at: 9c6990cca24301ae8f82bf6291049667a0aef14b
4
+X-next-at: bd7f14d9353b7ce9acf82b32f80f585373a5ebe3
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #05; Mon, 17)
7
+What's cooking in git.git (Apr 2023, #06; Thu, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -47,95 +47,221 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
50
-* cm/branch-delete-error-message-update (2023-04-06) 1 commit
51
- (merged to 'next' on 2023-04-10 at 09c987c822)
52
- + branch: improve error log on branch not found by checking remotes refs
50
+* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
51
+ (merged to 'next' on 2023-04-13 at a35a043d6c)
52
+ + t2024: fix loose/strict local base branch DWIM test
53
54
- "git branch -d origin/master" would say "no such branch", but it is
55
- likely a missed "-r" if refs/remotes/origin/master exists. The
56
- command has been taught to give such a hint in its error message.
57
- source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
54
+ Test fix.
55
+ source: <20230408205450.569548-1-rybak.a.v@gmail.com>
56
57
60
-* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
61
- (merged to 'next' on 2023-04-10 at f08eab44f2)
62
- + doc: asciidoc: remove custom header macro
63
- (this branch is used by fc/doc-use-datestamp-in-commit.)
58
+* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
59
+ (merged to 'next' on 2023-04-13 at fff15efe05)
60
+ + clone: error specifically with --local and symlinked objects
61
65
- Doc toolchain update to remove old workaround for AsciiDoc.
66
- source: <20230323221523.52472-1-felipe.contreras@gmail.com>
62
+ "git clone --local" stops copying from an original repository that
63
+ has symbolic links inside its $GIT_DIR; an error message when that
64
+ happens has been updated.
65
+ source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
66
67
69
-* la/mfc-markup-fix (2023-04-06) 1 commit
70
- (merged to 'next' on 2023-04-10 at 05415e1c90)
71
- + MyFirstContribution: render literal *
68
+* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
69
+ (merged to 'next' on 2023-04-13 at ad62b4545a)
70
+ + get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
71
73
- Documentation mark-up fix.
74
- source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
72
+ Code clean-up to replace a hardcoded constant with a CPP macro.
73
+ source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
74
75
77
-* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-10) 5 commits
78
- (merged to 'next' on 2023-04-11 at a3b1fd5ec7)
79
- + rebase: remove a couple of redundant strategy tests
80
- + rebase -m: fix serialization of strategy options
81
- + rebase -m: cleanup --strategy-option handling
82
- + sequencer: use struct strvec to store merge strategy options
83
- + rebase: stop reading and writing unnecessary strategy state
76
+* rs/remove-approxidate-relative (2023-04-10) 1 commit
77
+ (merged to 'next' on 2023-04-13 at bd7df5f98c)
78
+ + date: remove approxidate_relative()
79
85
- Clean-up of the code path that deals with merge strategy option
86
- handling in "git rebase".
87
- source: <cover.1681117706.git.phillip.wood@dunelm.org.uk>
80
+ The approxidate() API has been simplified by losing an extra
81
+ function that did the same thing as another one.
82
+ source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
83
84
90
-* sl/sparse-write-tree (2023-04-04) 1 commit
91
- (merged to 'next' on 2023-04-10 at 0cd39c23b1)
92
- + write-tree: integrate with sparse index
85
+* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
86
+ (merged to 'next' on 2023-04-13 at 348908c03c)
87
+ + userdiff: support regexec(3) with multi-byte support
88
94
- "git write-tree" learns to work better with sparse-index.
95
- source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
89
+ The userdiff regexp patterns for various filetypes that are built
90
+ into the system have been updated to avoid triggering regexp errors
91
+ from UTF-8 aware regex engines.
92
+ source: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
93
94
+--------------------------------------------------
95
+[New Topics]
96
98
-* tk/mergetool-gui-default-config (2023-04-05) 1 commit
99
- (merged to 'next' on 2023-04-10 at 228432526c)
100
- + mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
97
+* ar/config-count-tests-updates (2023-04-18) 4 commits
98
+ - SQUASH???
99
+ - t1300: add tests for missing keys
100
+ - t1300: check stderr for "ignores pairs" tests
101
+ - t1300: drop duplicate test
102
102
- "git mergetool" and "git difftool" learns a new configuration
103
- guiDefault to optionally favor configured guitool over non-gui-tool
104
- automatically when $DISPLAY is set.
105
- source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
103
+ Test updates.
104
107
---------------------------------------------------
108
-[New Topics]
105
+ Expecting a reroll.
106
+ source: <20230418175034.982433-1-rybak.a.v@gmail.com>
107
+
108
+
109
+* en/header-split-cache-h-part-2 (2023-04-18) 23 commits
110
+ - reftable: ensure git-compat-util.h is the first (indirect) include
111
+ - diff.h: reduce unnecessary includes
112
+ - object-store.h: reduce unnecessary includes
113
+ - commit.h: reduce unnecessary includes
114
+ - fsmonitor: reduce includes of cache.h
115
+ - cache.h: remove unnecessary headers
116
+ - treewide: remove cache.h inclusion due to previous changes
117
+ - cache,tree: move basic name compare functions from read-cache to tree
118
+ - cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
119
+ - hash.h, repository.h: reverse the order of these dependencies
120
+ - tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
121
+ - dir.h: move DTYPE defines from cache.h
122
+ - versioncmp.h: move declarations for versioncmp.c functions from cache.h
123
+ - ws.h: move declarations for ws.c functions from cache.h
124
+ - match-trees.h: move declarations for match-trees.c functions from cache.h
125
+ - pkt-line.h: move declarations for pkt-line.c functions from cache.h
126
+ - base85.h: move declarations for base85.c functions from cache.h
127
+ - copy.h: move declarations for copy.c functions from cache.h
128
+ - server-info.h: move declarations for server-info.c functions from cache.h
129
+ - packfile.h: move pack_window and pack_entry from cache.h
130
+ - symlinks.h: move declarations for symlinks.c functions from cache.h
131
+ - treewide: be explicit about dependence on strbuf.h
132
+ - Merge branch 'en/header-split-cache-h' into en/header-split-cache-h-part-2
133
+ (this branch uses en/header-split-cache-h.)
134
+
135
+ More header clean-up.
136
110
-* ds/fsck-pack-revindex (2023-04-17) 5 commits
111
- - fsck: validate .rev file header
112
- - fsck: check rev-index position values
113
- - fsck: check rev-index checksums
114
- - fsck: create scaffolding for rev-index checks
115
- - Merge branch 'tb/pack-revindex-on-disk' into ds/fsck-pack-revindex
116
- (this branch uses tb/pack-revindex-on-disk.)
137
+ Will merge to 'next'?
138
+ source: <pull.1517.git.1681614205.gitgitgadget@gmail.com>
139
118
- "git fsck" learned to validate the on-disk pack reverse index files.
119
- source: <pull.1512.git.1681748502.gitgitgadget@gmail.com>
140
141
+* fc/doc-checkout-markup-updates (2023-04-18) 2 commits
142
+ (merged to 'next' on 2023-04-20 at 62782d75c4)
143
+ + doc: git-checkout: reorganize examples
144
+ + doc: git-checkout: trivial callout cleanup
145
122
-* tb/enable-cruft-packs-by-default (2023-04-17) 10 commits
123
- - repository.h: drop unused `gc_cruft_packs`
124
- - builtin/gc.c: make `gc.cruftPacks` enabled by default
125
- - t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
126
- - t/t6500-gc.sh: add additional test cases
127
- - t/t6500-gc.sh: refactor cruft pack tests
128
- - t/t9300-fast-import.sh: prepare for `gc --cruft` by default
129
- - t/t5304-prune.sh: prepare for `gc --cruft` by default
130
- - builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
131
- - builtin/repack.c: fix incorrect reference to '-C'
132
- - pack-write.c: plug a leak in stage_tmp_packfiles()
146
+ Doc mark-up update.
147
+
148
+ Will merge to 'master'.
149
+ source: <20230418070048.2209469-1-felipe.contreras@gmail.com>
150
+
151
+
152
+* jk/gpg-trust-level-fix (2023-04-19) 1 commit
153
+ - gpg-interface: set trust level of missing key to "undefined"
154
+
155
+ The "%GT" placeholder for the "--format" option of "git log" and
156
+ friends caused BUG() to trigger on a commit signed with an unknown
157
+ key, which has been corrected.
158
+
159
+ Will merge to 'next'.
160
+ source: <20230419012957.GA503941@coredump.intra.peff.net>
161
+
162
+
163
+* ps/fetch-output-format (2023-04-19) 8 commits
164
+ - fetch: introduce machine-parseable "porcelain" output format
165
+ - fetch: introduce new `--output-format` option
166
+ - fetch: move option related variables into main function
167
+ - fetch: move display format parsing into main function
168
+ - fetch: introduce `display_format` enum
169
+ - fetch: fix missing from-reference when fetching HEAD:foo
170
+ - fetch: add a test to exercise invalid output formats
171
+ - fetch: split out tests for output format
172
+
173
+ "git fetch" learned the "--output-format" option that emits what it
174
+ did in a machine-parseable format.
175
+
176
+ Needs review.
177
+ source: <cover.1681906948.git.ps@pks.im>
178
134
- source: <cover.1681764848.git.me@ttaylorr.com>
179
+
180
+* en/ort-finalize-after-0-merges-fix (2023-04-20) 2 commits
181
+ - SQUASH??? futureproofing suggestion by Derrick
182
+ - merge-ort: fix calling merge_finalize() with no intermediate merge
183
+
184
+ source: <pull.1518.git.1681974847078.gitgitgadget@gmail.com>
185
+
186
+
187
+* ma/gittutorial-fixes (2023-04-20) 2 commits
188
+ - gittutorial: wrap literal examples in backticks
189
+ - gittutorial: drop early mention of origin
190
+
191
+ source: <cover.1681579244.git.martin.agren@gmail.com>
192
+
193
+
194
+* sg/retire-unused-cocci (2023-04-20) 1 commit
195
+ - cocci: remove 'unused.cocci'
196
+
197
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
198
199
--------------------------------------------------
200
[Stalled]
201
202
+* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
203
+ - pack-bitmap.c: factor out `bitmap_index_seek_commit()`
204
+ - pack-bitmap.c: use `bitmap_index_seek()` where possible
205
+ - pack-bitmap.c: factor out manual `map_pos` manipulation
206
+ - pack-bitmap.c: drop unnecessary 'inline's
207
+ - pack-bitmap.c: hide bitmap internals in `read_be32()`
208
+ - pack-bitmap.c: hide bitmap internals in `read_u8()`
209
+
210
+ Clean-up the pack-bitmap codepath.
211
+
212
+ Kicked back to 'seen' out of 'next'.
213
+ There is a BUG() on data errors that needs to be fixed.
214
+ source: <cover.1679342296.git.me@ttaylorr.com>
215
+
216
+
217
+* mh/use-wincred-from-system (2023-03-27) 1 commit
218
+ - credential/wincred: include wincred.h
219
+
220
+ Code clean-up.
221
+
222
+ May want to discard.
223
+ Area maintainer is fairly negative.
224
+ cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
225
+ source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
226
+
227
+
228
+* cb/checkout-same-branch-twice (2023-03-22) 2 commits
229
+ - SQUASH??? the test marked to expect failure passes from day one
230
+ - checkout/switch: disallow checking out same branch in multiple worktrees
231
+
232
+ "git checkout -B $branch" failed to protect against checking out
233
+ a branch that is checked out elsewhere, unlike "git branch -f" did.
234
+
235
+ Expecting a hopefully minor and final reroll.
236
+ cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
237
+ source: <20230120113553.24655-1-carenas@gmail.com>
238
+
239
+
240
+* ob/revert-of-revert (2023-03-28) 1 commit
241
+ - sequencer: call a revert of a revert "reapply"
242
+
243
+ Instead of "Revert "Revert "original"", give "Replay "original""
244
+ as the title for a revert of a revert.
245
+
246
+ Needs more polishing: docs, tests, transitions.
247
+ source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
248
+
249
+
250
+* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
251
+ - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
252
+
253
+ In an advice message after failed non-ff pull, we used to suggest
254
+ setting pull.rebase=true, but these days pull.rebase=merges may be
255
+ more inline with the original spirit of "rebuild your side on top
256
+ of theirs".
257
+
258
+ May want to discard.
259
+ This is too much of a departure from the existing practice.
260
+ cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
261
+ cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
262
+ source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
263
+
264
+
265
* tl/notes-separator (2023-03-28) 4 commits
266
. notes.c: don't do stripespace when parse file arg
267
. notes.c: introduce '--separator=<paragraph-break>' option
@@ -186,12 +312,106 @@ Release tarballs are available at:
312
313
Assorted updates to "--diff-merges=X" option.
314
189
- May want to discard. Breaking compatibility does not seem worth it.
315
+ May want to discard.
316
+ Breaking compatibility does not seem worth it.
317
source: <20221217132955.108542-1-sorganov@gmail.com>
318
319
+
320
+* ab/imap-send-requires-curl (2023-02-02) 6 commits
321
+ - imap-send: correctly report "host" when using "tunnel"
322
+ - imap-send: remove old --no-curl codepath
323
+ - imap-send: make --curl no-optional
324
+ - imap-send: replace auto-probe libcurl with hard dependency
325
+ - imap-send doc: the imap.sslVerify is used with imap.tunnel
326
+ - imap-send: note "auth_method", not "host" on auth method failure
327
+
328
+ Give a hard dependency on cURL library to build "git imap-send",
329
+ and remove the code to interact with IMAP server without using cURL.
330
+
331
+ Expecting a reroll.
332
+ The 'tunnel' part is still iffy.
333
+ cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
334
+ source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
335
+
336
+
337
+* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
338
+ . cat-file: quote-format name in error when using -z
339
+ . cat-file: extract printing batch error message into function
340
+
341
+ "cat-file" in the batch mode that is fed NUL-terminated pathnames
342
+ learned to cquote them in its error output (otherwise, a funny
343
+ pathname with LF in it would break the lines in the output stream).
344
+
345
+ Breaks "cat-file --batch-all-objects --batch-check".
346
+ cf. <xmqqilfhctrr.fsf@gitster.g>
347
+ source: <20230303191708.77894-1-toon@iotcl.com>
348
+
349
+
350
+* cw/submodule-status-in-parallel (2023-03-02) 6 commits
351
+ - diff-lib: parallelize run_diff_files for submodules
352
+ - diff-lib: refactor out diff_change logic
353
+ - submodule: refactor is_submodule_modified()
354
+ - submodule: move status parsing into function
355
+ - submodule: rename strbuf variable
356
+ - run-command: add on_stderr_output_fn to run_processes_parallel_opts
357
+
358
+ "git submodule status" learned to run the comparison in submodule
359
+ repositories in parallel.
360
+
361
+ Expecting a reroll.
362
+ cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
363
+ cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
364
+ source: <20230302215237.1473444-1-calvinwan@google.com>
365
+
366
--------------------------------------------------
367
[Cooking]
368
369
+* ds/fsck-pack-revindex (2023-04-17) 5 commits
370
+ (merged to 'next' on 2023-04-19 at 6fb9527bf5)
371
+ + fsck: validate .rev file header
372
+ + fsck: check rev-index position values
373
+ + fsck: check rev-index checksums
374
+ + fsck: create scaffolding for rev-index checks
375
+ + Merge branch 'tb/pack-revindex-on-disk' into ds/fsck-pack-revindex
376
+ (this branch uses tb/pack-revindex-on-disk.)
377
+
378
+ "git fsck" learned to validate the on-disk pack reverse index files.
379
+
380
+ Will merge to 'master'.
381
+ source: <pull.1512.git.1681748502.gitgitgadget@gmail.com>
382
+
383
+
384
+* tb/enable-cruft-packs-by-default (2023-04-18) 10 commits
385
+ - repository.h: drop unused `gc_cruft_packs`
386
+ - builtin/gc.c: make `gc.cruftPacks` enabled by default
387
+ - t/t9300-fast-import.sh: prepare for `gc --cruft` by default
388
+ - t/t6500-gc.sh: add additional test cases
389
+ - t/t6500-gc.sh: refactor cruft pack tests
390
+ - t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
391
+ - t/t5304-prune.sh: prepare for `gc --cruft` by default
392
+ - builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
393
+ - builtin/repack.c: fix incorrect reference to '-C'
394
+ - pack-write.c: plug a leak in stage_tmp_packfiles()
395
+
396
+ When "gc" needs to retain unreachable objects, packing them into
397
+ cruft packs (instead of exploding them into loose object files) has
398
+ been offered as a more efficient option for some time. Now the use
399
+ of cruft packs has been made the default and no longer considered
400
+ an experimental feature.
401
+
402
+ Will merge to 'next'.
403
+ source: <cover.1681850424.git.me@ttaylorr.com>
404
+
405
+
406
+* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
407
+ - send-email: expose header information to git-send-email's sendemail-validate hook
408
+ - send-email: refactor header generation functions
409
+
410
+ "git send-email" learned to give the e-mail headers to the validate
411
+ hook by passing an extra argument from the command line.
412
+ source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
413
+
414
+
415
* ja/worktree-orphan (2023-04-17) 8 commits
416
- worktree add: emit warn when there is a bad HEAD
417
- worktree add: extend DWIM to infer --orphan
@@ -204,6 +424,8 @@ Release tarballs are available at:
424
425
'git worktree add' learned how to create a worktree based on an
426
orphaned branch with `--orphan`.
427
+
428
+ Comments?
429
source: <20230417093255.31079-1-jacobabel@nullpo.dev>
430
431
@@ -213,7 +435,8 @@ Release tarballs are available at:
435
436
Update documentation regarding Coccinelle patches.
437
216
- Comments?
438
+ Expecting review response.
439
+ cf. <xmqqmt3by5sc.fsf@gitster.g>
440
source: <pull.1495.git.git.1681329955.gitgitgadget@gmail.com>
441
442
@@ -249,99 +472,98 @@ Release tarballs are available at:
472
473
474
* ps/fix-geom-repack-with-alternates (2023-04-14) 10 commits
252
- - repack: disable writing bitmaps when doing a local repack
253
- - repack: honor `-l` when calculating pack geometry
254
- - t/helper: allow chmtime to print verbosely without modifying mtime
255
- - pack-objects: extend test coverage of `--stdin-packs` with alternates
256
- - pack-objects: fix error when same packfile is included and excluded
257
- - pack-objects: fix error when packing same pack twice
258
- - pack-objects: split out `--stdin-packs` tests into separate file
259
- - repack: fix generating multi-pack-index with only non-local packs
260
- - repack: fix trying to use preferred pack in alternates
261
- - midx: fix segfault with no packs and invalid preferred pack
475
+ (merged to 'next' on 2023-04-18 at de56e80363)
476
+ + repack: disable writing bitmaps when doing a local repack
477
+ + repack: honor `-l` when calculating pack geometry
478
+ + t/helper: allow chmtime to print verbosely without modifying mtime
479
+ + pack-objects: extend test coverage of `--stdin-packs` with alternates
480
+ + pack-objects: fix error when same packfile is included and excluded
481
+ + pack-objects: fix error when packing same pack twice
482
+ + pack-objects: split out `--stdin-packs` tests into separate file
483
+ + repack: fix generating multi-pack-index with only non-local packs
484
+ + repack: fix trying to use preferred pack in alternates
485
+ + midx: fix segfault with no packs and invalid preferred pack
486
487
Geometric repacking ("git repack --geometric=<n>") in a repository
488
that borrows from an alternate object database had various corner
489
case bugs, which have been corrected.
490
267
- Will merge to 'next'.
491
+ Will merge to 'master'.
492
source: <cover.1681452028.git.ps@pks.im>
493
494
495
* rj/send-email-validate-hook-count-messages (2023-04-14) 1 commit
272
- - send-email: export patch counters in validate environment
496
+ (merged to 'next' on 2023-04-18 at 0c3db0bd3b)
497
+ + send-email: export patch counters in validate environment
498
499
The sendemail-validate validate hook learned to pass the total
500
number of input files and where in the sequence each invocation is
501
via environment variables.
502
278
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <20230414155249.667180-1-robin@jarry.cc>
505
506
507
* tb/pack-revindex-on-disk (2023-04-13) 7 commits
283
- - t: invert `GIT_TEST_WRITE_REV_INDEX`
284
- - config: enable `pack.writeReverseIndex` by default
285
- - pack-revindex: introduce `pack.readReverseIndex`
286
- - pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
287
- - pack-revindex: make `load_pack_revindex` take a repository
288
- - t5325: mark as leak-free
289
- - pack-write.c: plug a leak in stage_tmp_packfiles()
508
+ (merged to 'next' on 2023-04-19 at d6b90b44cf)
509
+ + t: invert `GIT_TEST_WRITE_REV_INDEX`
510
+ + config: enable `pack.writeReverseIndex` by default
511
+ + pack-revindex: introduce `pack.readReverseIndex`
512
+ + pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
513
+ + pack-revindex: make `load_pack_revindex` take a repository
514
+ + t5325: mark as leak-free
515
+ + pack-write.c: plug a leak in stage_tmp_packfiles()
516
(this branch is used by ds/fsck-pack-revindex.)
517
518
The on-disk reverse index that allows mapping from the pack offset
519
to the object name for the object stored at the offset has been
520
enabled by default.
521
296
- Will merge to 'next'?
522
+ Will merge to 'master'.
523
source: <cover.1681338013.git.me@ttaylorr.com>
524
525
526
* fc/doc-use-datestamp-in-commit (2023-04-14) 3 commits
301
- - doc: set actual revdate for manpages
302
- - Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
303
- - Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit
527
+ (merged to 'next' on 2023-04-20 at 3b6ccb62ec)
528
+ + doc: set actual revdate for manpages
529
+ + Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
530
+ + Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit
531
(this branch uses fc/doc-stop-using-manversion.)
532
533
Instead of the time the formatter was run, show the timestamp
534
recorded in the commit in the documentation.
535
536
+ Will merge to 'master'.
537
source: <20230413074722.71260-1-felipe.contreras@gmail.com>
538
539
540
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
313
- - completion: complete AUTO_MERGE
314
- - Documentation: document AUTO_MERGE
315
- - git-merge.txt: modernize word choice in "True merge" section
316
- - completion: complete REVERT_HEAD and BISECT_HEAD
317
- - revisions.txt: document more special refs
541
+ (merged to 'next' on 2023-04-20 at 2728a01622)
542
+ + completion: complete AUTO_MERGE
543
+ + Documentation: document AUTO_MERGE
544
+ + git-merge.txt: modernize word choice in "True merge" section
545
+ + completion: complete REVERT_HEAD and BISECT_HEAD
546
+ + revisions.txt: document more special refs
547
548
Document more pseudo-refs and teach the command line completion
549
machinery to complete AUTO_MERGE.
550
551
+ Will merge to 'master'.
552
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
553
554
325
-* tb/ban-strtok (2023-04-14) 5 commits
326
- - banned.h: mark `strtok()`, `strtok_r()` as banned
555
+* tb/ban-strtok (2023-04-18) 6 commits
556
+ - banned.h: mark `strtok()` as banned
557
- t/helper/test-json-writer.c: avoid using `strtok()`
558
- t/helper/test-oidmap.c: avoid using `strtok()`
559
- t/helper/test-hashmap.c: avoid using `strtok()`
560
+ - string-list: introduce `string_list_setlen()`
561
- string-list: introduce `string_list_split_in_place_multi()`
562
563
Mark strtok() and strtok_r() to be banned.
564
334
- source: <cover.1681428696.git.me@ttaylorr.com>
335
-
336
-
337
-* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
338
- (merged to 'next' on 2023-04-13 at a35a043d6c)
339
- + t2024: fix loose/strict local base branch DWIM test
340
-
341
- Test fix.
342
-
343
- Will merge to 'master'.
344
- source: <20230408205450.569548-1-rybak.a.v@gmail.com>
565
+ Comments?
566
+ source: <cover.1681845518.git.me@ttaylorr.com>
567
568
569
* fc/doc-stop-using-manversion (2023-04-10) 1 commit
@@ -366,39 +588,6 @@ Release tarballs are available at:
588
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
589
590
369
-* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
370
- (merged to 'next' on 2023-04-13 at ad62b4545a)
371
- + get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
372
-
373
- Code clean-up to replace a hardcoded constant with a CPP macro.
374
-
375
- Will merge to 'master'.
376
- source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
377
-
378
-
379
-* rs/remove-approxidate-relative (2023-04-10) 1 commit
380
- (merged to 'next' on 2023-04-13 at bd7df5f98c)
381
- + date: remove approxidate_relative()
382
-
383
- The approxidate() API has been simplified by losing an extra
384
- function that did the same thing as another one.
385
-
386
- Will merge to 'master'.
387
- source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
388
-
389
-
390
-* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
391
- (merged to 'next' on 2023-04-13 at 348908c03c)
392
- + userdiff: support regexec(3) with multi-byte support
393
-
394
- The userdiff regexp patterns for various filetypes that are built
395
- into the system have been updated to avoid triggering regexp errors
396
- from UTF-8 aware regex engines.
397
-
398
- Will merge to 'master'.
399
- source: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
400
-
401
-
591
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
592
- usage: clarify --recurse-submodules as a boolean
593
@@ -412,18 +601,6 @@ Release tarballs are available at:
601
source: <ZDSTFwMFO7vbj/du@google.com>
602
603
415
-* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
416
- (merged to 'next' on 2023-04-13 at fff15efe05)
417
- + clone: error specifically with --local and symlinked objects
418
-
419
- "git clone --local" stops copying from an original repository that
420
- has symbolic links inside its $GIT_DIR; an error message when that
421
- happens has been updated.
422
-
423
- Will merge to 'master'.
424
- source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
425
-
426
-
604
* ow/ref-filter-omit-empty (2023-04-13) 1 commit
605
(merged to 'next' on 2023-04-14 at 2798986c60)
606
+ branch, for-each-ref, tag: add option to omit empty lines
@@ -465,10 +642,14 @@ Release tarballs are available at:
642
- t0300: don't create unused file
643
644
Test cleanup.
645
+
646
+ Comments?
647
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
648
649
471
-* en/header-split-cache-h (2023-04-11) 24 commits
650
+* en/header-split-cache-h (2023-04-18) 25 commits
651
+ (merged to 'next' on 2023-04-18 at 55b4d95cac)
652
+ + protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
653
(merged to 'next' on 2023-04-13 at b9afefff0b)
654
+ mailmap, quote: move declarations of global vars to correct unit
655
+ treewide: reduce includes of cache.h in other headers
@@ -494,6 +675,7 @@ Release tarballs are available at:
675
+ treewide: be explicit about dependence on advice.h
676
+ treewide: be explicit about dependence on trace.h & trace2.h
677
+ Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
678
+ (this branch is used by en/header-split-cache-h-part-2.)
679
680
Header clean-up.
681
@@ -522,26 +704,6 @@ Release tarballs are available at:
704
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
705
706
525
-* mh/use-wincred-from-system (2023-03-27) 1 commit
526
- - credential/wincred: include wincred.h
527
-
528
- Code clean-up.
529
-
530
- Area maintainer is fairly negative. Perhaps drop?
531
- cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
532
- source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
533
-
534
-
535
-* ob/revert-of-revert (2023-03-28) 1 commit
536
- - sequencer: call a revert of a revert "reapply"
537
-
538
- Instead of "Revert "Revert "original"", give "Replay "original""
539
- as the title for a revert of a revert.
540
-
541
- Needs more polishing: docs, tests, transitions.
542
- source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
543
-
544
-
707
* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
708
- rebase -i: do not update "done" when rescheduling command
709
@@ -563,21 +725,6 @@ Release tarballs are available at:
725
source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
726
727
566
-* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
567
- - pack-bitmap.c: factor out `bitmap_index_seek_commit()`
568
- - pack-bitmap.c: use `bitmap_index_seek()` where possible
569
- - pack-bitmap.c: factor out manual `map_pos` manipulation
570
- - pack-bitmap.c: drop unnecessary 'inline's
571
- - pack-bitmap.c: hide bitmap internals in `read_be32()`
572
- - pack-bitmap.c: hide bitmap internals in `read_u8()`
573
-
574
- Clean-up the pack-bitmap codepath.
575
-
576
- Kicked back to 'seen' out of 'next'.
577
- There is a BUG() on data errors that needs to be fixed.
578
- source: <cover.1679342296.git.me@ttaylorr.com>
579
-
580
-
728
* nw/for-each-ref-signature (2023-03-13) 1 commit
729
. ref-filter: add new "signature" atom
730
@@ -619,20 +766,6 @@ Release tarballs are available at:
766
source: <20230322161820.3609-1-cheskaqiqi@gmail.com>
767
768
622
-* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
623
- - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
624
-
625
- In an advice message after failed non-ff pull, we used to suggest
626
- setting pull.rebase=true, but these days pull.rebase=merges may be
627
- more inline with the original spirit of "rebuild your side on top
628
- of theirs".
629
-
630
- On hold. This is too much of a departure from the existing practice.
631
- cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
632
- cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
633
- source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
634
-
635
-
769
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
770
- branch: avoid unnecessary worktrees traversals
771
- branch: rename orphan branches in any worktree
@@ -646,77 +779,6 @@ Release tarballs are available at:
779
Will merge to 'next'?
780
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
781
649
-
650
-* ab/imap-send-requires-curl (2023-02-02) 6 commits
651
- - imap-send: correctly report "host" when using "tunnel"
652
- - imap-send: remove old --no-curl codepath
653
- - imap-send: make --curl no-optional
654
- - imap-send: replace auto-probe libcurl with hard dependency
655
- - imap-send doc: the imap.sslVerify is used with imap.tunnel
656
- - imap-send: note "auth_method", not "host" on auth method failure
657
-
658
- Give a hard dependency on cURL library to build "git imap-send",
659
- and remove the code to interact with IMAP server without using cURL.
660
-
661
- Expecting a reroll.
662
- The 'tunnel' part is still iffy.
663
- cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
664
- source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
665
-
666
-
667
-* cb/checkout-same-branch-twice (2023-03-22) 2 commits
668
- - SQUASH??? the test marked to expect failure passes from day one
669
- - checkout/switch: disallow checking out same branch in multiple worktrees
670
-
671
- "git checkout -B $branch" failed to protect against checking out
672
- a branch that is checked out elsewhere, unlike "git branch -f" did.
673
-
674
- Expecting a hopefully minor and final reroll.
675
- cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>
676
- source: <20230120113553.24655-1-carenas@gmail.com>
677
-
678
-
679
-* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
680
- - send-email: expose header information to git-send-email's sendemail-validate hook
681
- - send-email: refactor header generation functions
682
-
683
- "git send-email" learned to give the e-mail headers to the validate
684
- hook by passing an extra argument from the command line.
685
-
686
- Expecting a hopefully minor and final reroll.
687
- cf. <c1ba0a28-3c39-b313-2757-dceb02930334@amd.com>
688
- source: <20230120012459.920932-1-michael.strawbridge@amd.com>
689
-
690
-
691
-* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
692
- . cat-file: quote-format name in error when using -z
693
- . cat-file: extract printing batch error message into function
694
-
695
- "cat-file" in the batch mode that is fed NUL-terminated pathnames
696
- learned to cquote them in its error output (otherwise, a funny
697
- pathname with LF in it would break the lines in the output stream).
698
-
699
- Breaks "cat-file --batch-all-objects --batch-check".
700
- cf. <xmqqilfhctrr.fsf@gitster.g>
701
- source: <20230303191708.77894-1-toon@iotcl.com>
702
-
703
-
704
-* cw/submodule-status-in-parallel (2023-03-02) 6 commits
705
- - diff-lib: parallelize run_diff_files for submodules
706
- - diff-lib: refactor out diff_change logic
707
- - submodule: refactor is_submodule_modified()
708
- - submodule: move status parsing into function
709
- - submodule: rename strbuf variable
710
- - run-command: add on_stderr_output_fn to run_processes_parallel_opts
711
-
712
- "git submodule status" learned to run the comparison in submodule
713
- repositories in parallel.
714
-
715
- Expecting a reroll.
716
- cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
717
- cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
718
- source: <20230302215237.1473444-1-calvinwan@google.com>
719
-
782
--------------------------------------------------
783
[Discarded]
784