What's cooking (2024/03 #09)
Junio C Hamano committed
Mar 28, 2024 at 14:48 UTC
078c8813e750691cb4ae413db73ce5a14116f82b
1 file changed
+229
-260
whats-cooking.txt
+229
-260
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2024, #08; Tue, 26)
3
-X-master-at: c75fd8d8150afdf836b63a8e0534d9b9e3e111ba
4
-X-next-at: e103d9ffe4204bcd16a16bb8522827b4e6855422
2
+Subject: What's cooking in git.git (Mar 2024, #09; Thu, 28)
3
+X-master-at: d6fd04375f9196f8b203d442f235bd96a1a068cc
4
+X-next-at: 09a8706636d10c491176b8b1cd6519f7300911bf
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2024, #08; Tue, 26)
7
+What's cooking in git.git (Mar 2024, #09; Thu, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,143 +48,199 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* bb/sh-scripts-cleanup (2024-03-16) 22 commits
52
- (merged to 'next' on 2024-03-18 at 4501a04796)
53
- + git-quiltimport: avoid an unnecessary subshell
54
- + contrib/coverage-diff: avoid redundant pipelines
55
- + t/t9*: merge "grep | sed" pipelines
56
- + t/t8*: merge "grep | sed" pipelines
57
- + t/t5*: merge a "grep | sed" pipeline
58
- + t/t4*: merge a "grep | sed" pipeline
59
- + t/t3*: merge a "grep | awk" pipeline
60
- + t/t1*: merge a "grep | sed" pipeline
61
- + t/t9*: avoid redundant uses of cat
62
- + t/t8*: avoid redundant use of cat
63
- + t/t7*: avoid redundant use of cat
64
- + t/t6*: avoid redundant uses of cat
65
- + t/t5*: avoid redundant uses of cat
66
- + t/t4*: avoid redundant uses of cat
67
- + t/t3*: avoid redundant uses of cat
68
- + t/t1*: avoid redundant uses of cat
69
- + t/t0*: avoid redundant uses of cat
70
- + t/perf: avoid redundant use of cat
71
- + t/annotate-tests.sh: avoid redundant use of cat
72
- + t/lib-cvs.sh: avoid redundant use of cat
73
- + contrib/subtree/t: avoid redundant use of cat
74
- + doc: avoid redundant use of cat
75
-
76
- Shell scripts clean-up.
77
- source: <20240315194620.10713-1-dev+git@drbeat.li>
78
-
79
-
80
-* bl/doc-config-fixes (2024-03-16) 2 commits
81
- (merged to 'next' on 2024-03-18 at a9038d5a9e)
82
- + docs: fix typo in git-config `--default`
83
- + docs: clarify file options in git-config `--edit`
84
-
85
- A few typoes in "git config --help" have been corrected.
86
- source: <20240316050149.1182867-2-brianmlyles@gmail.com>
87
-
88
-
89
-* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
90
- (merged to 'next' on 2024-03-18 at b2e1babb85)
91
- + docs: adjust trailer `separator` and `key_value_separator` language
92
- + docs: correct trailer `key_value_separator` description
93
-
94
- The documentation for "%(trailers[:options])" placeholder in the
95
- "--pretty" option of commands in the "git log" family has been
96
- updated.
97
- source: <20240316035612.752910-1-brianmlyles@gmail.com>
98
-
99
-
100
-* ja/doc-formatting-fix (2024-03-16) 2 commits
101
- (merged to 'next' on 2024-03-18 at edde7a576d)
102
- + doc: fix some placeholders formating
103
- + doc: format alternatives in synopsis
51
+* bt/fuzz-config-parse (2024-03-15) 1 commit
52
+ (merged to 'next' on 2024-03-21 at 6e9f331d68)
53
+ + fuzz: add fuzzer for config parsing
54
+
55
+ A new fuzz target that exercises config parsing code has been
56
+ added.
57
+ source: <pull.1692.v2.git.1710481652130.gitgitgadget@gmail.com>
58
+
59
+
60
+* eb/hash-transition (2023-10-02) 30 commits
61
+ (merged to 'next' on 2024-03-11 at 9cff2e4ab7)
62
+ + t1016-compatObjectFormat: add tests to verify the conversion between objects
63
+ + t1006: test oid compatibility with cat-file
64
+ + t1006: rename sha1 to oid
65
+ + test-lib: compute the compatibility hash so tests may use it
66
+ + builtin/ls-tree: let the oid determine the output algorithm
67
+ + object-file: handle compat objects in check_object_signature
68
+ + tree-walk: init_tree_desc take an oid to get the hash algorithm
69
+ + builtin/cat-file: let the oid determine the output algorithm
70
+ + rev-parse: add an --output-object-format parameter
71
+ + repository: implement extensions.compatObjectFormat
72
+ + object-file: update object_info_extended to reencode objects
73
+ + object-file-convert: convert commits that embed signed tags
74
+ + object-file-convert: convert commit objects when writing
75
+ + object-file-convert: don't leak when converting tag objects
76
+ + object-file-convert: convert tag objects when writing
77
+ + object-file-convert: add a function to convert trees between algorithms
78
+ + object: factor out parse_mode out of fast-import and tree-walk into in object.h
79
+ + cache: add a function to read an OID of a specific algorithm
80
+ + tag: sign both hashes
81
+ + commit: export add_header_signature to support handling signatures on tags
82
+ + commit: convert mergetag before computing the signature of a commit
83
+ + commit: write commits for both hashes
84
+ + object-file: add a compat_oid_in parameter to write_object_file_flags
85
+ + object-file: update the loose object map when writing loose objects
86
+ + loose: compatibilty short name support
87
+ + loose: add a mapping between SHA-1 and SHA-256 for loose objects
88
+ + repository: add a compatibility hash algorithm
89
+ + object-names: support input of oids in any supported hash
90
+ + oid-array: teach oid-array to handle multiple kinds of oids
91
+ + object-file-convert: stubs for converting from one object format to another
92
+
93
+ Work to support a repository that work with both SHA-1 and SHA-256
94
+ hash algorithms has started.
95
+ source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
96
+
97
+
98
+* jc/show-untracked-false (2024-03-13) 2 commits
99
+ (merged to 'next' on 2024-03-21 at 6d1f5603c6)
100
+ + status: allow --untracked=false and friends
101
+ + status: unify parsing of --untracked= and status.showUntrackedFiles
102
+
103
+ The status.showUntrackedFiles configuration variable had a name
104
+ that tempts users to set a Boolean value expressed in our usual
105
+ "false", "off", and "0", but it only took "no". This has been
106
+ corrected so "true" and its synonyms are taken as "normal", while
107
+ "false" and its synonyms are taken as "no".
108
+ source: <20240313173214.962532-1-gitster@pobox.com>
109
105
- Documentation mark-up fix.
106
- source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
110
111
+* jk/drop-hg-to-git (2024-03-20) 1 commit
112
+ (merged to 'next' on 2024-03-21 at 603d614310)
113
+ + contrib: drop hg-to-git script
114
109
-* jc/index-pack-fsck-levels (2024-03-15) 1 commit
110
- (merged to 'next' on 2024-03-18 at 243c5f4125)
111
- + t5300: fix test_with_bad_commit()
115
+ Remove an ancient and not well maintained Hg-to-git migration
116
+ script from contrib/.
117
113
- Test fix.
114
- source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
118
+ Acked-by: Stelian Pop <stelian@popies.net>
119
+ cf. <37e4cd61-b370-437e-bd42-f98f47d3ad32@popies.net>
120
+ source: <20240320094824.GA2445978@coredump.intra.peff.net>
121
122
117
-* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
118
- (merged to 'next' on 2024-03-18 at 180db8ec38)
119
- + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
123
+* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
124
+ (merged to 'next' on 2024-03-21 at 96801520db)
125
+ + diff.*Prefix: use camelCase in the doc and test titles
126
+ + diff: add diff.srcPrefix and diff.dstPrefix configuration variables
127
121
- "git bugreport --no-suffix" was not supported and instead
122
- segfaulted, which has been corrected.
123
- source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
128
+ "git diff" and friends learned two extra configuration variables,
129
+ diff.srcPrefix and diff.dstPrefix.
130
+ source: <20240315010310.GA1901653@quokka>
131
+ source: <xmqq8r2ioh19.fsf@gitster.g>
132
133
126
-* rj/restore-plug-leaks (2024-03-14) 1 commit
127
- (merged to 'next' on 2024-03-15 at ac10ae7892)
128
- + checkout: plug some leaks in git-restore
134
+* rs/t-prio-queue-fixes (2024-03-18) 2 commits
135
+ (merged to 'next' on 2024-03-21 at 0730741187)
136
+ + t-prio-queue: check result array bounds
137
+ + t-prio-queue: shorten array index message
138
130
- Leaks from "git restore" have been plugged.
131
- source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com>
139
+ Test clean-up.
140
+ source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
141
142
--------------------------------------------------
143
[New Topics]
144
145
+* ew/khash-to-khashl (2024-03-28) 3 commits
146
+ - khashl: fix ensemble lookups on empty table
147
+ - treewide: switch to khashl for memory savings
148
+ - list-objects-filter: use kh_size API
149
+
150
+ The hashtable library "khash.h" has been replaced with "khashl.h"
151
+ that has better memory usage characteristics.
152
+
153
+ Needs review.
154
+ source: <20240328101356.300374-1-e@80x24.org>
155
+
156
+
157
+* ps/reftable-block-iteration-optim (2024-03-27) 9 commits
158
+ - reftable/block: reuse `zstream` state on inflation
159
+ - reftable/block: open-code call to `uncompress2()`
160
+ - reftable/block: reuse uncompressed blocks
161
+ - reftable/reader: iterate to next block in place
162
+ - reftable/block: move ownership of block reader into `struct table_iter`
163
+ - reftable/block: introduce `block_reader_release()`
164
+ - reftable/block: better grouping of functions
165
+ - reftable/block: merge `block_iter_seek()` and `block_reader_seek()`
166
+ - reftable/block: rename `block_reader_start()`
167
+
168
+ The code to iterate over reftable blocks has seen some optimization
169
+ to reduce memory allocation and deallocation.
170
+
171
+ Needs review.
172
+ source: <cover.1711519925.git.ps@pks.im>
173
+
174
+
175
+* rj/add-p-explicit-reshow (2024-03-28) 2 commits
176
+ - add-patch: do not print hunks repeatedly
177
+ - add-patch: introduce 'p' in interactive-patch
178
+
179
+ "git add -p" and other "interactive hunk selection" UI has learned to
180
+ skip showing the hunk immediately after it has already been shown, and
181
+ an additional action to explicitly ask to reshow the current hunk.
182
+
183
+ Will merge to 'next'?
184
+ source: <60d978d0-f69a-4b65-b4ba-d30dac8f112a@gmail.com>
185
+
186
+--------------------------------------------------
187
+[Cooking]
188
+
189
* az/grep-group-error-message-update (2024-03-25) 1 commit
137
- - grep: improve errors for unmatched ( and )
190
+ (merged to 'next' on 2024-03-27 at 567bf00ed4)
191
+ + grep: improve errors for unmatched ( and )
192
193
Error message clarification.
194
141
- Will merge to 'next'.
195
+ Will merge to 'master'.
196
source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>
197
198
145
-* bc/credential-scheme-enhancement (2024-03-25) 13 commits
146
- - credential: add support for multistage credential rounds
147
- - strvec: implement swapping two strvecs
148
- - t5563: refactor for multi-stage authentication
149
- - docs: set a limit on credential line length
150
- - credential: enable state capability
151
- - credential: add an argument to keep state
152
- - http: add support for authtype and credential
153
- - docs: indicate new credential protocol fields
154
- - credential: gate new fields on capability
155
- - credential: add a field for pre-encoded credentials
156
- - http: use new headers for each object request
157
- - remote-curl: reset headers on new request
158
- - credential: add an authtype field
199
+* bc/credential-scheme-enhancement (2024-03-27) 12 commits
200
+ . credential: add support for multistage credential rounds
201
+ . t5563: refactor for multi-stage authentication
202
+ . docs: set a limit on credential line length
203
+ . credential: enable state capability
204
+ . credential: add an argument to keep state
205
+ . http: add support for authtype and credential
206
+ . docs: indicate new credential protocol fields
207
+ . credential: gate new fields on capability
208
+ . credential: add a field for pre-encoded credentials
209
+ . http: use new headers for each object request
210
+ . remote-curl: reset headers on new request
211
+ . credential: add an authtype field
212
213
The credential helper protocol, together with the HTTP layer, have
214
been enhanced to support authentication schemes different from
215
username & password pair, like Bearer and NTLM.
216
164
- Needs review.
217
+ Expecting a reroll.
218
+ cf. <ZgSQ5o_KyqDaxz1m@tapette.crustytoothpaste.net>
219
source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
220
221
222
* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
169
- - pretty: find pretty formats case-insensitively
170
- - pretty: update tests to use `test_config`
223
+ (merged to 'next' on 2024-03-28 at e2749914ab)
224
+ + pretty: find pretty formats case-insensitively
225
+ + pretty: update tests to use `test_config`
226
227
The "--pretty=<shortHand>" option of the commands in the "git log"
228
family, defined as "[pretty] shortHand = <expansion>" should have
229
been looked up case insensitively, but was not, which has been
230
corrected.
231
177
- Will merge to 'next'.
232
+ Will merge to 'master'.
233
source: <20240324214316.917513-1-brianmlyles@gmail.com>
234
235
236
* ds/grep-doc-updates (2024-03-25) 2 commits
182
- - grep docs: describe --no-index further and improve formatting a bit
183
- - grep docs: describe --recurse-submodules further and improve formatting a bit
237
+ (merged to 'next' on 2024-03-27 at 681f08cbc5)
238
+ + grep docs: describe --no-index further and improve formatting a bit
239
+ + grep docs: describe --recurse-submodules further and improve formatting a bit
240
241
Documentation updates.
242
187
- Will merge to 'next'.
243
+ Will merge to 'master'.
244
source: <cover.1711398665.git.dsimic@manjaro.org>
245
246
@@ -212,12 +268,13 @@ Release tarballs are available at:
268
269
270
* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
215
- - t/README: mention test files are make targets
271
+ (merged to 'next' on 2024-03-27 at 9ef22a39b6)
272
+ + t/README: mention test files are make targets
273
274
The README now gives a hint on running individual tests in the "t/"
275
directory with "make t<num>-*.sh t<num>-*.sh".
276
220
- Will merge to 'next'.
277
+ Will merge to 'master'.
278
source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>
279
280
@@ -237,25 +294,25 @@ Release tarballs are available at:
294
295
296
* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
240
- - midx: use strvec_pushf() for pack-objects base name
297
+ (merged to 'next' on 2024-03-27 at 16969df3e8)
298
+ + midx: use strvec_pushf() for pack-objects base name
299
300
Code clean-up.
301
244
- Will merge to 'next'.
302
+ Will merge to 'master'.
303
source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>
304
305
306
* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
249
- - cat-file: use strbuf_expand_bad_format()
250
- - factor out strbuf_expand_bad_format()
307
+ (merged to 'next' on 2024-03-27 at 1f9dbf70a0)
308
+ + cat-file: use strbuf_expand_bad_format()
309
+ + factor out strbuf_expand_bad_format()
310
311
Code clean-up.
312
254
- Will merge to 'next'.
313
+ Will merge to 'master'.
314
source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>
315
257
---------------------------------------------------
258
-[Cooking]
316
317
* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
318
(merged to 'next' on 2024-03-25 at 7c3dd28ca5)
@@ -267,20 +324,6 @@ Release tarballs are available at:
324
source: <20240320091748.GA2444639@coredump.intra.peff.net>
325
326
270
-* jk/drop-hg-to-git (2024-03-20) 1 commit
271
- (merged to 'next' on 2024-03-21 at 603d614310)
272
- + contrib: drop hg-to-git script
273
-
274
- Remove an ancient and not well maintained Hg-to-git migration
275
- script from contrib/.
276
-
277
- Acked-by: Stelian Pop <stelian@popies.net>
278
- cf. <37e4cd61-b370-437e-bd42-f98f47d3ad32@popies.net>
279
-
280
- Will merge to 'master'.
281
- source: <20240320094824.GA2445978@coredump.intra.peff.net>
282
-
283
-
327
* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
328
(merged to 'next' on 2024-03-25 at 4d3d391330)
329
+ reftable: fix tests being broken by NFS' delete-after-close semantics
@@ -334,10 +377,10 @@ Release tarballs are available at:
377
- config: repo_config_get_expiry()
378
- Documentation/technical: describe pseudo-merge bitmaps format
379
337
- The pack-bitmap machinery has been extended to write bitmaps for
338
- pseudo-merges, which are imaginary commits which act as octopus
339
- merges covering groups of the un-bitmapped parts of history at
340
- reference tips. This is good for ... what ...?
380
+ The pack-bitmap machinery learned to write pseudo-merge bitmaps,
381
+ which act as imaginary octopus merges covering un-bitmapped
382
+ reference tips. This enhances bitmap coverage, and thus,
383
+ performance, for repositories with many references using bitmaps.
384
385
Expecting a reroll.
386
cf. <ZfyxCLpjbaScIdWA@nand.local>
@@ -345,14 +388,15 @@ Release tarballs are available at:
388
389
390
* jc/release-notes-entry-experiment (2024-03-26) 1 commit
348
- - SubmittingPatches: release-notes entry experiment
391
+ (merged to 'next' on 2024-03-27 at 74ebe224e9)
392
+ + SubmittingPatches: release-notes entry experiment
393
394
Introduce an experimental protocol for contributors to propose the
395
topic description to be used in the "What's cooking" report, the
396
merge commit message for the topic, and in the release notes and
397
document it in the SubmittingPatches document.
398
355
- Will merge to 'next'.
399
+ Will merge to 'master'.
400
source: <xmqq8r26eyva.fsf@gitster.g>
401
402
@@ -366,7 +410,7 @@ Release tarballs are available at:
410
source: <20240322103502.GA2045297@coredump.intra.peff.net>
411
412
369
-* dg/myfirstobjectwalk-updates (2024-03-26) 5 commits
413
+* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
414
- MyFirstObjectWalk: add stderr to pipe processing
415
- MyFirstObjectWalk: fix description for counting omitted objects
416
- MyFirstObjectWalk: fix filtered object walk
@@ -375,9 +419,8 @@ Release tarballs are available at:
419
420
Update a more recent tutorial doc.
421
378
- Waiting for the final Ack.
379
- cf. <xmqqo7b1apx3.fsf@gitster.g>
380
- source: <cover.1711368498.git.dirk@gouders.net>
422
+ Will merge to 'next'?
423
+ source: <cover.1711537370.git.dirk@gouders.net>
424
425
426
* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
@@ -394,14 +437,18 @@ Release tarballs are available at:
437
source: <cover.1711001016.git.dsimic@manjaro.org>
438
439
397
-* jc/apply-parse-diff-git-header-names-fix (2024-03-19) 1 commit
398
- - apply: parse names out of "diff --git" more carefully
440
+* jc/apply-parse-diff-git-header-names-fix (2024-03-28) 2 commits
441
+ (merged to 'next' on 2024-03-28 at a35de15836)
442
+ + t4126: make sure a directory with SP at the end is usable
443
+ (merged to 'next' on 2024-03-27 at d586367985)
444
+ + apply: parse names out of "diff --git" more carefully
445
446
"git apply" failed to extract the filename the patch applied to,
447
when the change was about an empty file created in or deleted from
448
a directory whose name ends with a SP, which has been corrected.
449
404
- Needs review.
450
+ Will merge to 'master'.
451
+ source: <xmqqh6gqt674.fsf_-_@gitster.g>
452
source: <xmqqfrwlltjn.fsf@gitster.g>
453
454
@@ -433,6 +480,8 @@ Release tarballs are available at:
480
(this branch uses la/format-trailer-info.)
481
482
The trailer API has been reshuffled a bit.
483
+
484
+ Needs review.
485
source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>
486
487
@@ -451,17 +500,6 @@ Release tarballs are available at:
500
source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
501
502
454
-* rs/t-prio-queue-fixes (2024-03-18) 2 commits
455
- (merged to 'next' on 2024-03-21 at 0730741187)
456
- + t-prio-queue: check result array bounds
457
- + t-prio-queue: shorten array index message
458
-
459
- Test clean-up.
460
-
461
- Will merge to 'master'.
462
- source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
463
-
464
-
503
* ps/pack-refs-auto (2024-03-25) 16 commits
504
- builtin/gc: pack refs when using `git maintenance run --auto`
505
- builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
@@ -490,33 +528,6 @@ Release tarballs are available at:
528
source: <cover.1711360631.git.ps@pks.im>
529
530
493
-* jc/show-untracked-false (2024-03-13) 2 commits
494
- (merged to 'next' on 2024-03-21 at 6d1f5603c6)
495
- + status: allow --untracked=false and friends
496
- + status: unify parsing of --untracked= and status.showUntrackedFiles
497
-
498
- The status.showUntrackedFiles configuration variable had a name
499
- that tempts users to set a Boolean value expressed in our usual
500
- "false", "off", and "0", but it only took "no". This has been
501
- corrected so "true" and its synonyms are taken as "normal", while
502
- "false" and its synonyms are taken as "no".
503
-
504
- Will merge to 'master'.
505
- source: <20240313173214.962532-1-gitster@pobox.com>
506
-
507
-
508
-* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
509
- (merged to 'next' on 2024-03-21 at 96801520db)
510
- + diff.*Prefix: use camelCase in the doc and test titles
511
- + diff: add diff.srcPrefix and diff.dstPrefix configuration variables
512
-
513
- "git diff" and friends learned two extra configuration variables.
514
-
515
- Will merge to 'master'.
516
- source: <20240315010310.GA1901653@quokka>
517
- source: <xmqq8r2ioh19.fsf@gitster.g>
518
-
519
-
531
* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
532
(merged to 'next' on 2024-03-25 at 8d11bd8bd4)
533
+ t5601: exercise clones with "includeIf.*.onbranch"
@@ -527,23 +538,13 @@ Release tarballs are available at:
538
source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
539
540
530
-* bt/fuzz-config-parse (2024-03-15) 1 commit
531
- (merged to 'next' on 2024-03-21 at 6e9f331d68)
532
- + fuzz: add fuzzer for config parsing
533
-
534
- A new fuzz target that exercises config parsing code.
535
-
536
- Will merge to 'master'.
537
- source: <pull.1692.v2.git.1710481652130.gitgitgadget@gmail.com>
538
-
539
-
541
* ds/doc-config-reflow (2024-03-14) 1 commit
542
- config.txt: perform some minor reformatting
543
544
Reflow a paragraph in the documentation source without any effect
545
to the formatted text.
546
546
- Comments?
547
+ Will discard.
548
source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>
549
550
@@ -562,16 +563,16 @@ Release tarballs are available at:
563
564
565
* rs/config-comment (2024-03-15) 3 commits
565
- - config: allow tweaking whitespace between value and comment
566
- - config: fix --comment formatting
567
- - config: add --comment option to add a comment
566
+ (merged to 'next' on 2024-03-28 at 83eaadc2b6)
567
+ + config: allow tweaking whitespace between value and comment
568
+ + config: fix --comment formatting
569
+ + config: add --comment option to add a comment
570
571
"git config" learned "--comment=<message>" option to leave a
572
comment immediately after the "variable = value" on the same line
573
in the configuration file.
574
573
- Waiting for review response.
574
- cf. <xmqq8r2jp2eq.fsf@gitster.g>
575
+ Will merge to 'master'.
576
source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>
577
578
@@ -592,13 +593,14 @@ Release tarballs are available at:
593
594
595
* bl/cherry-pick-empty (2024-03-25) 7 commits
595
- - cherry-pick: add `--empty` for more robust redundant commit handling
596
- - cherry-pick: enforce `--keep-redundant-commits` incompatibility
597
- - sequencer: do not require `allow_empty` for redundant commit options
598
- - sequencer: handle unborn branch with `--allow-empty`
599
- - rebase: update `--empty=ask` to `--empty=stop`
600
- - docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
601
- - docs: address inaccurate `--empty` default with `--exec`
596
+ (merged to 'next' on 2024-03-28 at 22e8e4a68e)
597
+ + cherry-pick: add `--empty` for more robust redundant commit handling
598
+ + cherry-pick: enforce `--keep-redundant-commits` incompatibility
599
+ + sequencer: do not require `allow_empty` for redundant commit options
600
+ + sequencer: handle unborn branch with `--allow-empty`
601
+ + rebase: update `--empty=ask` to `--empty=stop`
602
+ + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
603
+ + docs: address inaccurate `--empty` default with `--exec`
604
605
Allow git-cherry-pick(1) to automatically drop redundant commits via
606
a new `--empty` option, similar to the `--empty` options for
@@ -606,7 +608,7 @@ Release tarballs are available at:
608
`--keep-redundant-commits` as well as some related docs changes and
609
sequencer code cleanup.
610
609
- Will merge to 'next'?
611
+ Will merge to 'master'.
612
cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
613
source: <20240119060721.3734775-2-brianmlyles@gmail.com>
614
@@ -625,40 +627,45 @@ Release tarballs are available at:
627
628
629
* jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits
628
- - transport-helper: send "true" value for object-format option
629
- - transport-helper: drop "object-format <algo>" option
630
- - transport-helper: use write helpers more consistently
630
+ (merged to 'next' on 2024-03-27 at 5c9d5be660)
631
+ + transport-helper: send "true" value for object-format option
632
+ + transport-helper: drop "object-format <algo>" option
633
+ + transport-helper: use write helpers more consistently
634
635
The implementation and documentation of "object-format" option
636
exchange between the Git itself and its remote helpers did not
637
quite match.
638
+
639
+ Will merge to 'master'.
640
source: <20240320093226.GA2445531@coredump.intra.peff.net>
641
642
638
-* jk/core-comment-string (2024-03-12) 16 commits
639
- - config: allow multi-byte core.commentChar
640
- - environment: drop comment_line_char compatibility macro
641
- - wt-status: drop custom comment-char stringification
642
- - sequencer: handle multi-byte comment characters when writing todo list
643
- - find multi-byte comment chars in unterminated buffers
644
- - find multi-byte comment chars in NUL-terminated strings
645
- - prefer comment_line_str to comment_line_char for printing
646
- - strbuf: accept a comment string for strbuf_add_commented_lines()
647
- - strbuf: accept a comment string for strbuf_commented_addf()
648
- - strbuf: accept a comment string for strbuf_stripspace()
649
- - environment: store comment_line_char as a string
650
- - strbuf: avoid shadowing global comment_line_char name
651
- - commit: refactor base-case of adjust_comment_line_char()
652
- - strbuf: avoid static variables in strbuf_add_commented_lines()
653
- - strbuf: simplify comment-handling in add_lines() helper
654
- - config: forbid newline as core.commentChar
643
+* jk/core-comment-string (2024-03-27) 17 commits
644
+ (merged to 'next' on 2024-03-28 at fbf8eb9331)
645
+ + config: add core.commentString
646
+ + config: allow multi-byte core.commentChar
647
+ + environment: drop comment_line_char compatibility macro
648
+ + wt-status: drop custom comment-char stringification
649
+ + sequencer: handle multi-byte comment characters when writing todo list
650
+ + find multi-byte comment chars in unterminated buffers
651
+ + find multi-byte comment chars in NUL-terminated strings
652
+ + prefer comment_line_str to comment_line_char for printing
653
+ + strbuf: accept a comment string for strbuf_add_commented_lines()
654
+ + strbuf: accept a comment string for strbuf_commented_addf()
655
+ + strbuf: accept a comment string for strbuf_stripspace()
656
+ + environment: store comment_line_char as a string
657
+ + strbuf: avoid shadowing global comment_line_char name
658
+ + commit: refactor base-case of adjust_comment_line_char()
659
+ + strbuf: avoid static variables in strbuf_add_commented_lines()
660
+ + strbuf: simplify comment-handling in add_lines() helper
661
+ + config: forbid newline as core.commentChar
662
663
core.commentChar used to be limited to a single byte, but has been
664
updated to allow an arbitrary multi-byte sequence.
665
659
- Waiting for the discussion to settle.
660
- cf. <20240315081041.GA1753560@coredump.intra.peff.net>
666
+ Will merge to 'master'.
667
source: <20240312091013.GA95442@coredump.intra.peff.net>
668
+ source: <20240327081922.GA830163@coredump.intra.peff.net>
669
670
671
* js/build-fuzz-more-often (2024-03-05) 3 commits
@@ -670,17 +677,18 @@ Release tarballs are available at:
677
that are used in fuzzer tests, to make sure at least they build
678
without bitrot, in Linux CI runs.
679
673
- Comments?
680
+ Stalled.
681
+ cf. <xmqq1q7w8xx6.fsf@gitster.g>
682
source: <cover.1709673020.git.steadmon@google.com>
683
684
677
-* sj/userdiff-c-sharp (2024-03-06) 1 commit
685
+* sj/userdiff-c-sharp (2024-03-28) 1 commit
686
- userdiff: better method/property matching for C#
687
688
The userdiff patterns for C# has been updated.
689
690
Needs review.
683
- source: <pull.1682.v2.git.git.1709756493673.gitgitgadget@gmail.com>
691
+ source: <pull.1682.v4.git.git.1711653257043.gitgitgadget@gmail.com>
692
693
694
* cw/git-std-lib (2024-02-28) 4 commits
@@ -776,45 +784,6 @@ Release tarballs are available at:
784
source: <cover.1706741516.git.me@ttaylorr.com>
785
786
779
-* eb/hash-transition (2023-10-02) 30 commits
780
- (merged to 'next' on 2024-03-11 at 9cff2e4ab7)
781
- + t1016-compatObjectFormat: add tests to verify the conversion between objects
782
- + t1006: test oid compatibility with cat-file
783
- + t1006: rename sha1 to oid
784
- + test-lib: compute the compatibility hash so tests may use it
785
- + builtin/ls-tree: let the oid determine the output algorithm
786
- + object-file: handle compat objects in check_object_signature
787
- + tree-walk: init_tree_desc take an oid to get the hash algorithm
788
- + builtin/cat-file: let the oid determine the output algorithm
789
- + rev-parse: add an --output-object-format parameter
790
- + repository: implement extensions.compatObjectFormat
791
- + object-file: update object_info_extended to reencode objects
792
- + object-file-convert: convert commits that embed signed tags
793
- + object-file-convert: convert commit objects when writing
794
- + object-file-convert: don't leak when converting tag objects
795
- + object-file-convert: convert tag objects when writing
796
- + object-file-convert: add a function to convert trees between algorithms
797
- + object: factor out parse_mode out of fast-import and tree-walk into in object.h
798
- + cache: add a function to read an OID of a specific algorithm
799
- + tag: sign both hashes
800
- + commit: export add_header_signature to support handling signatures on tags
801
- + commit: convert mergetag before computing the signature of a commit
802
- + commit: write commits for both hashes
803
- + object-file: add a compat_oid_in parameter to write_object_file_flags
804
- + object-file: update the loose object map when writing loose objects
805
- + loose: compatibilty short name support
806
- + loose: add a mapping between SHA-1 and SHA-256 for loose objects
807
- + repository: add a compatibility hash algorithm
808
- + object-names: support input of oids in any supported hash
809
- + oid-array: teach oid-array to handle multiple kinds of oids
810
- + object-file-convert: stubs for converting from one object format to another
811
-
812
- Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
813
-
814
- Will merge to 'master'?
815
- source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
816
-
817
-
787
* jc/rerere-cleanup (2023-08-25) 4 commits
788
- rerere: modernize use of empty strbuf
789
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error