What's cooking (2023/09 #08)
Junio C Hamano committed
Sep 25, 2023 at 15:41 UTC
6833dc9feb40a11d578a54f0d7326dcb86c52467
1 file changed
+98
-190
whats-cooking.txt
+98
-190
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2023, #07; Fri, 22)
2
+Subject: What's cooking in git.git (Sep 2023, #08; Mon, 25)
3
X-master-at: bcb6cae2966cc407ca1afc77413b3ef11103c175
4
-X-next-at: 8ccd20d70d13287c9d32e64e7979b41cda189595
4
+X-next-at: 7ed318fc91ccd746a38d175b7664c6b964423c8f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2023, #07; Fri, 22)
7
+What's cooking in git.git (Sep 2023, #08; Mon, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,10 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
+With Contributors' Summit happening this week, the early part of
21
+the week may be slower than usual (my response time will certainly
22
+be longer).
23
+
24
Copies of the source code to Git live in many repositories, and the
25
following is a list of the ones I push into or their mirrors. Some
26
repositories have only a subset of branches.
@@ -46,164 +50,94 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
49
-[Graduated to 'master']
50
-
51
-* ch/clean-docfix (2023-09-15) 1 commit
52
- (merged to 'next' on 2023-09-19 at 1e16b715bb)
53
- + git-clean doc: fix "without do cleaning" typo
54
-
55
- Typofix.
56
- source: <pull.1572.git.git.1694800409471.gitgitgadget@gmail.com>
57
-
58
-
59
-* eg/config-type-path-docfix (2023-09-15) 1 commit
60
- (merged to 'next' on 2023-09-19 at 2c8ad3e731)
61
- + git-config: fix misworded --type=path explanation
62
-
63
- Typofix.
64
- source: <20230915202610.21206-1-evan.gates@gmail.com>
65
-
66
-
67
-* jc/update-index-show-index-version (2023-09-12) 3 commits
68
- (merged to 'next' on 2023-09-13 at b754554df8)
69
- + test-tool: retire "index-version"
70
- + update-index: add --show-index-version
71
- + update-index doc: v4 is OK with JGit and libgit2
72
-
73
- "git update-index" learns "--show-index-version" to inspect
74
- the index format version used by the on-disk index file.
75
- source: <20230912193235.776292-1-gitster@pobox.com>
76
-
77
-
78
-* jk/ort-unused-parameter-cleanups (2023-09-16) 5 commits
79
- (merged to 'next' on 2023-09-18 at 25a5dfc38e)
80
- + merge-ort: lowercase a few error messages
81
- + merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
82
- + merge-ort: drop unused parameters from detect_and_process_renames()
83
- + merge-ort: stop passing "opt" to read_oid_strbuf()
84
- + merge-ort: drop custom err() function
85
-
86
- Code clean-up.
87
- source: <20230914093409.GA2254811@coredump.intra.peff.net>
88
-
89
-
90
-* jk/redact-h2h3-headers-fix (2023-09-15) 2 commits
91
- (merged to 'next' on 2023-09-19 at d40278ef9e)
92
- + http: update curl http/2 info matching for curl 8.3.0
93
- + http: factor out matching of curl http/2 trace lines
94
-
95
- HTTP Header redaction code has been adjusted for a newer version of
96
- cURL library that shows its traces differently from earlier
97
- versions.
98
- source: <20230915113237.GA3531328@coredump.intra.peff.net>
99
-
100
-
101
-* js/diff-cached-fsmonitor-fix (2023-09-11) 1 commit
102
- (merged to 'next' on 2023-09-12 at 7479278da0)
103
- + diff-lib: fix check_removed when fsmonitor is on
104
- (this branch is used by jc/diff-cached-fsmonitor-fix.)
53
+[New Topics]
54
106
- "git diff --cached" codepath did not fill the necessary stat
107
- information for a file when fsmonitor knows it is clean and ended
108
- up behaving as if it is not clean, which has been corrected.
109
- source: <20230911170901.49050-2-sokcevic@google.com>
55
+* jx/remote-archive-over-smart-http (2023-09-25) 3 commits
56
+ - archive: support remote archive from stateless transport
57
+ - transport-helper: run do_take_over in connect_helper
58
+ - transport-helper: no connection restriction in connect_helper
59
60
+ "git archive --remote=<remote>" learned to talk over the smart
61
+ http (aka stateless) transport.
62
112
-* js/systemd-timers-wsl-fix (2023-09-11) 1 commit
113
- (merged to 'next' on 2023-09-12 at 71c4cbb1df)
114
- + maintenance(systemd): support the Windows Subsystem for Linux
63
+ Expecting a reroll.
64
+ cf. <CANYiYbFkG+CvrNFBkdNewZs7ADROVsjd051SDQsU0zVq8eBhew@mail.gmail.com>
65
+ source: <20230923152201.14741-1-worldhello.net@gmail.com>
66
116
- Update "git maintainance" timers' implementation based on systemd
117
- timers to work with WSL.
118
- source: <pull.1586.git.1694334620260.gitgitgadget@gmail.com>
67
68
+* jx/sideband-chomp-newline-fix (2023-09-25) 3 commits
69
+ - pkt-line: do not chomp newlines for sideband messages
70
+ - pkt-line: memorize sideband fragment in reader
71
+ - test-pkt-line: add option parser for unpack-sideband
72
121
-* la/trailer-cleanups (2023-09-11) 6 commits
122
- (merged to 'next' on 2023-09-12 at 779c4a097a)
123
- + trailer: split process_command_line_args into separate functions
124
- + trailer: split process_input_file into separate pieces
125
- + trailer: separate public from internal portion of trailer_iterator
73
+ Sideband demultiplexer fixes.
74
127
- Code clean-up.
128
-
129
- Keep only the first three clean-ups, and discard the rest to be replaced later.
130
- cf. <owly1qetjqo1.fsf@fine.c.googlers.com>
131
- cf. <owlyzg1dsswr.fsf@fine.c.googlers.com>
132
- source: <pull.1563.v2.git.1694240177.gitgitgadget@gmail.com>
75
+ Needs review.
76
+ source: <CANYiYbF+Xmk4rCNLMJe+i_CFafg8=QU5vbXWNUZbOVsDLTe5QQ@mail.gmail.com>
77
78
135
-* ob/sequencer-remove-dead-code (2023-09-12) 1 commit
136
- (merged to 'next' on 2023-09-13 at 1f6c2b336b)
137
- + sequencer: remove unreachable exit condition in pick_commits()
79
+* ks/ref-filter-mailmap (2023-09-25) 3 commits
80
+ - ref-filter: add mailmap support
81
+ - t/t6300: introduce test_bad_atom
82
+ - t/t6300: cleanup test_atom
83
139
- Code clean-up.
140
- source: <20230912105541.272917-1-oswald.buddenhagen@gmx.de>
84
+ "git for-each-ref" and friends learn to apply mailmap to authorname
85
+ and other fields.
86
87
+ Will merge to 'next'.
88
+ source: <20230925175050.3498-1-five231003@gmail.com>
89
143
-* ob/t3404-typofix (2023-09-12) 1 commit
144
- (merged to 'next' on 2023-09-13 at b17fa78c3f)
145
- + t3404-rebase-interactive.sh: fix typos in title of a rewording test
90
147
- Code clean-up.
148
- source: <20230912104237.271616-1-oswald.buddenhagen@gmx.de>
91
+* ps/revision-cmdline-stdin-not (2023-09-25) 1 commit
92
+ - revision: make pseudo-opt flags read via stdin behave consistently
93
94
+ "git rev-list --stdin" learned to take non-revisions (like "--not")
95
+ recently from the standard input, but the way such a "--not" was
96
+ handled was quite confusing, which has been rethought. This is
97
+ potentially a change that breaks backward compatibility.
98
151
-* pb/complete-commit-trailers (2023-09-12) 2 commits
152
- (merged to 'next' on 2023-09-13 at 9a0ec17606)
153
- + completion: commit: complete trailers tokens more robustly
154
- (merged to 'next' on 2023-09-08 at 842587016d)
155
- + completion: commit: complete configured trailer tokens
99
+ Will merge to 'next'?
100
+ source: <6221acd2796853144f8e84081655fbc79fdc6634.1695646898.git.ps@pks.im>
101
157
- The command-line complation support (in contrib/) learned to
158
- complete "git commit --trailer=" for possible trailer keys.
159
- source: <pull.1583.v2.git.1694539827.gitgitgadget@gmail.com>
102
103
+* ty/merge-tree-strategy-options (2023-09-25) 1 commit
104
+ - merge-tree: add -X strategy option
105
162
-* pb/completion-aliases-doc (2023-09-12) 1 commit
163
- (merged to 'next' on 2023-09-13 at b248a5bc26)
164
- + completion: improve doc for complex aliases
106
+ "git merge-tree" learned to take strategy backend specific options
107
+ via the "-X" option, like "git merge" does.
108
166
- Clarify how "alias.foo = : git cmd ; aliased-command-string" should
167
- be spelled with necessary whitespaces around punctuation marks to
168
- work.
169
- source: <pull.1585.v2.git.1694538135853.gitgitgadget@gmail.com>
109
+ Will merge to 'next'?
110
+ source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
111
112
+--------------------------------------------------
113
+[Stalled]
114
172
-* pw/diff-no-index-from-named-pipes (2023-09-11) 1 commit
173
- (merged to 'next' on 2023-09-12 at 135ecd136f)
174
- + diff --no-index: fix -R with stdin
115
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
116
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
117
176
- "git diff --no-index -R <(one) <(two)" did not work correctly,
118
+ "git cherry-pick A" that replays a single commit stopped before
119
+ clobbering local modification, but "git cherry-pick A..B" did not,
120
which has been corrected.
178
- source: <22fdfa3b-f90e-afcc-667c-705fb7670245@web.de>
121
122
+ Expecting a reroll.
123
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
124
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
125
181
-* tb/repack-existing-packs-cleanup (2023-09-13) 8 commits
182
- (merged to 'next' on 2023-09-14 at bb8065e89c)
183
- + builtin/repack.c: extract common cruft pack loop
184
- + builtin/repack.c: avoid directly inspecting "util"
185
- + builtin/repack.c: store existing cruft packs separately
186
- + builtin/repack.c: extract `has_existing_non_kept_packs()`
187
- + builtin/repack.c: extract redundant pack cleanup for existing packs
188
- + builtin/repack.c: extract redundant pack cleanup for --geometric
189
- + builtin/repack.c: extract marking packs for deletion
190
- + builtin/repack.c: extract structure to store existing packs
191
-
192
- The code to keep track of existing packs in the repository while
193
- repacking has been refactored.
194
- source: <cover.1694632644.git.me@ttaylorr.com>
126
127
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
128
+ - diff-lib: fix check_removed() when fsmonitor is active
129
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
130
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
131
+ (this branch uses jc/fake-lstat.)
132
197
-* tb/send-email-extract-valid-address-error-message-fix (2023-09-18) 1 commit
198
- (merged to 'next' on 2023-09-19 at d037282391)
199
- + git-send-email.perl: avoid printing undef when validating addresses
133
+ The optimization based on fsmonitor in the "diff --cached"
134
+ codepath is resurrected with the "fake-lstat" introduced earlier.
135
201
- An error message given by "git send-email" when given a malformed
202
- address did not give correct information, which has been corrected.
203
- source: <545729b619308c6f3397b9aa1747f26ddc58f461.1695054945.git.me@ttaylorr.com>
136
+ It is unknown if the optimization is worth resurrecting, but in case...
137
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
138
139
--------------------------------------------------
206
-[New Topics]
140
+[Cooking]
141
142
* hy/doc-show-is-like-log-not-diff-tree (2023-09-20) 1 commit
143
(merged to 'next' on 2023-09-22 at 5492c03eae)
@@ -251,7 +185,8 @@ Release tarballs are available at:
185
source: <20230921110727.789156-1-oswald.buddenhagen@gmx.de>
186
187
254
-* js/ci-coverity (2023-09-22) 6 commits
188
+* js/ci-coverity (2023-09-25) 7 commits
189
+ - SQUASH???
190
- coverity: detect and report when the token or project is incorrect
191
- coverity: allow running on macOS
192
- coverity: support building on Windows
@@ -261,46 +196,19 @@ Release tarballs are available at:
196
197
GitHub CI workflow has learned to trigger Coverity check.
198
264
- source: <pull.1588.git.1695379323.gitgitgadget@gmail.com>
199
+ Looking good.
200
+ source: <pull.1588.v2.git.1695642662.gitgitgadget@gmail.com>
201
202
203
* js/doc-status-with-submodules-mark-up-fix (2023-09-22) 1 commit
268
- - Documentation/git-status: add missing line breaks
204
+ (merged to 'next' on 2023-09-25 at 7ed318fc91)
205
+ + Documentation/git-status: add missing line breaks
206
207
Docfix.
208
272
- Will merge to 'next'.
209
+ Will merge to 'master'.
210
source: <pull.1590.git.1695392082207.gitgitgadget@gmail.com>
211
275
---------------------------------------------------
276
-[Stalled]
277
-
278
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
279
- - cherry-pick: refuse cherry-pick sequence if index is dirty
280
-
281
- "git cherry-pick A" that replays a single commit stopped before
282
- clobbering local modification, but "git cherry-pick A..B" did not,
283
- which has been corrected.
284
-
285
- Expecting a reroll.
286
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
287
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
288
-
289
-
290
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
291
- - diff-lib: fix check_removed() when fsmonitor is active
292
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
293
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
294
- (this branch uses jc/fake-lstat.)
295
-
296
- The optimization based on fsmonitor in the "diff --cached"
297
- codepath is resurrected with the "fake-lstat" introduced earlier.
298
-
299
- It is unknown if the optimization is worth resurrecting, but in case...
300
- source: <xmqqr0n0h0tw.fsf@gitster.g>
301
-
302
---------------------------------------------------
303
-[Cooking]
212
213
* js/config-parse (2023-09-21) 5 commits
214
- config-parse: split library out of config.[c|h]
@@ -411,22 +319,23 @@ Release tarballs are available at:
319
source: <20230909125446.142715-1-sorganov@gmail.com>
320
321
414
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-11) 9 commits
415
- . gc: add `gc.repackFilterTo` config option
416
- . repack: implement `--filter-to` for storing filtered out objects
417
- . gc: add `gc.repackFilter` config option
418
- . repack: add `--filter=<filter-spec>` option
419
- . pack-bitmap-write: rebuild using new bitmap when remapping
420
- . repack: refactor finding pack prefix
421
- . repack: refactor finishing pack-objects command
422
- . t/helper: add 'find-pack' test-tool
423
- . pack-objects: allow `--filter` without `--stdout`
322
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-25) 10 commits
323
+ - SQUASH??? t0080 is already taken
324
+ - gc: add `gc.repackFilterTo` config option
325
+ - repack: implement `--filter-to` for storing filtered out objects
326
+ - gc: add `gc.repackFilter` config option
327
+ - repack: add `--filter=<filter-spec>` option
328
+ - pack-bitmap-write: rebuild using new bitmap when remapping
329
+ - repack: refactor finding pack prefix
330
+ - repack: refactor finishing pack-objects command
331
+ - t/helper: add 'find-pack' test-tool
332
+ - pack-objects: allow `--filter` without `--stdout`
333
334
"git repack" machinery learns to pay attention to the "--filter="
335
option.
336
428
- May need to wait until tb/repack-existing-packs-cleanup stablizes.
429
- source: <20230911150618.129737-1-christian.couder@gmail.com>
337
+ Looking better.
338
+ source: <20230925152517.803579-1-christian.couder@gmail.com>
339
340
341
* pw/rebase-sigint (2023-09-07) 1 commit
@@ -518,7 +427,7 @@ Release tarballs are available at:
427
source: <cover.1692297001.git.steadmon@google.com>
428
429
521
-* js/doc-unit-tests-with-cmake (2023-09-18) 7 commits
430
+* js/doc-unit-tests-with-cmake (2023-09-25) 7 commits
431
- cmake: handle also unit tests
432
- cmake: use test names instead of full paths
433
- cmake: fix typo in variable name
@@ -531,7 +440,7 @@ Release tarballs are available at:
440
Update the base topic to work with CMake builds.
441
442
Waiting for the base topic to settle.
534
- source: <pull.1579.v2.git.1695070468.gitgitgadget@gmail.com>
443
+ source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
444
445
446
* tb/path-filter-fix (2023-08-30) 15 commits
@@ -555,9 +464,10 @@ Release tarballs are available at:
464
on systems whose "char" is unsigned; update the implementation and
465
bump the format version to 2.
466
558
- Almost there.
467
+ Still being discussed.
468
cf. <20230830200218.GA5147@szeder.dev>
469
cf. <20230901205616.3572722-1-jonathantanmy@google.com>
470
+ cf. <20230924195900.GA1156862@szeder.dev>
471
source: <cover.1693413637.git.jonathantanmy@google.com>
472
473
@@ -575,20 +485,21 @@ Release tarballs are available at:
485
486
487
* jc/unresolve-removal (2023-07-31) 7 commits
578
- - checkout: allow "checkout -m path" to unmerge removed paths
579
- - checkout/restore: add basic tests for --merge
580
- - checkout/restore: refuse unmerging paths unless checking out of the index
581
- - update-index: remove stale fallback code for "--unresolve"
582
- - update-index: use unmerge_index_entry() to support removal
583
- - resolve-undo: allow resurrecting conflicted state that resolved to deletion
584
- - update-index: do not read HEAD and MERGE_HEAD unconditionally
488
+ (merged to 'next' on 2023-09-25 at 0563c8d8a1)
489
+ + checkout: allow "checkout -m path" to unmerge removed paths
490
+ + checkout/restore: add basic tests for --merge
491
+ + checkout/restore: refuse unmerging paths unless checking out of the index
492
+ + update-index: remove stale fallback code for "--unresolve"
493
+ + update-index: use unmerge_index_entry() to support removal
494
+ + resolve-undo: allow resurrecting conflicted state that resolved to deletion
495
+ + update-index: do not read HEAD and MERGE_HEAD unconditionally
496
(this branch is used by jc/rerere-cleanup.)
497
498
"checkout --merge -- path" and "update-index --unresolve path" did
499
not resurrect conflicted state that was resolved to remove path,
500
but now they do.
501
591
- Will merge to 'next'.
502
+ Will merge to 'master'.
503
source: <20230731224409.4181277-1-gitster@pobox.com>
504
505
@@ -602,7 +513,6 @@ Release tarballs are available at:
513
cf. <xmqqtttia3vn.fsf@gitster.g>
514
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
515
605
-
516
--------------------------------------------------
517
[Discarded]
518
@@ -613,5 +523,3 @@ Release tarballs are available at:
523
524
Superseded by the js/ci-coverity topic.
525
source: <b23951c569660e1891a7fb3ad2c2ea1952897bd7.1695332105.git.me@ttaylorr.com>
616
-
617
-