What's cooking (2024/03 #07)
Junio C Hamano committed
Mar 22, 2024 at 15:09 UTC
3701f6fa8cfb573aa75d34acb2e6041c264fdfa5
1 file changed
+296
-212
whats-cooking.txt
+296
-212
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2024, #06; Wed, 20)
3
-X-master-at: 3bd955d26919e149552f34aacf8a4e6368c26cec
4
-X-next-at: fe251e3e4dec6a6d677e61d53b316c06da172af2
2
+Subject: What's cooking in git.git (Mar 2024, #07; Fri, 22)
3
+X-master-at: 11c821f2f2a31e70fb5cc449f9a29401c333aad2
4
+X-next-at: 2796f347adbd255e43ba5d93f092851042834c28
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2024, #06; Wed, 20)
7
+What's cooking in git.git (Mar 2024, #07; Fri, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,9 +45,256 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* bb/iso-strict-utc (2024-03-13) 1 commit
52
+ (merged to 'next' on 2024-03-14 at d2ac616873)
53
+ + date: make "iso-strict" conforming for the UTC timezone
54
+
55
+ The output format for dates "iso-strict" has been tweaked to show
56
+ a time in the Zulu timezone with "Z" suffix, instead of "+00:00".
57
+ source: <20240313225423.11373-1-dev+git@drbeat.li>
58
+
59
+
60
+* bb/t0006-negative-tz-offset (2024-03-14) 1 commit
61
+ (merged to 'next' on 2024-03-14 at 3f4751b6b2)
62
+ + t0006: add more tests with a negative TZ offset
63
+
64
+ More tests on showing time with negative TZ offset.
65
+ source: <20240314085512.1827031-1-dev+git@drbeat.li>
66
+
67
+
68
+* dg/user-manual-hash-example (2024-03-12) 1 commit
69
+ (merged to 'next' on 2024-03-14 at 767800d3a7)
70
+ + Documentation/user-manual.txt: example for generating object hashes
71
+
72
+ User manual (the original one) update.
73
+ source: <20240312104238.4920-2-dirk@gouders.net>
74
+
75
+
76
+* fs/find-end-of-log-message-fix (2024-03-07) 1 commit
77
+ (merged to 'next' on 2024-03-13 at 2bed63caaf)
78
+ + wt-status: don't find scissors line beyond buf len
79
+
80
+ The code to find the effective end of log message can fall into an
81
+ endless loop, which has been corrected.
82
+ cf. <08b9b37d-f0f8-4c1a-b72e-194202ff3d9f@nutanix.com>
83
+ source: <20240307183743.219951-1-flosch@nutanix.com>
84
+
85
+
86
+* ja/doc-markup-fixes (2024-03-11) 6 commits
87
+ (merged to 'next' on 2024-03-14 at 4d1c26143f)
88
+ + doc: git-clone: format placeholders
89
+ + doc: git-clone: format verbatim words
90
+ + doc: git-init: rework config item init.templateDir
91
+ + doc: git-init: rework definition lists
92
+ + doc: git-init: format placeholders
93
+ + doc: git-init: format verbatim parts
94
+
95
+ Mark-ups used in the documentation has been improved for
96
+ consistency.
97
+ source: <pull.1687.git.1710097830.gitgitgadget@gmail.com>
98
+
99
+
100
+* jc/safe-implicit-bare (2024-03-11) 1 commit
101
+ (merged to 'next' on 2024-03-14 at e8bdbed1a4)
102
+ + setup: notice more types of implicit bare repositories
103
+
104
+ Users with safe.bareRepository=explicit can still work from within
105
+ $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/)
106
+ of the primary worktree without explicitly specifying the $GIT_DIR
107
+ environment variable or the --git-dir=<path> option.
108
+ source: <xmqq5xxv0ywi.fsf_-_@gitster.g>
109
+
110
+
111
+* jw/doc-show-untracked-files-fix (2024-03-13) 1 commit
112
+ (merged to 'next' on 2024-03-14 at 091f64ad6c)
113
+ + doc: status.showUntrackedFiles does not take "false"
114
+
115
+ The status.showUntrackedFiles configuration variable was
116
+ incorrectly documented to accept "false", which has been corrected.
117
+ source: <pull.1686.git.git.1710279251901.gitgitgadget@gmail.com>
118
+
119
+
120
+* pb/ci-win-artifact-names-fix (2024-03-11) 1 commit
121
+ (merged to 'next' on 2024-03-14 at 5076389536)
122
+ + ci(github): make Windows test artifacts name unique
123
+
124
+ CI update.
125
+ source: <pull.1688.git.1710101097072.gitgitgadget@gmail.com>
126
+
127
+
128
+* ps/reftable-block-search-fix (2024-03-07) 2 commits
129
+ (merged to 'next' on 2024-03-13 at 34938e24ab)
130
+ + reftable/block: fix binary search over restart counter
131
+ + reftable/record: fix memory leak when decoding object records
132
+
133
+ The reftable code has its own custom binary search function whose
134
+ comparison callback has an unusual interface, which caused the
135
+ binary search to degenerate into a linear search, which has been
136
+ corrected.
137
+ source: <cover.1709843663.git.ps@pks.im>
138
+
139
+
140
+* ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits
141
+ (merged to 'next' on 2024-03-14 at 72465c29be)
142
+ + refs/reftable: track last log record name via strbuf
143
+ + reftable/record: use scratch buffer when decoding records
144
+ + reftable/record: reuse message when decoding log records
145
+ + reftable/record: reuse refnames when decoding log records
146
+ + reftable/record: avoid copying author info
147
+ + reftable/record: convert old and new object IDs to arrays
148
+ + refs/reftable: reload correct stack when creating reflog iter
149
+ + Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf
150
+
151
+ The code to iterate over reflogs in the reftable has been optimized
152
+ to reduce memory allocation and deallocation.
153
+
154
+ Reviewed-by: Josh Steadmon <steadmon@google.com>
155
+ cf. <Ze9eX-aaWoVaqsPP@google.com>
156
+ source: <cover.1709640322.git.ps@pks.im>
157
+
158
+
159
+* ps/reftable-stack-tempfile (2024-03-07) 4 commits
160
+ (merged to 'next' on 2024-03-13 at dcfb0cde8c)
161
+ + reftable/stack: register compacted tables as tempfiles
162
+ + reftable/stack: register lockfiles during compaction
163
+ + reftable/stack: register new tables as tempfiles
164
+ + lockfile: report when rollback fails
165
+ (this branch is used by ps/pack-refs-auto.)
166
+
167
+ The code in reftable backend that creates new table files works
168
+ better with the tempfile framework to avoid leaving cruft after a
169
+ failure.
170
+ source: <cover.1709816483.git.ps@pks.im>
171
+
172
+
173
+* rs/opt-parse-long-fixups (2024-03-03) 6 commits
174
+ (merged to 'next' on 2024-03-13 at 3755b50794)
175
+ + parse-options: rearrange long_name matching code
176
+ + parse-options: normalize arg and long_name before comparison
177
+ + parse-options: detect ambiguous self-negation
178
+ + parse-options: factor out register_abbrev() and struct parsed_option
179
+ + parse-options: set arg of abbreviated option lazily
180
+ + parse-options: recognize abbreviated negated option with arg
181
+
182
+ The parse-options code that deals with abbreviated long option
183
+ names have been cleaned up.
184
+
185
+ Reviewed-by: Josh Steadmon <steadmon@google.com>
186
+ cf. <ZfDM5Or3EKw7Q9SA@google.com>
187
+ source: <20240303121944.20627-1-l.s.r@web.de>
188
+
189
--------------------------------------------------
190
[New Topics]
191
192
+* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
193
+ - doc/gitremote-helpers: fix more missing single-quotes
194
+
195
+ Documentation mark-up fix.
196
+
197
+ Will merge to 'next'.
198
+ source: <20240320091748.GA2444639@coredump.intra.peff.net>
199
+
200
+
201
+* jk/drop-hg-to-git (2024-03-20) 1 commit
202
+ (merged to 'next' on 2024-03-21 at 603d614310)
203
+ + contrib: drop hg-to-git script
204
+
205
+ Remove an ancient and not well maintained Hg-to-git migration
206
+ script from contrib/.
207
+
208
+ Acked-by: Stelian Pop <stelian@popies.net>
209
+ cf. <37e4cd61-b370-437e-bd42-f98f47d3ad32@popies.net>
210
+
211
+ Will merge to 'master'.
212
+ source: <20240320094824.GA2445978@coredump.intra.peff.net>
213
+
214
+
215
+* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
216
+ - reftable: fix tests being broken by NFS' delete-after-close semantics
217
+
218
+ A unit test for reftable code tried to enumerate all files in a
219
+ directory after reftable operations and expected to see nothing but
220
+ the files it wanted to leave there, but was fooled by .nfs* cruft
221
+ files left, which has been corrected.
222
+
223
+ Will merge to 'next'.
224
+ source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>
225
+
226
+
227
+* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
228
+ - t/README: document how to loop around test cases
229
+ - t7800: use single quotes for test bodies
230
+ - t7800: improve test descriptions with empty arguments
231
+
232
+ Fix the way recently added tests interpolate variables defined
233
+ outside them, and document the best practice to help future
234
+ developers.
235
+
236
+ Will merge to 'next'.
237
+ source: <cover.1711074118.git.ps@pks.im>
238
+
239
+
240
+* tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
241
+ - t/perf: implement performace tests for pseudo-merge bitmaps
242
+ - pseudo-merge: implement support for finding existing merges
243
+ - ewah: `bitmap_equals_ewah()`
244
+ - pack-bitmap: extra trace2 information
245
+ - pack-bitmap.c: use pseudo-merges during traversal
246
+ - t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`
247
+ - pack-bitmap: implement test helpers for pseudo-merge
248
+ - ewah: implement `ewah_bitmap_popcount()`
249
+ - pseudo-merge: implement support for reading pseudo-merge commits
250
+ - pack-bitmap.c: read pseudo-merge extension
251
+ - pseudo-merge: scaffolding for reads
252
+ - pack-bitmap: extract `read_bitmap()` function
253
+ - pack-bitmap-write.c: write pseudo-merge table
254
+ - pack-bitmap-write.c: select pseudo-merge commits
255
+ - pseudo-merge: implement support for selecting pseudo-merge commits
256
+ - pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public
257
+ - pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`
258
+ - pack-bitmap-write: support storing pseudo-merge commits
259
+ - pseudo-merge.ch: initial commit
260
+ - pack-bitmap: move some initialization to `bitmap_writer_init()`
261
+ - pack-bitmap: drop unused `max_bitmaps` parameter
262
+ - ewah: implement `ewah_bitmap_is_subset()`
263
+ - config: repo_config_get_expiry()
264
+ - Documentation/technical: describe pseudo-merge bitmaps format
265
+
266
+ The pack-bitmap machinery has been extended to write bitmaps for
267
+ pseudo-merges, which are imaginary commits which act as octopus
268
+ merges covering groups of the un-bitmapped parts of history at
269
+ reference tips. This is good for ... what ...?
270
+
271
+ Expecting a reroll.
272
+ cf. <ZfyxCLpjbaScIdWA@nand.local>
273
+ source: <cover.1710972293.git.me@ttaylorr.com>
274
+
275
+
276
+* jc/release-notes-entry-experiment (2024-03-22) 1 commit
277
+ - SubmittingPatches: release-notes entry experiment
278
+
279
+ Introduce an experimental protocol for contributors to propose the
280
+ topic description to be used in the "What's cooking" report, the
281
+ merge commit message for the topic, and in the release notes and
282
+ document it in the SubmittingPatches document.
283
+
284
+ source: <xmqqcyrn58mf.fsf@gitster.g>
285
+
286
+
287
+* jk/rebase-apply-leakfix (2024-03-22) 1 commit
288
+ - rebase: use child_process_clear() to clean
289
+
290
+ Leakfix.
291
+
292
+ Will merge to 'next'.
293
+ source: <20240322103502.GA2045297@coredump.intra.peff.net>
294
+
295
+--------------------------------------------------
296
+[Cooking]
297
+
298
* dg/myfirstobjectwalk-updates (2024-03-19) 5 commits
299
- MyFirstObjectWalk: add stderr to pipe processing
300
- MyFirstObjectWalk: fix description for counting omitted objects
@@ -61,7 +308,7 @@ Release tarballs are available at:
308
source: <cover.1710840596.git.dirk@gouders.net>
309
310
64
-* ds/config-internal-whitespace-fix (2024-03-19) 4 commits
311
+* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
312
- config.txt: describe handling of whitespace further
313
- t1300: add more tests for whitespace and inline comments
314
- config: really keep value-internal whitespace verbatim
@@ -70,8 +317,8 @@ Release tarballs are available at:
317
"git config" corrupted literal HT characters written in the
318
configuration file as part of a value, which has been corrected.
319
73
- Expecting a reroll. Almost there.
74
- source: <cover.1710800549.git.dsimic@manjaro.org>
320
+ Will merge to 'next'.
321
+ source: <cover.1711001016.git.dsimic@manjaro.org>
322
323
324
* jc/apply-parse-diff-git-header-names-fix (2024-03-19) 1 commit
@@ -85,22 +332,22 @@ Release tarballs are available at:
332
source: <xmqqfrwlltjn.fsf@gitster.g>
333
334
88
-* jk/pretty-subject-cleanup (2024-03-19) 6 commits
89
- - format-patch: simplify after-subject MIME header handling
90
- - format-patch: return an allocated string from log_write_email_headers()
91
- - log: do not set up extra_headers for non-email formats
92
- - pretty: drop print_email_subject flag
93
- - pretty: split oneline and email subject printing
94
- - shortlog: stop setting pp.print_email_subject
335
+* jk/pretty-subject-cleanup (2024-03-22) 7 commits
336
+ (merged to 'next' on 2024-03-22 at 2796f347ad)
337
+ + format-patch: fix leak of empty header string
338
+ + format-patch: simplify after-subject MIME header handling
339
+ + format-patch: return an allocated string from log_write_email_headers()
340
+ + log: do not set up extra_headers for non-email formats
341
+ + pretty: drop print_email_subject flag
342
+ + pretty: split oneline and email subject printing
343
+ + shortlog: stop setting pp.print_email_subject
344
345
Code clean-up in the "git log" machinery that implements custom log
346
message formatting.
347
99
- Will merge to 'next'.
348
+ Will merge to 'master'.
349
source: <20240320002555.GB903718@coredump.intra.peff.net>
350
102
---------------------------------------------------
103
-[Cooking]
351
352
* bb/sh-scripts-cleanup (2024-03-16) 22 commits
353
(merged to 'next' on 2024-03-18 at 4501a04796)
@@ -194,12 +441,13 @@ Release tarballs are available at:
441
442
443
* rs/t-prio-queue-fixes (2024-03-18) 2 commits
197
- - t-prio-queue: check result array bounds
198
- - t-prio-queue: shorten array index message
444
+ (merged to 'next' on 2024-03-21 at 0730741187)
445
+ + t-prio-queue: check result array bounds
446
+ + t-prio-queue: shorten array index message
447
448
Test clean-up.
449
202
- Will merge to 'next'.
450
+ Will merge to 'master'.
451
source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
452
453
@@ -220,39 +468,18 @@ Release tarballs are available at:
468
- reftable/error: discern locked/outdated errors
469
- reftable/stack: fix error handling in `reftable_stack_init_addition()`
470
- Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
223
- (this branch uses ps/reftable-stack-tempfile.)
471
472
"git pack-refs" learned the "--auto" option, which is a useful
473
addition to be triggered from "git gc --auto".
474
228
- Needs review.
475
+ Being reviewed (Karthik e.g. <CAOLa=ZS6uF3fuor3V2F_GM__JNRpUAyLcrVDbCHsJ6JStL96cA@mail.gmail.com>)
476
source: <cover.1710706118.git.ps@pks.im>
477
478
232
-* bb/iso-strict-utc (2024-03-13) 1 commit
233
- (merged to 'next' on 2024-03-14 at d2ac616873)
234
- + date: make "iso-strict" conforming for the UTC timezone
235
-
236
- The output format for dates "iso-strict" has been tweaked to show
237
- a time in the Zulu timezone with "Z" suffix, instead of "+00:00".
238
-
239
- Will merge to 'master'.
240
- source: <20240313225423.11373-1-dev+git@drbeat.li>
241
-
242
-
243
-* dg/user-manual-hash-example (2024-03-12) 1 commit
244
- (merged to 'next' on 2024-03-14 at 767800d3a7)
245
- + Documentation/user-manual.txt: example for generating object hashes
246
-
247
- User manual (the original one) update.
248
-
249
- Will merge to 'master'.
250
- source: <20240312104238.4920-2-dirk@gouders.net>
251
-
252
-
479
* jc/show-untracked-false (2024-03-13) 2 commits
254
- - status: allow --untracked=false and friends
255
- - status: unify parsing of --untracked= and status.showUntrackedFiles
480
+ (merged to 'next' on 2024-03-21 at 6d1f5603c6)
481
+ + status: allow --untracked=false and friends
482
+ + status: unify parsing of --untracked= and status.showUntrackedFiles
483
484
The status.showUntrackedFiles configuration variable had a name
485
that tempts users to set a Boolean value expressed in our usual
@@ -260,7 +487,7 @@ Release tarballs are available at:
487
corrected so "true" and its synonyms are taken as "normal", while
488
"false" and its synonyms are taken as "no".
489
263
- Will merge to 'next'?
490
+ Will merge to 'master'.
491
source: <20240313173214.962532-1-gitster@pobox.com>
492
493
@@ -275,24 +502,14 @@ Release tarballs are available at:
502
source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
503
504
278
-* jw/doc-show-untracked-files-fix (2024-03-13) 1 commit
279
- (merged to 'next' on 2024-03-14 at 091f64ad6c)
280
- + doc: status.showUntrackedFiles does not take "false"
281
-
282
- The status.showUntrackedFiles configuration variable was
283
- incorrectly documented to accept "false", which has been corrected.
284
-
285
- Will merge to 'master'.
286
- source: <pull.1686.git.git.1710279251901.gitgitgadget@gmail.com>
287
-
288
-
505
* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
290
- - diff.*Prefix: use camelCase in the doc and test titles
291
- - diff: add diff.srcPrefix and diff.dstPrefix configuration variables
506
+ (merged to 'next' on 2024-03-21 at 96801520db)
507
+ + diff.*Prefix: use camelCase in the doc and test titles
508
+ + diff: add diff.srcPrefix and diff.dstPrefix configuration variables
509
510
"git diff" and friends learned two extra configuration variables.
511
295
- Will merge to 'next'.
512
+ Will merge to 'master'.
513
source: <20240315010310.GA1901653@quokka>
514
source: <xmqq8r2ioh19.fsf@gitster.g>
515
@@ -307,16 +524,6 @@ Release tarballs are available at:
524
source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
525
526
310
-* bb/t0006-negative-tz-offset (2024-03-14) 1 commit
311
- (merged to 'next' on 2024-03-14 at 3f4751b6b2)
312
- + t0006: add more tests with a negative TZ offset
313
-
314
- More tests on showing time with negative TZ offset.
315
-
316
- Will merge to 'master'.
317
- source: <20240314085512.1827031-1-dev+git@drbeat.li>
318
-
319
-
527
* rj/restore-plug-leaks (2024-03-14) 1 commit
528
(merged to 'next' on 2024-03-15 at ac10ae7892)
529
+ checkout: plug some leaks in git-restore
@@ -328,11 +535,12 @@ Release tarballs are available at:
535
536
537
* bt/fuzz-config-parse (2024-03-15) 1 commit
331
- - fuzz: add fuzzer for config parsing
538
+ (merged to 'next' on 2024-03-21 at 6e9f331d68)
539
+ + fuzz: add fuzzer for config parsing
540
541
A new fuzz target that exercises config parsing code.
542
335
- Will merge to 'next'?
543
+ Will merge to 'master'.
544
source: <pull.1692.v2.git.1710481652130.gitgitgadget@gmail.com>
545
546
@@ -384,39 +592,27 @@ Release tarballs are available at:
592
source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>
593
594
387
-* jc/safe-implicit-bare (2024-03-11) 1 commit
388
- (merged to 'next' on 2024-03-14 at e8bdbed1a4)
389
- + setup: notice more types of implicit bare repositories
390
-
391
- Users with safe.bareRepository=explicit can still work from within
392
- $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/)
393
- of the primary worktree without explicitly specifying the $GIT_DIR
394
- environment variable or the --git-dir=<path> option.
395
-
396
- Will merge to 'master'.
397
- source: <xmqq5xxv0ywi.fsf_-_@gitster.g>
398
-
399
-
595
* pw/checkout-conflict-errorfix (2024-03-14) 5 commits
401
- - checkout: fix interaction between --conflict and --merge
402
- - checkout: cleanup --conflict=<style> parsing
403
- - merge options: add a conflict style member
404
- - merge-ll: introduce LL_MERGE_OPTIONS_INIT
405
- - xdiff-interface: refactor parsing of merge.conflictstyle
596
+ (merged to 'next' on 2024-03-22 at 9977ac6c75)
597
+ + checkout: fix interaction between --conflict and --merge
598
+ + checkout: cleanup --conflict=<style> parsing
599
+ + merge options: add a conflict style member
600
+ + merge-ll: introduce LL_MERGE_OPTIONS_INIT
601
+ + xdiff-interface: refactor parsing of merge.conflictstyle
602
603
"git checkout --conflict=bad" reported a bad conflictStyle as if it
604
were given to a configuration variable; it has been corrected to
605
report that the command line option is bad.
606
411
- Will merge to 'next'?
607
+ Will merge to 'master'.
608
source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>
609
610
415
-* bl/cherry-pick-empty (2024-03-11) 7 commits
611
+* bl/cherry-pick-empty (2024-03-20) 7 commits
612
- cherry-pick: add `--empty` for more robust redundant commit handling
613
- cherry-pick: enforce `--keep-redundant-commits` incompatibility
614
- sequencer: do not require `allow_empty` for redundant commit options
419
- - sequencer: treat error reading HEAD as unborn branch
615
+ - sequencer: handle unborn branch with `--allow-empty`
616
- rebase: update `--empty=ask` to `--empty=stop`
617
- docs: clean up `--empty` formatting in git-rebase(1) and git-am (1)
618
- docs: address inaccurate `--empty` default with `--exec`
@@ -427,8 +623,7 @@ Release tarballs are available at:
623
`--keep-redundant-commits` as well as some related docs changes and
624
sequencer code cleanup.
625
430
- Expecting a reroll.
431
- cf. <17be81eb83ff314d.70b1dd9aae081c6e.203dcd72f6563036@zivdesk>
626
+ Will merge to 'next'?
627
source: <20240119060721.3734775-2-brianmlyles@gmail.com>
628
629
@@ -445,55 +640,15 @@ Release tarballs are available at:
640
source: <20240319183722.211300-1-ignacio@iencinas.com>
641
642
448
-* ja/doc-markup-fixes (2024-03-11) 6 commits
449
- (merged to 'next' on 2024-03-14 at 4d1c26143f)
450
- + doc: git-clone: format placeholders
451
- + doc: git-clone: format verbatim words
452
- + doc: git-init: rework config item init.templateDir
453
- + doc: git-init: rework definition lists
454
- + doc: git-init: format placeholders
455
- + doc: git-init: format verbatim parts
456
-
457
- Mark-ups used in the documentation has been improved for
458
- consistency.
459
-
460
- Will merge to 'master'.
461
- source: <pull.1687.git.1710097830.gitgitgadget@gmail.com>
462
-
463
-
464
-* jk/doc-remote-helper-object-format-option (2024-03-10) 2 commits
465
- - doc/gitremote-helpers: match object-format option docs to code
466
- - t5801: fix object-format handling in git-remote-testgit
643
+* jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits
644
+ - transport-helper: send "true" value for object-format option
645
+ - transport-helper: drop "object-format <algo>" option
646
+ - transport-helper: use write helpers more consistently
647
648
The implementation and documentation of "object-format" option
649
exchange between the Git itself and its remote helpers did not
650
quite match.
471
-
472
- Expecting a reroll.
473
- cf. <20240318085208.GA604917@coredump.intra.peff.net>
474
- source: <20240307084735.GA2072130@coredump.intra.peff.net>
475
-
476
-
477
-* pb/ci-win-artifact-names-fix (2024-03-11) 1 commit
478
- (merged to 'next' on 2024-03-14 at 5076389536)
479
- + ci(github): make Windows test artifacts name unique
480
-
481
- CI update.
482
-
483
- Will merge to 'master'.
484
- source: <pull.1688.git.1710101097072.gitgitgadget@gmail.com>
485
-
486
-
487
-* fs/find-end-of-log-message-fix (2024-03-07) 1 commit
488
- (merged to 'next' on 2024-03-13 at 2bed63caaf)
489
- + wt-status: don't find scissors line beyond buf len
490
-
491
- The code to find the effective end of log message can fall into an
492
- endless loop, which has been corrected.
493
-
494
- Will merge to 'master'.
495
- cf. <08b9b37d-f0f8-4c1a-b72e-194202ff3d9f@nutanix.com>
496
- source: <20240307183743.219951-1-flosch@nutanix.com>
651
+ source: <20240320093226.GA2445531@coredump.intra.peff.net>
652
653
654
* jk/core-comment-string (2024-03-12) 16 commits
@@ -535,41 +690,6 @@ Release tarballs are available at:
690
source: <cover.1709673020.git.steadmon@google.com>
691
692
538
-* ps/reftable-block-search-fix (2024-03-07) 2 commits
539
- (merged to 'next' on 2024-03-13 at 34938e24ab)
540
- + reftable/block: fix binary search over restart counter
541
- + reftable/record: fix memory leak when decoding object records
542
-
543
- The reftable code has its own custom binary search function whose
544
- comparison callback has an unusual interface, which caused the
545
- binary search to degenerate into a linear search, which has been
546
- corrected.
547
-
548
- Will merge to 'master'.
549
- source: <cover.1709843663.git.ps@pks.im>
550
-
551
-
552
-* ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits
553
- (merged to 'next' on 2024-03-14 at 72465c29be)
554
- + refs/reftable: track last log record name via strbuf
555
- + reftable/record: use scratch buffer when decoding records
556
- + reftable/record: reuse message when decoding log records
557
- + reftable/record: reuse refnames when decoding log records
558
- + reftable/record: avoid copying author info
559
- + reftable/record: convert old and new object IDs to arrays
560
- + refs/reftable: reload correct stack when creating reflog iter
561
- + Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf
562
-
563
- The code to iterate over reflogs in the reftable has been optimized
564
- to reduce memory allocation and deallocation.
565
-
566
- Reviewed-by: Josh Steadmon <steadmon@google.com>
567
- cf. <Ze9eX-aaWoVaqsPP@google.com>
568
-
569
- Will merge to 'master'.
570
- source: <cover.1709640322.git.ps@pks.im>
571
-
572
-
693
* sj/userdiff-c-sharp (2024-03-06) 1 commit
694
- userdiff: better method/property matching for C#
695
@@ -579,41 +699,6 @@ Release tarballs are available at:
699
source: <pull.1682.v2.git.git.1709756493673.gitgitgadget@gmail.com>
700
701
582
-* ps/reftable-stack-tempfile (2024-03-07) 4 commits
583
- (merged to 'next' on 2024-03-13 at dcfb0cde8c)
584
- + reftable/stack: register compacted tables as tempfiles
585
- + reftable/stack: register lockfiles during compaction
586
- + reftable/stack: register new tables as tempfiles
587
- + lockfile: report when rollback fails
588
- (this branch is used by ps/pack-refs-auto.)
589
-
590
- The code in reftable backend that creates new table files works
591
- better with the tempfile framework to avoid leaving cruft after a
592
- failure.
593
-
594
- Will merge to 'master'.
595
- source: <cover.1709816483.git.ps@pks.im>
596
-
597
-
598
-* rs/opt-parse-long-fixups (2024-03-03) 6 commits
599
- (merged to 'next' on 2024-03-13 at 3755b50794)
600
- + parse-options: rearrange long_name matching code
601
- + parse-options: normalize arg and long_name before comparison
602
- + parse-options: detect ambiguous self-negation
603
- + parse-options: factor out register_abbrev() and struct parsed_option
604
- + parse-options: set arg of abbreviated option lazily
605
- + parse-options: recognize abbreviated negated option with arg
606
-
607
- The parse-options code that deals with abbreviated long option
608
- names have been cleaned up.
609
-
610
- Reviewed-by: Josh Steadmon <steadmon@google.com>
611
- cf. <ZfDM5Or3EKw7Q9SA@google.com>
612
-
613
- Will merge to 'master'.
614
- source: <20240303121944.20627-1-l.s.r@web.de>
615
-
616
-
702
* cw/git-std-lib (2024-02-28) 4 commits
703
- SQUASH??? get rid of apparent debugging crufts
704
- test-stdlib: show that git-std-lib is independent
@@ -742,8 +827,7 @@ Release tarballs are available at:
827
828
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
829
745
- Will cook in 'next'.
746
- cf. <xmqqv86z5359.fsf@gitster.g>
830
+ Will merge to 'master'?
831
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
832
833