What's cooking (2023/04 #07)
Junio C Hamano committed
Apr 25, 2023 at 14:38 UTC
0201468ba0b401c15c4ec5ba0fcec810a7c60070
1 file changed
+312
-293
whats-cooking.txt
+312
-293
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #06; Thu, 20)
3
-X-master-at: 9c6990cca24301ae8f82bf6291049667a0aef14b
4
-X-next-at: bd7f14d9353b7ce9acf82b32f80f585373a5ebe3
2
+Subject: What's cooking in git.git (Apr 2023, #07; Tue, 25)
3
+X-master-at: 2807bd2c10606e590886543afe4e4f208dddd489
4
+X-next-at: 96c395b00cfdcc2a001874b3e5d6fadf5fd01d38
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #06; Thu, 20)
7
+What's cooking in git.git (Apr 2023, #07; Tue, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,6 +16,9 @@ message that raises issues but they are no means exhaustive. A
16
topic without enough support may be discarded after a long period of
17
no activity.
18
19
+A set of new maintenance releases to address some security issues
20
+have been made; all the integration tracks also have the same fixes.
21
+
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
24
repositories have only a subset of branches.
@@ -47,154 +50,215 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
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
+* ah/format-patch-thread-doc (2023-04-03) 1 commit
54
+ (merged to 'next' on 2023-04-14 at acf141a832)
55
+ + format-patch: correct documentation of --thread without an argument
56
54
- Test fix.
55
- source: <20230408205450.569548-1-rybak.a.v@gmail.com>
57
+ Doc update.
58
+ source: <20230403040724.642513-1-alexhenrie24@gmail.com>
59
60
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
+* en/header-split-cache-h (2023-04-18) 25 commits
62
+ (merged to 'next' on 2023-04-18 at 55b4d95cac)
63
+ + protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
64
+ (merged to 'next' on 2023-04-13 at b9afefff0b)
65
+ + mailmap, quote: move declarations of global vars to correct unit
66
+ + treewide: reduce includes of cache.h in other headers
67
+ + treewide: remove double forward declaration of read_in_full
68
+ + cache.h: remove unnecessary includes
69
+ + treewide: remove cache.h inclusion due to pager.h changes
70
+ + pager.h: move declarations for pager.c functions from cache.h
71
+ + treewide: remove cache.h inclusion due to editor.h changes
72
+ + editor: move editor-related functions and declarations into common file
73
+ + treewide: remove cache.h inclusion due to object.h changes
74
+ + object.h: move some inline functions and defines from cache.h
75
+ + treewide: remove cache.h inclusion due to object-file.h changes
76
+ + object-file.h: move declarations for object-file.c functions from cache.h
77
+ + treewide: remove cache.h inclusion due to git-zlib changes
78
+ + git-zlib: move declarations for git-zlib functions from cache.h
79
+ + treewide: remove cache.h inclusion due to object-name.h changes
80
+ + object-name.h: move declarations for object-name.c functions from cache.h
81
+ + treewide: remove unnecessary cache.h inclusion
82
+ + treewide: be explicit about dependence on mem-pool.h
83
+ + treewide: be explicit about dependence on oid-array.h
84
+ + treewide: be explicit about dependence on pack-revindex.h
85
+ + treewide: be explicit about dependence on convert.h
86
+ + treewide: be explicit about dependence on advice.h
87
+ + treewide: be explicit about dependence on trace.h & trace2.h
88
+ + Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
89
+ (this branch is used by en/header-split-cache-h-part-2.)
90
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>
91
+ Header clean-up.
92
+ source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
93
94
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
95
+* fc/doc-stop-using-manversion (2023-04-10) 1 commit
96
+ (merged to 'next' on 2023-04-14 at 0800fe5ab4)
97
+ + doc: simplify man version
98
+ (this branch is used by fc/doc-use-datestamp-in-commit.)
99
72
- Code clean-up to replace a hardcoded constant with a CPP macro.
73
- source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
100
+ Doc build simplification.
101
+ source: <20230408001829.11031-1-felipe.contreras@gmail.com>
102
103
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()
104
+* jk/protocol-cap-parse-fix (2023-04-14) 7 commits
105
+ (merged to 'next' on 2023-04-17 at fd9bf05656)
106
+ + v0 protocol: use size_t for capability length/offset
107
+ + t5512: test "ls-remote --heads --symref" filtering with v0 and v2
108
+ + t5512: allow any protocol version for filtered symref test
109
+ + t5512: add v2 support for "ls-remote --symref" test
110
+ + v0 protocol: fix sha1/sha256 confusion for capabilities^{}
111
+ + t5512: stop referring to "v1" protocol
112
+ + v0 protocol: fix infinite loop when parsing multi-valued capabilities
113
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>
114
+ The code to parse capability list for v0 on-wire protocol fell into
115
+ an infinite loop when a capability appears multiple times, which
116
+ has been corrected.
117
+ source: <20230414212404.GA639653@coredump.intra.peff.net>
118
119
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
120
+* ow/ref-filter-omit-empty (2023-04-13) 1 commit
121
+ (merged to 'next' on 2023-04-14 at 2798986c60)
122
+ + branch, for-each-ref, tag: add option to omit empty lines
123
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>
124
+ "git branch --format=..." and "git format-patch --format=..."
125
+ learns "--omit-empty" to hide refs that whose formatting result
126
+ becomes an empty string from the output.
127
+ source: <20230407175316.6404-1-oystwa@gmail.com>
128
94
---------------------------------------------------
95
-[New Topics]
129
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
130
+* ps/fix-geom-repack-with-alternates (2023-04-14) 10 commits
131
+ (merged to 'next' on 2023-04-18 at de56e80363)
132
+ + repack: disable writing bitmaps when doing a local repack
133
+ + repack: honor `-l` when calculating pack geometry
134
+ + t/helper: allow chmtime to print verbosely without modifying mtime
135
+ + pack-objects: extend test coverage of `--stdin-packs` with alternates
136
+ + pack-objects: fix error when same packfile is included and excluded
137
+ + pack-objects: fix error when packing same pack twice
138
+ + pack-objects: split out `--stdin-packs` tests into separate file
139
+ + repack: fix generating multi-pack-index with only non-local packs
140
+ + repack: fix trying to use preferred pack in alternates
141
+ + midx: fix segfault with no packs and invalid preferred pack
142
103
- Test updates.
143
+ Geometric repacking ("git repack --geometric=<n>") in a repository
144
+ that borrows from an alternate object database had various corner
145
+ case bugs, which have been corrected.
146
+ source: <cover.1681452028.git.ps@pks.im>
147
105
- Expecting a reroll.
106
- source: <20230418175034.982433-1-rybak.a.v@gmail.com>
148
149
+* rj/send-email-validate-hook-count-messages (2023-04-14) 1 commit
150
+ (merged to 'next' on 2023-04-18 at 0c3db0bd3b)
151
+ + send-email: export patch counters in validate environment
152
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.)
153
+ The sendemail-validate validate hook learned to pass the total
154
+ number of input files and where in the sequence each invocation is
155
+ via environment variables.
156
+ source: <20230414155249.667180-1-robin@jarry.cc>
157
135
- More header clean-up.
158
137
- Will merge to 'next'?
138
- source: <pull.1517.git.1681614205.gitgitgadget@gmail.com>
159
+* rn/sparse-describe (2023-04-03) 1 commit
160
+ (merged to 'next' on 2023-04-14 at 9699cfad2c)
161
+ + describe: enable sparse index for describe
162
163
+ "git describe --dirty" learns to work better with sparse-index.
164
+ source: <20230403164749.246001-1-nanth.raghul@gmail.com>
165
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
166
146
- Doc mark-up update.
167
+* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
168
+ (merged to 'next' on 2023-04-14 at 950f9ed807)
169
+ + archive: improve support for running in subdirectory
170
+
171
+ "git archive" run from a subdirectory mishandled attributes and
172
+ paths outside the current directory.
173
+ source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
174
+
175
+--------------------------------------------------
176
+[New Topics]
177
+
178
+* ek/completion-use-read-r-to-read-literally (2023-04-20) 1 commit
179
+ (merged to 'next' on 2023-04-24 at 25bf3b808b)
180
+ + completion: suppress unwanted unescaping of `read`
181
+
182
+ The completion script used to use bare "read" without the "-r"
183
+ option to read the contents of various state files, which risked
184
+ getting confused with backslashes in them. This has been
185
+ corrected.
186
187
Will merge to 'master'.
149
- source: <20230418070048.2209469-1-felipe.contreras@gmail.com>
188
+ source: <20230420223800.1698197-1-myoga.murase@gmail.com>
189
190
152
-* jk/gpg-trust-level-fix (2023-04-19) 1 commit
153
- - gpg-interface: set trust level of missing key to "undefined"
191
+* pw/rebase-i-after-failure (2023-04-21) 6 commits
192
+ - rebase -i: fix adding failed command to the todo list
193
+ - rebase: fix rewritten list for failed pick
194
+ - rebase --continue: refuse to commit after failed command
195
+ - sequencer: factor out part of pick_commits()
196
+ - rebase -i: remove patch file after conflict resolution
197
+ - rebase -i: move unlink() calls
198
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.
199
+ Various fixes to the behaviour of "rebase -i" when the command got
200
+ interrupted by conflicting changes.
201
+
202
+ Needs review.
203
+ source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
204
+
205
+
206
+* jk/blame-fake-commit-label (2023-04-24) 1 commit
207
+ - blame: use different author name for fake commit generated by --contents
208
+
209
+ The output given by "git blame" that attributes a line to contents
210
+ taken from the file specified by the "--contents" option shows it
211
+ differently from a line attributed to the working tree file.
212
213
Will merge to 'next'.
160
- source: <20230419012957.GA503941@coredump.intra.peff.net>
214
+ source: <20230424193508.2245566-1-jacob.e.keller@intel.com>
215
216
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
217
+* jk/misc-null-check-fixes (2023-04-24) 2 commits
218
+ - fetch_bundle_uri(): drop pointless NULL check
219
+ - notes: clean up confusing NULL checks in init_notes()
220
173
- "git fetch" learned the "--output-format" option that emits what it
174
- did in a machine-parseable format.
221
+ Code clean-up.
222
176
- Needs review.
177
- source: <cover.1681906948.git.ps@pks.im>
223
+ Will merge to 'next'.
224
+ source: <20230422135455.GA3942740@coredump.intra.peff.net>
225
226
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
227
+* jk/parse-commit-with-malformed-ident (2023-04-25) 4 commits
228
+ - parse_commit(): describe more date-parsing failure modes
229
+ - parse_commit(): handle broken whitespace-only timestamp
230
+ - parse_commit(): parse timestamp from end of line
231
+ - t4212: avoid putting git on left-hand side of pipe
232
184
- source: <pull.1518.git.1681974847078.gitgitgadget@gmail.com>
233
+ The commit object parser has been taught to be a bit more lenient
234
+ to parse timestamps on the author/committer line with a malformed
235
+ author/committer ident.
236
237
+ Will merge to 'next'?
238
+ Protecting against mischieves using \f and \v may be worth doing.
239
+ source: <20230425055244.GA4014505@coredump.intra.peff.net>
240
187
-* ma/gittutorial-fixes (2023-04-20) 2 commits
188
- - gittutorial: wrap literal examples in backticks
189
- - gittutorial: drop early mention of origin
241
191
- source: <cover.1681579244.git.martin.agren@gmail.com>
242
+* sl/sparse-write-tree-part-2 (2023-04-24) 1 commit
243
+ - write-tree: optimize sparse integration
244
245
+ Fix-up to a topic already graduated to 'master'.
246
194
-* sg/retire-unused-cocci (2023-04-20) 1 commit
195
- - cocci: remove 'unused.cocci'
247
+ Iffy.
248
+ source: <20230423071243.1863977-1-cheskaqiqi@gmail.com>
249
197
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
250
+
251
+* tb/pack-bitmap-traversal-with-boundary (2023-04-25) 3 commits
252
+ - pack-bitmap.c: use commit boundary during bitmap traversal
253
+ - pack-bitmap.c: extract `fill_in_bitmap()`
254
+ - revision: support tracking uninteresting commits
255
+
256
+ The object traversal using reachability bitmap done by
257
+ "pack-object" has been tweaked to take advantage of the fact that
258
+ using "boundary" commits as representative of all the uninteresting
259
+ ones can save quite a lot of object enumeration.
260
+
261
+ source: <cover.1682380788.git.me@ttaylorr.com>
262
263
--------------------------------------------------
264
[Stalled]
@@ -262,18 +326,18 @@ Release tarballs are available at:
326
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
327
328
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
268
- . notes.c: use designated initializers for clarity
269
- . notes.c: cleanup 'strbuf_grow' call in 'append_edit'
329
+* tl/notes-separator (2023-04-25) 6 commits
330
+ - notes.c: introduce "--[no-]stripspace" option
331
+ - notes.c: append separator instead of insert by pos
332
+ - notes.c: introduce '--separator=<paragraph-break>' option
333
+ - t3321: add test cases about the notes stripspace behavior
334
+ - notes.c: use designated initializers for clarity
335
+ - notes.c: cleanup 'strbuf_grow' call in 'append_edit'
336
337
'git notes append' was taught '--separator' to specify string to insert
338
between paragraphs.
339
274
- Seems to break CI.
275
- cf. <xmqqy1nf8c0f.fsf@gitster.g>
276
- source: <cover.1680012650.git.dyroneteng@gmail.com>
340
+ source: <cover.1682429602.git.dyroneteng@gmail.com>
341
342
343
* ab/tag-object-type-errors (2022-11-22) 5 commits
@@ -366,6 +430,106 @@ Release tarballs are available at:
430
--------------------------------------------------
431
[Cooking]
432
433
+* ar/config-count-tests-updates (2023-04-24) 3 commits
434
+ - t1300: add tests for missing keys
435
+ - t1300: check stderr for "ignores pairs" tests
436
+ - t1300: drop duplicate test
437
+
438
+ Test updates.
439
+ source: <20230423134649.431783-1-rybak.a.v@gmail.com>
440
+
441
+
442
+* en/header-split-cache-h-part-2 (2023-04-24) 22 commits
443
+ - reftable: ensure git-compat-util.h is the first (indirect) include
444
+ - diff.h: reduce unnecessary includes
445
+ - object-store.h: reduce unnecessary includes
446
+ - commit.h: reduce unnecessary includes
447
+ - fsmonitor: reduce includes of cache.h
448
+ - cache.h: remove unnecessary headers
449
+ - treewide: remove cache.h inclusion due to previous changes
450
+ - cache,tree: move basic name compare functions from read-cache to tree
451
+ - cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
452
+ - hash-ll.h: split out of hash.h to remove dependency on repository.h
453
+ - tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
454
+ - dir.h: move DTYPE defines from cache.h
455
+ - versioncmp.h: move declarations for versioncmp.c functions from cache.h
456
+ - ws.h: move declarations for ws.c functions from cache.h
457
+ - match-trees.h: move declarations for match-trees.c functions from cache.h
458
+ - pkt-line.h: move declarations for pkt-line.c functions from cache.h
459
+ - base85.h: move declarations for base85.c functions from cache.h
460
+ - copy.h: move declarations for copy.c functions from cache.h
461
+ - server-info.h: move declarations for server-info.c functions from cache.h
462
+ - packfile.h: move pack_window and pack_entry from cache.h
463
+ - symlinks.h: move declarations for symlinks.c functions from cache.h
464
+ - treewide: be explicit about dependence on strbuf.h
465
+
466
+ More header clean-up.
467
+ source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
468
+
469
+
470
+* fc/doc-checkout-markup-updates (2023-04-18) 2 commits
471
+ (merged to 'next' on 2023-04-20 at 62782d75c4)
472
+ + doc: git-checkout: reorganize examples
473
+ + doc: git-checkout: trivial callout cleanup
474
+
475
+ Doc mark-up update.
476
+
477
+ Will merge to 'master'.
478
+ source: <20230418070048.2209469-1-felipe.contreras@gmail.com>
479
+
480
+
481
+* jk/gpg-trust-level-fix (2023-04-19) 1 commit
482
+ (merged to 'next' on 2023-04-21 at eb8413dc9d)
483
+ + gpg-interface: set trust level of missing key to "undefined"
484
+
485
+ The "%GT" placeholder for the "--format" option of "git log" and
486
+ friends caused BUG() to trigger on a commit signed with an unknown
487
+ key, which has been corrected.
488
+
489
+ Will merge to 'master'.
490
+ source: <20230419012957.GA503941@coredump.intra.peff.net>
491
+
492
+
493
+* ps/fetch-output-format (2023-04-19) 8 commits
494
+ - fetch: introduce machine-parseable "porcelain" output format
495
+ - fetch: introduce new `--output-format` option
496
+ - fetch: move option related variables into main function
497
+ - fetch: move display format parsing into main function
498
+ - fetch: introduce `display_format` enum
499
+ - fetch: fix missing from-reference when fetching HEAD:foo
500
+ - fetch: add a test to exercise invalid output formats
501
+ - fetch: split out tests for output format
502
+
503
+ "git fetch" learned the "--output-format" option that emits what it
504
+ did in a machine-parseable format.
505
+
506
+ Needs review.
507
+ source: <cover.1681906948.git.ps@pks.im>
508
+
509
+
510
+* en/ort-finalize-after-0-merges-fix (2023-04-24) 1 commit
511
+ (merged to 'next' on 2023-04-25 at 1bc935225b)
512
+ + merge-ort: fix calling merge_finalize() with no intermediate merge
513
+
514
+ A small API fix to the ort merge strategy backend.
515
+
516
+ Will merge to 'master'.
517
+ source: <pull.1518.v2.git.1682194930766.gitgitgadget@gmail.com>
518
+
519
+
520
+* ma/gittutorial-fixes (2023-04-20) 2 commits
521
+ - gittutorial: wrap literal examples in backticks
522
+ - gittutorial: drop early mention of origin
523
+
524
+ source: <cover.1681579244.git.martin.agren@gmail.com>
525
+
526
+
527
+* sg/retire-unused-cocci (2023-04-20) 1 commit
528
+ - cocci: remove 'unused.cocci'
529
+
530
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
531
+
532
+
533
* ds/fsck-pack-revindex (2023-04-17) 5 commits
534
(merged to 'next' on 2023-04-19 at 6fb9527bf5)
535
+ fsck: validate .rev file header
@@ -382,16 +546,17 @@ Release tarballs are available at:
546
547
548
* 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()
549
+ (merged to 'next' on 2023-04-21 at 068bf86fc3)
550
+ + repository.h: drop unused `gc_cruft_packs`
551
+ + builtin/gc.c: make `gc.cruftPacks` enabled by default
552
+ + t/t9300-fast-import.sh: prepare for `gc --cruft` by default
553
+ + t/t6500-gc.sh: add additional test cases
554
+ + t/t6500-gc.sh: refactor cruft pack tests
555
+ + t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
556
+ + t/t5304-prune.sh: prepare for `gc --cruft` by default
557
+ + builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
558
+ + builtin/repack.c: fix incorrect reference to '-C'
559
+ + pack-write.c: plug a leak in stage_tmp_packfiles()
560
561
When "gc" needs to retain unreachable objects, packing them into
562
cruft packs (instead of exploding them into loose object files) has
@@ -399,7 +564,7 @@ Release tarballs are available at:
564
of cruft packs has been made the default and no longer considered
565
an experimental feature.
566
402
- Will merge to 'next'.
567
+ Will merge to 'master'.
568
source: <cover.1681850424.git.me@ttaylorr.com>
569
570
@@ -440,24 +605,6 @@ Release tarballs are available at:
605
source: <pull.1495.git.git.1681329955.gitgitgadget@gmail.com>
606
607
443
-* jk/protocol-cap-parse-fix (2023-04-14) 7 commits
444
- (merged to 'next' on 2023-04-17 at fd9bf05656)
445
- + v0 protocol: use size_t for capability length/offset
446
- + t5512: test "ls-remote --heads --symref" filtering with v0 and v2
447
- + t5512: allow any protocol version for filtered symref test
448
- + t5512: add v2 support for "ls-remote --symref" test
449
- + v0 protocol: fix sha1/sha256 confusion for capabilities^{}
450
- + t5512: stop referring to "v1" protocol
451
- + v0 protocol: fix infinite loop when parsing multi-valued capabilities
452
-
453
- The code to parse capability list for v0 on-wire protocol fell into
454
- an infinite loop when a capability appears multiple times, which
455
- has been corrected.
456
-
457
- Will merge to 'master'.
458
- source: <20230414212404.GA639653@coredump.intra.peff.net>
459
-
460
-
608
* kh/doc-interpret-trailers-updates (2023-04-12) 4 commits
609
- doc: interpret-trailers: fix example
610
- doc: interpret-trailers: don’t use deprecated config
@@ -471,39 +618,6 @@ Release tarballs are available at:
618
source: <cover.1681326818.git.code@khaugsbakk.name>
619
620
474
-* ps/fix-geom-repack-with-alternates (2023-04-14) 10 commits
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
-
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
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
-
503
- Will merge to 'master'.
504
- source: <20230414155249.667180-1-robin@jarry.cc>
505
-
506
-
621
* tb/pack-revindex-on-disk (2023-04-13) 7 commits
622
(merged to 'next' on 2023-04-19 at d6b90b44cf)
623
+ t: invert `GIT_TEST_WRITE_REV_INDEX`
@@ -528,7 +642,6 @@ Release tarballs are available at:
642
+ doc: set actual revdate for manpages
643
+ Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
644
+ Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit
531
- (this branch uses fc/doc-stop-using-manversion.)
645
646
Instead of the time the formatter was run, show the timestamp
647
recorded in the commit in the documentation.
@@ -548,33 +661,21 @@ Release tarballs are available at:
661
Document more pseudo-refs and teach the command line completion
662
machinery to complete AUTO_MERGE.
663
551
- Will merge to 'master'.
664
+ On hold, waiting for a fix-up.
665
+ cf. <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
666
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
667
668
555
-* tb/ban-strtok (2023-04-18) 6 commits
556
- - banned.h: mark `strtok()` as banned
669
+* tb/ban-strtok (2023-04-24) 6 commits
670
+ - banned.h: mark `strtok()` and `strtok_r()` as banned
671
- t/helper/test-json-writer.c: avoid using `strtok()`
672
- t/helper/test-oidmap.c: avoid using `strtok()`
673
- t/helper/test-hashmap.c: avoid using `strtok()`
674
- string-list: introduce `string_list_setlen()`
561
- - string-list: introduce `string_list_split_in_place_multi()`
675
+ - string-list: multi-delimiter `string_list_split_in_place()`
676
677
Mark strtok() and strtok_r() to be banned.
564
-
565
- Comments?
566
- source: <cover.1681845518.git.me@ttaylorr.com>
567
-
568
-
569
-* fc/doc-stop-using-manversion (2023-04-10) 1 commit
570
- (merged to 'next' on 2023-04-14 at 0800fe5ab4)
571
- + doc: simplify man version
572
- (this branch is used by fc/doc-use-datestamp-in-commit.)
573
-
574
- Doc build simplification.
575
-
576
- Will merge to 'master'.
577
- source: <20230408001829.11031-1-felipe.contreras@gmail.com>
678
+ source: <cover.1682374789.git.me@ttaylorr.com>
679
680
681
* rn/sparse-diff-index (2023-04-10) 1 commit
@@ -601,38 +702,6 @@ Release tarballs are available at:
702
source: <ZDSTFwMFO7vbj/du@google.com>
703
704
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
607
-
608
- "git branch --format=..." and "git format-patch --format=..."
609
- learns "--omit-empty" to hide refs that whose formatting result
610
- becomes an empty string from the output.
611
-
612
- Will merge to 'master'.
613
- source: <20230407175316.6404-1-oystwa@gmail.com>
614
-
615
-
616
-* rn/sparse-describe (2023-04-03) 1 commit
617
- (merged to 'next' on 2023-04-14 at 9699cfad2c)
618
- + describe: enable sparse index for describe
619
-
620
- "git describe --dirty" learns to work better with sparse-index.
621
-
622
- Will merge to 'master'.
623
- source: <20230403164749.246001-1-nanth.raghul@gmail.com>
624
-
625
-
626
-* ah/format-patch-thread-doc (2023-04-03) 1 commit
627
- (merged to 'next' on 2023-04-14 at acf141a832)
628
- + format-patch: correct documentation of --thread without an argument
629
-
630
- Doc update.
631
-
632
- Will merge to 'master'.
633
- source: <20230403040724.642513-1-alexhenrie24@gmail.com>
634
-
635
-
705
* ar/test-cleanup-unused-file-creation-part2 (2023-04-17) 6 commits
706
- t2019: don't create unused files
707
- t1502: don't create unused files
@@ -647,42 +716,6 @@ Release tarballs are available at:
716
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
717
718
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
656
- + treewide: remove double forward declaration of read_in_full
657
- + cache.h: remove unnecessary includes
658
- + treewide: remove cache.h inclusion due to pager.h changes
659
- + pager.h: move declarations for pager.c functions from cache.h
660
- + treewide: remove cache.h inclusion due to editor.h changes
661
- + editor: move editor-related functions and declarations into common file
662
- + treewide: remove cache.h inclusion due to object.h changes
663
- + object.h: move some inline functions and defines from cache.h
664
- + treewide: remove cache.h inclusion due to object-file.h changes
665
- + object-file.h: move declarations for object-file.c functions from cache.h
666
- + treewide: remove cache.h inclusion due to git-zlib changes
667
- + git-zlib: move declarations for git-zlib functions from cache.h
668
- + treewide: remove cache.h inclusion due to object-name.h changes
669
- + object-name.h: move declarations for object-name.c functions from cache.h
670
- + treewide: remove unnecessary cache.h inclusion
671
- + treewide: be explicit about dependence on mem-pool.h
672
- + treewide: be explicit about dependence on oid-array.h
673
- + treewide: be explicit about dependence on pack-revindex.h
674
- + treewide: be explicit about dependence on convert.h
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
-
682
- Will merge to 'master'.
683
- source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
684
-
685
-
719
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
720
- fsmonitor: handle differences between Windows named pipe functions
721
@@ -704,27 +737,6 @@ Release tarballs are available at:
737
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
738
739
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
-
710
- "rebase -i" moved a "rescheduled" insn in the todo file to the
711
- "done" list before it completed, which has been corrected.
712
-
713
- Expecting clarification.
714
- source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
715
-
716
-
717
-* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
718
- (merged to 'next' on 2023-04-14 at 950f9ed807)
719
- + archive: improve support for running in subdirectory
720
-
721
- "git archive" run from a subdirectory mishandled attributes and
722
- paths outside the current directory.
723
-
724
- Will merge to 'master'.
725
- source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
726
-
727
-
740
* nw/for-each-ref-signature (2023-03-13) 1 commit
741
. ref-filter: add new "signature" atom
742
@@ -736,13 +748,13 @@ Release tarballs are available at:
748
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
749
750
739
-* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
751
+* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
752
- credential: new attribute oauth_refresh_token
753
754
The credential subsystem learns to help OAuth framework.
755
756
Needs Review.
745
- source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
757
+ source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
758
759
760
* mh/credential-password-expiry-libsecret (2023-03-27) 1 commit
@@ -755,15 +767,12 @@ Release tarballs are available at:
767
source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
768
769
758
-* sl/diff-files-sparse (2023-03-22) 2 commits
770
+* sl/diff-files-sparse (2023-04-24) 2 commits
771
- diff-files: integrate with sparse index
772
- t1092: add tests for `git diff-files`
773
774
Teach "diff-files" not to expand sparse-index unless needed.
763
-
764
- Expecting a reroll.
765
- cf. <c382017a-8c65-24ba-5092-6b46428d8b9b@github.com>
766
- source: <20230322161820.3609-1-cheskaqiqi@gmail.com>
775
+ source: <20230423010721.1402736-1-cheskaqiqi@gmail.com>
776
777
778
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
@@ -782,6 +791,16 @@ Release tarballs are available at:
791
--------------------------------------------------
792
[Discarded]
793
794
+* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
795
+ . rebase -i: do not update "done" when rescheduling command
796
+
797
+ "rebase -i" moved a "rescheduled" insn in the todo file to the
798
+ "done" list before it completed, which has been corrected.
799
+
800
+ Replaced with a much more enhanced pw/rebase-i-after-failure topic.
801
+ source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
802
+
803
+
804
* ed/fsmonitor-inotify (2022-12-13) 6 commits
805
. fsmonitor: update doc for Linux
806
. fsmonitor: test updates