What's cooking (2023/10 #09)
Junio C Hamano committed
Oct 30, 2023 at 05:42 UTC
dc33f2c18ab545d586cbc212d686e421af22df07
1 file changed
+250
-220
whats-cooking.txt
+250
-220
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #08; Sun, 22)
3
-X-master-at: ceadf0f3cf51550166a387ec8508bb55e7883057
4
-X-next-at: 7ce3cef56b63eab50c97e020dbcc89a4d2035129
2
+Subject: What's cooking in git.git (Oct 2023, #09; Mon, 30)
3
+X-master-at: 2e8e77cbac8ac17f94eee2087187fa1718e38b14
4
+X-next-at: ea05f2083d1990e732cb98be6e05cafff493545b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #08; Sun, 22)
7
+What's cooking in git.git (Oct 2023, #09; Mon, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -51,49 +51,239 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
54
-* ak/pretty-decorate-more-fix (2023-10-09) 1 commit
55
- (merged to 'next' on 2023-10-12 at 3cbb4c2268)
56
- + pretty: fix ref filtering for %(decorate) formats
54
+* bc/racy-4gb-files (2023-10-13) 2 commits
55
+ (merged to 'next' on 2023-10-16 at c60962dfee)
56
+ + Prevent git from rehashing 4GiB files
57
+ + t: add a test helper to truncate files
58
+
59
+ The index file has room only for lower 32-bit of the file size in
60
+ the cached stat information, which means cached stat information
61
+ will have 0 in its sd_size member for a file whose size is multiple
62
+ of 4GiB. This is mistaken for a racily clean path. Avoid it by
63
+ storing a bogus sd_size value instead for such files.
64
+ source: <20231012160930.330618-1-sandals@crustytoothpaste.net>
65
58
- Unlike "git log --pretty=%D", "git log --pretty="%(decorate)" did
59
- not auto-initialize the decoration subsystem, which has been
60
- corrected.
61
- source: <20231008202307.1568477-1-andy.koppe@gmail.com>
66
67
+* en/docfixes (2023-10-09) 25 commits
68
+ (merged to 'next' on 2023-10-17 at 1e3cdeb427)
69
+ + documentation: add missing parenthesis
70
+ + documentation: add missing quotes
71
+ + documentation: add missing fullstops
72
+ + documentation: add some commas where they are helpful
73
+ + documentation: fix whitespace issues
74
+ + documentation: fix capitalization
75
+ + documentation: fix punctuation
76
+ + documentation: use clearer prepositions
77
+ + documentation: add missing hyphens
78
+ + documentation: remove unnecessary hyphens
79
+ + documentation: add missing article
80
+ + documentation: fix choice of article
81
+ + documentation: whitespace is already generally plural
82
+ + documentation: fix singular vs. plural
83
+ + documentation: fix verb vs. noun
84
+ + documentation: fix adjective vs. noun
85
+ + documentation: fix verb tense
86
+ + documentation: employ consistent verb tense for a list
87
+ + documentation: fix subject/verb agreement
88
+ + documentation: remove extraneous words
89
+ + documentation: add missing words
90
+ + documentation: fix apostrophe usage
91
+ + documentation: fix typos
92
+ + documentation: fix small error
93
+ + documentation: wording improvements
94
+
95
+ Documentation typo and grammo fixes.
96
+ source: <pull.1595.git.1696747527.gitgitgadget@gmail.com>
97
64
-* ps/rewritten-is-per-worktree-doc (2023-10-10) 1 commit
65
- (merged to 'next' on 2023-10-12 at 501b960e8c)
66
- + doc/git-worktree: mention "refs/rewritten" as per-worktree refs
98
68
- Doc update.
69
- source: <985ac850eb6e60ae76601acc8bfbcd56f99348b4.1696935657.git.ps@pks.im>
99
+* jc/fail-stash-to-store-non-stash (2023-10-11) 1 commit
100
+ (merged to 'next' on 2023-10-16 at e26db57315)
101
+ + stash: be careful what we store
102
103
+ Feeding "git stash store" with a random commit that was not created
104
+ by "git stash create" now errors out.
105
+ source: <xmqqbkd4lwj0.fsf_-_@gitster.g>
106
72
-* ty/merge-tree-strategy-options (2023-10-11) 2 commits
73
- (merged to 'next' on 2023-10-12 at 9b873601df)
74
- + merge: introduce {copy|clear}_merge_options()
75
- (merged to 'next' on 2023-09-29 at aa65b54416)
76
- + merge-tree: add -X strategy option
107
78
- "git merge-tree" learned to take strategy backend specific options
79
- via the "-X" option, like "git merge" does.
80
- source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
108
+* jk/chunk-bounds (2023-10-14) 21 commits
109
+ (merged to 'next' on 2023-10-16 at 68c9e37980)
110
+ + t5319: make corrupted large-offset test more robust
111
+ (merged to 'next' on 2023-10-10 at 21139603ce)
112
+ + chunk-format: drop pair_chunk_unsafe()
113
+ + commit-graph: detect out-of-order BIDX offsets
114
+ + commit-graph: check bounds when accessing BIDX chunk
115
+ + commit-graph: check bounds when accessing BDAT chunk
116
+ + commit-graph: bounds-check generation overflow chunk
117
+ + commit-graph: check size of generations chunk
118
+ + commit-graph: bounds-check base graphs chunk
119
+ + commit-graph: detect out-of-bounds extra-edges pointers
120
+ + commit-graph: check size of commit data chunk
121
+ + midx: check size of revindex chunk
122
+ + midx: bounds-check large offset chunk
123
+ + midx: check size of object offset chunk
124
+ + midx: enforce chunk alignment on reading
125
+ + midx: check size of pack names chunk
126
+ + commit-graph: check consistency of fanout table
127
+ + midx: check size of oid lookup chunk
128
+ + commit-graph: check size of oid fanout chunk
129
+ + midx: stop ignoring malformed oid fanout chunk
130
+ + t: add library for munging chunk-format files
131
+ + chunk-format: note that pair_chunk() is unsafe
132
+ (this branch is used by tb/pair-chunk-expect-size.)
133
+
134
+ The codepaths that read "chunk" formatted files have been corrected
135
+ to pay attention to the chunk size and notice broken files.
136
+ source: <20231009205544.GA3281950@coredump.intra.peff.net>
137
138
83
-* vd/loose-ref-iteration-optimization (2023-10-09) 4 commits
84
- (merged to 'next' on 2023-10-12 at 99e2f83855)
85
- + files-backend.c: avoid stat in 'loose_fill_ref_dir'
86
- + dir.[ch]: add 'follow_symlink' arg to 'get_dtype'
87
- + dir.[ch]: expose 'get_dtype'
88
- + ref-cache.c: fix prefix matching in ref iteration
139
+* so/diff-merges-dd (2023-10-09) 3 commits
140
+ (merged to 'next' on 2023-10-16 at 71b5e29625)
141
+ + completion: complete '--dd'
142
+ + diff-merges: introduce '--dd' option
143
+ + diff-merges: improve --diff-merges documentation
144
90
- The code to iterate over loose references have been optimized to
91
- reduce the number of lstat() system calls.
92
- source: <pull.1594.v2.git.1696888736.gitgitgadget@gmail.com>
145
+ "git log" and friends learned "--dd" that is a short-hand for
146
+ "--diff-merges=first-parent -p".
147
+ source: <20231009160535.236523-1-sorganov@gmail.com>
148
149
--------------------------------------------------
150
[New Topics]
151
152
+* ii/branch-error-messages-update (2023-10-23) 1 commit
153
+ (merged to 'next' on 2023-10-23 at 3d00599173)
154
+ + builtin/branch.c: adjust error messages to coding guidelines
155
+
156
+ Error message update.
157
+
158
+ Will merge to 'master'.
159
+ source: <20231023160656.4341-1-isokenjune@gmail.com>
160
+
161
+
162
+* jm/bisect-run-synopsis-fix (2023-10-23) 1 commit
163
+ (merged to 'next' on 2023-10-23 at 8dfa3ed356)
164
+ + doc/git-bisect: clarify `git bisect run` syntax
165
+
166
+ Doc and usage message update.
167
+
168
+ Will merge to 'master'.
169
+ source: <pull.1602.v2.git.1698088990478.gitgitgadget@gmail.com>
170
+
171
+
172
+* ar/submitting-patches-doc-update (2023-10-24) 1 commit
173
+ - SubmittingPatches: call gitk's command "Copy commit reference"
174
+
175
+ Doc update.
176
+
177
+ Will merge to 'next'.
178
+ source: <20231024195123.911431-1-rybak.a.v@gmail.com>
179
+
180
+
181
+* es/bugreport-no-extra-arg (2023-10-29) 2 commits
182
+ - bugreport: reject positional arguments
183
+ - t0091-bugreport: stop using i18ngrep
184
+
185
+ source: <20231026155459.2234929-1-nasamuffin@google.com>
186
+
187
+
188
+* js/my-first-contribution-update (2023-10-28) 1 commit
189
+ - Include gettext.h in MyFirstContribution tutorial
190
+
191
+ source: <20231017041503.3249-1-jacob@initialcommit.io>
192
+
193
+
194
+* ms/send-email-validate-fix (2023-10-26) 1 commit
195
+ - send-email: move validation code below process_address_list
196
+
197
+ source: <ddd4bfdd-ed14-44f4-89d3-192332bbc1c4@amd.com>
198
+
199
+
200
+* ps/ci-gitlab (2023-10-29) 5 commits
201
+ - ci: add support for GitLab CI
202
+ - ci: split out logic to set up failed test artifacts
203
+ - ci: group installation of Docker dependencies
204
+ - ci: make grouping setup more generic
205
+ - ci: reorder definitions for grouping functions
206
+
207
+ source: <cover.1698398590.git.ps@pks.im>
208
+
209
+
210
+* ps/ref-tests-update (2023-10-24) 9 commits
211
+ - t: mark several tests that assume the files backend with REFFILES
212
+ - t7900: assert the absence of refs via git-for-each-ref(1)
213
+ - t7300: assert exact states of repo
214
+ - t4207: delete replace references via git-update-ref(1)
215
+ - t1450: convert tests to remove worktrees via git-worktree(1)
216
+ - t: convert tests to not access reflog via the filesystem
217
+ - t: convert tests to not access symrefs via the filesystem
218
+ - t: convert tests to not write references via the filesystem
219
+ - t: allow skipping expected object ID in `ref-store update-ref`
220
+
221
+ source: <cover.1698156169.git.ps@pks.im>
222
+
223
+
224
+* rs/fix-arghelp (2023-10-29) 1 commit
225
+ - am, rebase: fix arghelp syntax of --empty
226
+
227
+ source: <10e09b2d-15d7-4af1-b24c-217f9e2f457a@web.de>
228
+
229
+
230
+* rs/parse-options-cmdmode (2023-10-29) 2 commits
231
+ - am: simplify --show-current-patch handling
232
+ - parse-options: make CMDMODE errors more precise
233
+
234
+ source: <4520156b-9418-493c-a50c-e61b42e805b3@web.de>
235
+
236
+
237
+* rs/reflog-expire-single-worktree-fix (2023-10-29) 1 commit
238
+ - reflog: fix expire --single-worktree
239
+
240
+ source: <63eade0e-bf2c-4906-8b4c-689797cff737@web.de>
241
+
242
+--------------------------------------------------
243
+[Stalled]
244
+
245
+* pw/rebase-sigint (2023-09-07) 1 commit
246
+ - rebase -i: ignore signals when forking subprocesses
247
+
248
+ If the commit log editor or other external programs (spawned via
249
+ "exec" insn in the todo list) receive internactive signal during
250
+ "git rebase -i", it caused not just the spawned program but the
251
+ "Git" process that spawned them, which is often not what the end
252
+ user intended. "git" learned to ignore SIGINT and SIGQUIT while
253
+ waiting for these subprocesses.
254
+
255
+ Expecting a reroll.
256
+ cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
257
+ source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
258
+
259
+
260
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
261
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
262
+
263
+ "git cherry-pick A" that replays a single commit stopped before
264
+ clobbering local modification, but "git cherry-pick A..B" did not,
265
+ which has been corrected.
266
+
267
+ Expecting a reroll.
268
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
269
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
270
+
271
+
272
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
273
+ - diff-lib: fix check_removed() when fsmonitor is active
274
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
275
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
276
+ (this branch uses jc/fake-lstat.)
277
+
278
+ The optimization based on fsmonitor in the "diff --cached"
279
+ codepath is resurrected with the "fake-lstat" introduced earlier.
280
+
281
+ It is unknown if the optimization is worth resurrecting, but in case...
282
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
283
+
284
+--------------------------------------------------
285
+[Cooking]
286
+
287
* jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit
288
(merged to 'next' on 2023-10-20 at 9200d39c08)
289
+ am: align placeholder for --whitespace option with apply
@@ -181,50 +371,6 @@ Release tarballs are available at:
371
Will merge to 'master'.
372
source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>
373
184
---------------------------------------------------
185
-[Stalled]
186
-
187
-* pw/rebase-sigint (2023-09-07) 1 commit
188
- - rebase -i: ignore signals when forking subprocesses
189
-
190
- If the commit log editor or other external programs (spawned via
191
- "exec" insn in the todo list) receive internactive signal during
192
- "git rebase -i", it caused not just the spawned program but the
193
- "Git" process that spawned them, which is often not what the end
194
- user intended. "git" learned to ignore SIGINT and SIGQUIT while
195
- waiting for these subprocesses.
196
-
197
- Expecting a reroll.
198
- cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
199
- source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
200
-
201
-
202
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
203
- - cherry-pick: refuse cherry-pick sequence if index is dirty
204
-
205
- "git cherry-pick A" that replays a single commit stopped before
206
- clobbering local modification, but "git cherry-pick A..B" did not,
207
- which has been corrected.
208
-
209
- Expecting a reroll.
210
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
211
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
212
-
213
-
214
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
215
- - diff-lib: fix check_removed() when fsmonitor is active
216
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
217
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
218
- (this branch uses jc/fake-lstat.)
219
-
220
- The optimization based on fsmonitor in the "diff --cached"
221
- codepath is resurrected with the "fake-lstat" introduced earlier.
222
-
223
- It is unknown if the optimization is worth resurrecting, but in case...
224
- source: <xmqqr0n0h0tw.fsf@gitster.g>
225
-
226
---------------------------------------------------
227
-[Cooking]
374
375
* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
376
(merged to 'next' on 2023-10-22 at 0e4787303d)
@@ -243,7 +389,8 @@ Release tarballs are available at:
389
output and fail the command, `git bugreport` learned to fuzz the
390
filename to avoid collisions with existing files.
391
246
- Needs review.
392
+ Expecting a reroll.
393
+ cf. <ZTtZ5CbIGETy1ucV.jacob@initialcommit.io>
394
source: <20231016214045.146862-2-jacob@initialcommit.io>
395
396
@@ -296,12 +443,10 @@ Release tarballs are available at:
443
source: <cover.1697440686.git.ps@pks.im>
444
445
299
-* tb/merge-tree-write-pack (2023-10-19) 7 commits
446
+* tb/merge-tree-write-pack (2023-10-23) 5 commits
447
- builtin/merge-tree.c: implement support for `--write-pack`
448
- bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
449
- bulk-checkin: introduce `index_blob_bulk_checkin_incore()`
303
- - bulk-checkin: implement `SOURCE_INCORE` mode for `bulk_checkin_source`
304
- - bulk-checkin: refactor deflate routine to accept a `bulk_checkin_source`
450
- bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types
451
- bulk-checkin: extract abstract `bulk_checkin_source`
452
@@ -309,7 +454,7 @@ Release tarballs are available at:
454
without creating loose objects.
455
456
Will merge to 'next'?
312
- source: <cover.1697736516.git.me@ttaylorr.com>
457
+ source: <cover.1698101088.git.me@ttaylorr.com>
458
459
460
* tb/format-pack-doc-update (2023-10-12) 2 commits
@@ -323,8 +468,9 @@ Release tarballs are available at:
468
source: <cover.1697144959.git.me@ttaylorr.com>
469
470
326
-* ps/do-not-trust-commit-graph-blindly-for-existence (2023-10-13) 1 commit
471
+* ps/do-not-trust-commit-graph-blindly-for-existence (2023-10-24) 2 commits
472
- commit: detect commits that exist in commit-graph but not in the ODB
473
+ - commit-graph: introduce envvar to disable commit existence checks
474
(this branch is used by kn/rev-list-missing-fix.)
475
476
The codepath to traverse the commit-graph learned to notice that a
@@ -333,7 +479,7 @@ Release tarballs are available at:
479
what is in commit-graph.
480
481
Comments?
336
- source: <b0bf576c51a706367a758b8e30eca37edb9c2734.1697200576.git.ps@pks.im>
482
+ source: <cover.1698060036.git.ps@pks.im>
483
484
485
* tb/pair-chunk-expect-size (2023-10-14) 8 commits
@@ -345,7 +491,6 @@ Release tarballs are available at:
491
- commit-graph: read `CDAT` chunk with `pair_chunk_expect()`
492
- commit-graph: read `OIDF` chunk with `pair_chunk_expect()`
493
- chunk-format: introduce `pair_chunk_expect()` helper
348
- (this branch uses jk/chunk-bounds.)
494
495
Code clean-up for jk/chunk-bounds topic.
496
@@ -354,32 +499,6 @@ Release tarballs are available at:
499
source: <cover.1697225110.git.me@ttaylorr.com>
500
501
357
-* jc/fail-stash-to-store-non-stash (2023-10-11) 1 commit
358
- (merged to 'next' on 2023-10-16 at e26db57315)
359
- + stash: be careful what we store
360
-
361
- Feeding "git stash store" with a random commit that was not created
362
- by "git stash create" now errors out.
363
-
364
- Will merge to 'master'.
365
- source: <xmqqbkd4lwj0.fsf_-_@gitster.g>
366
-
367
-
368
-* bc/racy-4gb-files (2023-10-13) 2 commits
369
- (merged to 'next' on 2023-10-16 at c60962dfee)
370
- + Prevent git from rehashing 4GiB files
371
- + t: add a test helper to truncate files
372
-
373
- The index file has room only for lower 32-bit of the file size in
374
- the cached stat information, which means cached stat information
375
- will have 0 in its sd_size member for a file whose size is multiple
376
- of 4GiB. This is mistaken for a racily clean path. Avoid it by
377
- storing a bogus sd_size value instead for such files.
378
-
379
- Will merge to 'master'.
380
- source: <20231012160930.330618-1-sandals@crustytoothpaste.net>
381
-
382
-
502
* jc/grep-f-relative-to-cwd (2023-10-12) 1 commit
503
- grep: -f <path> is relative to $cwd
504
@@ -418,41 +537,7 @@ Release tarballs are available at:
537
source: <cover.1697653929.git.me@ttaylorr.com>
538
539
421
-* en/docfixes (2023-10-09) 25 commits
422
- (merged to 'next' on 2023-10-17 at 1e3cdeb427)
423
- + documentation: add missing parenthesis
424
- + documentation: add missing quotes
425
- + documentation: add missing fullstops
426
- + documentation: add some commas where they are helpful
427
- + documentation: fix whitespace issues
428
- + documentation: fix capitalization
429
- + documentation: fix punctuation
430
- + documentation: use clearer prepositions
431
- + documentation: add missing hyphens
432
- + documentation: remove unnecessary hyphens
433
- + documentation: add missing article
434
- + documentation: fix choice of article
435
- + documentation: whitespace is already generally plural
436
- + documentation: fix singular vs. plural
437
- + documentation: fix verb vs. noun
438
- + documentation: fix adjective vs. noun
439
- + documentation: fix verb tense
440
- + documentation: employ consistent verb tense for a list
441
- + documentation: fix subject/verb agreement
442
- + documentation: remove extraneous words
443
- + documentation: add missing words
444
- + documentation: fix apostrophe usage
445
- + documentation: fix typos
446
- + documentation: fix small error
447
- + documentation: wording improvements
448
-
449
- Documentation typo and grammo fixes.
450
-
451
- Will merge to 'master'.
452
- source: <pull.1595.git.1696747527.gitgitgadget@gmail.com>
453
-
454
-
455
-* kn/rev-list-missing-fix (2023-10-22) 4 commits
540
+* kn/rev-list-missing-fix (2023-10-29) 4 commits
541
- rev-list: add commit object support in `--missing` option
542
- rev-list: move `show_commit()` to the bottom
543
- revision: rename bit to `do_not_die_on_missing_objects`
@@ -462,41 +547,8 @@ Release tarballs are available at:
547
"git rev-list --missing" did not work for missing commit objects,
548
which has been corrected.
549
465
- Comments?
466
- source: <20231019121024.194317-1-karthik.188@gmail.com>
467
-
468
-
469
-* jk/chunk-bounds (2023-10-14) 21 commits
470
- (merged to 'next' on 2023-10-16 at 68c9e37980)
471
- + t5319: make corrupted large-offset test more robust
472
- (merged to 'next' on 2023-10-10 at 21139603ce)
473
- + chunk-format: drop pair_chunk_unsafe()
474
- + commit-graph: detect out-of-order BIDX offsets
475
- + commit-graph: check bounds when accessing BIDX chunk
476
- + commit-graph: check bounds when accessing BDAT chunk
477
- + commit-graph: bounds-check generation overflow chunk
478
- + commit-graph: check size of generations chunk
479
- + commit-graph: bounds-check base graphs chunk
480
- + commit-graph: detect out-of-bounds extra-edges pointers
481
- + commit-graph: check size of commit data chunk
482
- + midx: check size of revindex chunk
483
- + midx: bounds-check large offset chunk
484
- + midx: check size of object offset chunk
485
- + midx: enforce chunk alignment on reading
486
- + midx: check size of pack names chunk
487
- + commit-graph: check consistency of fanout table
488
- + midx: check size of oid lookup chunk
489
- + commit-graph: check size of oid fanout chunk
490
- + midx: stop ignoring malformed oid fanout chunk
491
- + t: add library for munging chunk-format files
492
- + chunk-format: note that pair_chunk() is unsafe
493
- (this branch is used by tb/pair-chunk-expect-size.)
494
-
495
- The codepaths that read "chunk" formatted files have been corrected
496
- to pay attention to the chunk size and notice broken files.
497
-
498
- Will merge to 'master'.
499
- source: <20231009205544.GA3281950@coredump.intra.peff.net>
550
+ Will merge to 'next'.
551
+ source: <20231026101109.43110-1-karthik.188@gmail.com>
552
553
554
* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
@@ -514,19 +566,6 @@ Release tarballs are available at:
566
source: <20231003082107.3002173-1-stepnem@smrk.net>
567
568
517
-* so/diff-merges-dd (2023-10-09) 3 commits
518
- (merged to 'next' on 2023-10-16 at 71b5e29625)
519
- + completion: complete '--dd'
520
- + diff-merges: introduce '--dd' option
521
- + diff-merges: improve --diff-merges documentation
522
-
523
- "git log" and friends learned "--dd" that is a short-hand for
524
- "--diff-merges=first-parent -p".
525
-
526
- Will merge to 'master'.
527
- source: <20231009160535.236523-1-sorganov@gmail.com>
528
-
529
-
569
* jc/update-list-references-to-lore (2023-10-06) 1 commit
570
(merged to 'next' on 2023-10-19 at 83a721a137)
571
+ doc: update list archive reference to use lore.kernel.org
@@ -556,23 +595,24 @@ Release tarballs are available at:
595
Introduce "git replay", a tool meant on the server side without
596
working tree to recreate a history.
597
559
- Needs (hopefully final and quick) review.
598
+ Expectting a (hopefully final and quick) reroll.
599
+ cf. <bd872b81-80a9-5e4e-dcb6-faebc9671848@gmx.de>
600
source: <20231010123847.2777056-1-christian.couder@gmail.com>
601
602
563
-* ak/color-decorate-symbols (2023-10-19) 7 commits
564
- - log: show pseudorefs in decorations
565
- - refs: exempt pseudoref patterns from prefixing
566
- - log: add color.decorate.ref option for other refs
567
- - refs: separate decoration type from default filter
568
- - log: add color.decorate.symbol config option
603
+* ak/color-decorate-symbols (2023-10-23) 7 commits
604
+ - log: add color.decorate.pseudoref config variable
605
+ - refs: exempt pseudorefs from pattern prefixing
606
+ - refs: add pseudorefs array and iteration functions
607
+ - log: add color.decorate.ref config variable
608
+ - log: add color.decorate.symbol config variable
609
- log: use designated inits for decoration_colors
610
- config: restructure color.decorate documentation
611
612
A new config for coloring.
613
614
Needs review.
575
- source: <20231003205442.22963-1-andy.koppe@gmail.com>
615
+ source: <20231023221143.72489-1-andy.koppe@gmail.com>
616
617
618
* jc/attr-tree-config (2023-10-13) 2 commits
@@ -698,18 +738,6 @@ Release tarballs are available at:
738
source: <xmqqcyykig1l.fsf@gitster.g>
739
740
701
-* rs/parse-options-value-int (2023-09-18) 2 commits
702
- - parse-options: use and require int pointer for OPT_CMDMODE
703
- - parse-options: add int value pointer to struct option
704
-
705
- A bit of type safety for the "value" pointer used in the
706
- parse-options API.
707
-
708
- Not ready yet.
709
- cf. <4014e490-c6c1-453d-b0ed-645220e3e614@web.de>
710
- source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>
711
-
712
-
741
* js/doc-unit-tests (2023-10-16) 5 commits
742
- fixup! ci: run unit tests in CI
743
- fixup! unit tests: add TAP unit test framework
@@ -765,11 +793,13 @@ Release tarballs are available at:
793
--------------------------------------------------
794
[Discarded]
795
768
-* jc/doc-unit-tests-fixup (2023-10-11) 1 commit
769
- . SQUASH???
770
- (this branch uses js/doc-unit-tests and js/doc-unit-tests-with-cmake.)
796
+* rs/parse-options-value-int (2023-09-18) 2 commits
797
+ . parse-options: use and require int pointer for OPT_CMDMODE
798
+ . parse-options: add int value pointer to struct option
799
772
- Quick fix for jc/doc-unit-tests topic to unbreak CI running on 'seen'.
800
+ A bit of type safety for the "value" pointer used in the
801
+ parse-options API.
802
774
- Superseded by a fixup! in the base series.
775
- source: <xmqqwmvskf8t.fsf@gitster.g>
803
+ Retracted.
804
+ cf. <4014e490-c6c1-453d-b0ed-645220e3e614@web.de>
805
+ source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>