What's cooking (2023/08 #06)
Junio C Hamano committed
Aug 18, 2023 at 17:25 UTC
4661cb80f1c7072411fdd2c5fb32e6f787248960
1 file changed
+141
-161
whats-cooking.txt
+141
-161
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2023, #05; Tue, 15)
3
-X-master-at: f1ed9d7dc0e49dc1a044941d821c9d2342313c26
4
-X-next-at: 538df5cf277f6d03b93daeac4d448cbb1a0ded19
2
+Subject: What's cooking in git.git (Aug 2023, #06; Fri, 18)
3
+X-master-at: f9972720e9a405e4f6924a7cde0ed5880687f4d0
4
+X-next-at: 00c1cf4fe74f2ddb78eb24cb832b729034603801
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Aug 2023, #05; Tue, 15)
7
+What's cooking in git.git (Aug 2023, #06; Fri, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +17,7 @@ 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
-Git 2.42-rc2 has been tagged.
20
+Git 2.42 will be released early next week.
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -50,87 +50,118 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
53
-* ds/maintenance-on-windows-fix (2023-08-09) 2 commits
54
- (merged to 'next' on 2023-08-09 at 3d7abef9be)
55
- + git maintenance: avoid console window in scheduled tasks on Windows
56
- + win32: add a helper to run `git.exe` without a foreground window
53
+* ps/revision-stdin-with-options (2023-08-16) 1 commit
54
+ (merged to 'next' on 2023-08-16 at 6eef21f632)
55
+ + rev-list-options: fix typo in `--stdin` documentation
56
58
- Windows updates.
59
- source: <pull.1570.git.1691600087.gitgitgadget@gmail.com>
57
+ Typofix to documentation added during this cycle.
58
+ source: <b1b3f1d10b64e63c62db0105957a4ad5e0295d34.1692194193.git.martin.agren@gmail.com>
59
60
62
-* jc/send-email-pre-process-fix (2023-08-09) 1 commit
63
- (merged to 'next' on 2023-08-09 at ba1b999ec2)
64
- + t9001: remove excessive GIT_SEND_EMAIL_NOTTY=1
61
+* sa/doc-ls-remote (2023-08-16) 1 commit
62
+ (merged to 'next' on 2023-08-16 at 059ebeb48b)
63
+ + show-ref doc: fix carets in monospace
64
66
- Test fix.
67
- source: <20230809171531.2564754-1-oswald.buddenhagen@gmx.de>
65
+ Mark-up fix to documentation added during this cycle.
66
+ source: <f52247af9027192d0a29b8ee049db20250314d74.1692194193.git.martin.agren@gmail.com>
67
68
70
-* jk/repack-leakfix (2023-08-08) 1 commit
71
- (merged to 'next' on 2023-08-09 at 8692d7b2e0)
72
- + repack: free geometry struct
73
- (this branch is used by tb/repack-geometry-cleanup.)
69
+* tl/notes-separator (2023-08-16) 2 commits
70
+ (merged to 'next' on 2023-08-16 at 397c62dd35)
71
+ + notes doc: tidy up `--no-stripspace` paragraph
72
+ + notes doc: split up run-on sentences
73
75
- Leakfix.
76
- source: <20230808185023.GA3498623@coredump.intra.peff.net>
74
+ Typo/grammofix to documentation added during this cycle.
75
+ source: <cover.1692194193.git.martin.agren@gmail.com>
76
77
+--------------------------------------------------
78
+[New Topics]
79
79
-* jk/send-email-with-new-readline (2023-08-08) 2 commits
80
- (merged to 'next' on 2023-08-09 at d42e4ca9f8)
81
- + send-email: avoid creating more than one Term::ReadLine object
82
- + send-email: drop FakeTerm hack
83
- (this branch is used by ws/svn-with-new-readline.)
80
+* jc/diff-exit-code-with-w-fixes (2023-08-18) 5 commits
81
+ - diff: the -w option breaks --exit-code for --raw and other output modes
82
+ - t4040: remove test that succeeded for a wrong reason
83
+ - diff: teach "--stat -w --exit-code" to notice differences
84
+ - diff: mode-only change should be noticed by "--patch -w --exit-code"
85
+ - diff: move the fallback "--exit-code" code down
86
85
- Adjust to newer Term::ReadLine to prevent it from breaking
86
- the interactive prompt code in send-email.
87
- source: <20230808180935.GA2096901@coredump.intra.peff.net>
87
+ "git diff -w --exit-code" with various options did not work
88
+ correctly, which is being addressed.
89
90
+ Needs review.
91
+ source: <20230818235932.3253552-1-gitster@pobox.com>
92
90
-* js/allow-t4000-to-be-indented-with-spaces (2023-08-08) 1 commit
91
- (merged to 'next' on 2023-08-09 at 9c0d6659ec)
92
- + t0040: declare non-tab indentation to be okay in this script
93
94
- File attribute update.
95
- source: <pull.1568.git.1691491054706.gitgitgadget@gmail.com>
94
+* jc/update-index-show-index-version (2023-08-18) 3 commits
95
+ - test-tool: retire "index-version"
96
+ - update-index: add --show-index-version
97
+ - update-index doc: v4 is OK with JGit and libgit2
98
99
+ "git update-index" learns "--show-index-version" to inspect
100
+ the index format version used by the on-disk index file.
101
98
-* ob/rebase-conflict-advice-i18n-fix (2023-08-07) 1 commit
99
- (merged to 'next' on 2023-08-09 at 0e02113510)
100
- + advice: handle "rebase" in error_resolve_conflict()
102
+ Needs review.
103
+ source: <20230818233729.2766281-1-gitster@pobox.com>
104
102
- i18n coverage improvement and avoidance of sentence lego.
103
- source: <20230807170935.2336715-1-oswald.buddenhagen@gmx.de>
105
+--------------------------------------------------
106
+[Stalled]
107
108
+* ob/send-email-interactive-failure (2023-08-09) 1 commit
109
+ . send-email: prompt-dependent exit codes
110
106
-* pw/diff-no-index-from-named-pipes (2023-08-13) 2 commits
107
- (merged to 'next' on 2023-08-13 at 6600a9f80c)
108
- + t4053: avoid writing to unopened pipe
109
- + t4053: avoid race when killing background processes
111
+ "git send-email" exits with non-zero status when end-user
112
+ interaction causes any prepared message not to be sent.
113
111
- Test updates.
112
- source: <pull.1571.git.1691677993195.gitgitgadget@gmail.com>
113
- source: <20230813162440.GA1688763@coredump.intra.peff.net>
114
+ Expecting a reroll.
115
+ Without an opt-in fix, this will be a backward-incompatible
116
+ change that needs mention in the release notes.
117
+ source: <20230809171531.2564739-1-oswald.buddenhagen@gmx.de>
118
+
119
+
120
+* ob/sequencer-empty-hint-fix (2023-08-09) 1 commit
121
+ . sequencer: rectify empty hint in call of require_clean_work_tree()
122
+
123
+ Update the use of API for consistency between two calls to
124
+ require_clean_work_tree() from the sequencer code.
125
+
126
+ Expecting a reroll.
127
+ cf. <xmqqedkahoio.fsf@gitster.g>
128
+ source: <20230809171531.2564829-1-oswald.buddenhagen@gmx.de>
129
130
116
-* rs/parse-opt-forbid-set-int-0-without-noneg (2023-08-08) 1 commit
117
- (merged to 'next' on 2023-08-09 at fab1193dbc)
118
- + parse-options: disallow negating OPTION_SET_INT 0
131
+* cc/git-replay (2023-06-03) 15 commits
132
+ - replay: stop assuming replayed branches do not diverge
133
+ - replay: add --contained to rebase contained branches
134
+ - replay: add --advance or 'cherry-pick' mode
135
+ - replay: disallow revision specific options and pathspecs
136
+ - replay: use standard revision ranges
137
+ - replay: make it a minimal server side command
138
+ - replay: remove HEAD related sanity check
139
+ - replay: remove progress and info output
140
+ - replay: add an important FIXME comment about gpg signing
141
+ - replay: don't simplify history
142
+ - replay: introduce pick_regular_commit()
143
+ - replay: die() instead of failing assert()
144
+ - replay: start using parse_options API
145
+ - replay: introduce new builtin
146
+ - t6429: remove switching aspects of fast-rebase
147
+
148
+ No reviews?
149
+ source: <20230602102533.876905-1-christian.couder@gmail.com>
150
120
- Developer support to detect meaningless combination of options.
121
- source: <c4cd1591-3a83-920a-6a80-19ffbfe3089d@web.de>
151
152
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
153
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
154
124
-* st/mv-lstat-fix (2023-08-09) 1 commit
125
- (merged to 'next' on 2023-08-09 at 4b5708df7c)
126
- + mv: handle lstat() failure correctly
155
+ "git cherry-pick A" that replays a single commit stopped before
156
+ clobbering local modification, but "git cherry-pick A..B" did not,
157
+ which has been corrected.
158
128
- Correct use of lstat() that assumed a failing call would not
129
- clobber the statbuf.
130
- source: <pull.1561.v2.git.1691567261701.gitgitgadget@gmail.com>
159
+ Expecting a reroll.
160
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
161
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
162
163
--------------------------------------------------
133
-[New Topics]
164
+[Cooking]
165
166
* ob/revert-of-revert-is-reapply (2023-08-11) 3 commits
167
- SQUASH??? reword by Linus Arver and Phillip Wood
@@ -169,11 +200,12 @@ Release tarballs are available at:
200
201
202
* ja/worktree-orphan (2023-08-13) 1 commit
172
- - builtin/worktree.c: fix typo in "forgot fetch" msg
203
+ (merged to 'next' on 2023-08-18 at b2a6f7fb71)
204
+ + builtin/worktree.c: fix typo in "forgot fetch" msg
205
206
Typofix in an error message.
207
176
- Will merge to 'next'.
208
+ Will cook in 'next'.
209
source: <20230811233940.30264-1-jacobabel@nullpo.dev>
210
211
@@ -187,64 +219,14 @@ Release tarballs are available at:
219
220
221
* ob/t9001-indent-fix (2023-08-13) 1 commit
190
- - t9001: fix indentation in test_no_confirm()
222
+ (merged to 'next' on 2023-08-18 at 00c1cf4fe7)
223
+ + t9001: fix indentation in test_no_confirm()
224
225
Test style fix.
226
194
- Will merge to 'next'.
227
+ Will cook in 'next'.
228
source: <20230813104649.2919412-1-oswald.buddenhagen@gmx.de>
229
197
---------------------------------------------------
198
-[Stalled]
199
-
200
-* cc/git-replay (2023-06-03) 15 commits
201
- - replay: stop assuming replayed branches do not diverge
202
- - replay: add --contained to rebase contained branches
203
- - replay: add --advance or 'cherry-pick' mode
204
- - replay: disallow revision specific options and pathspecs
205
- - replay: use standard revision ranges
206
- - replay: make it a minimal server side command
207
- - replay: remove HEAD related sanity check
208
- - replay: remove progress and info output
209
- - replay: add an important FIXME comment about gpg signing
210
- - replay: don't simplify history
211
- - replay: introduce pick_regular_commit()
212
- - replay: die() instead of failing assert()
213
- - replay: start using parse_options API
214
- - replay: introduce new builtin
215
- - t6429: remove switching aspects of fast-rebase
216
-
217
- No reviews?
218
- source: <20230602102533.876905-1-christian.couder@gmail.com>
219
-
220
-
221
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
222
- - cherry-pick: refuse cherry-pick sequence if index is dirty
223
-
224
- "git cherry-pick A" that replays a single commit stopped before
225
- clobbering local modification, but "git cherry-pick A..B" did not,
226
- which has been corrected.
227
-
228
- Expecting a reroll.
229
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
230
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
231
-
232
-
233
-* ab/tag-object-type-errors (2023-05-10) 4 commits
234
- . tag: don't emit potentially incorrect "object is a X, not a Y"
235
- . tag: don't misreport type of tagged objects in errors
236
- . object tests: add test for unexpected objects in tags
237
- . Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
238
-
239
- Hardening checks around mismatched object types when one of those
240
- objects is a tag.
241
-
242
- Will discard.
243
- Stalled for too long.
244
- source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
245
-
246
---------------------------------------------------
247
-[Cooking]
230
231
* sl/sparse-check-attr (2023-08-11) 3 commits
232
- check-attr: integrate with sparse-index
@@ -314,7 +296,9 @@ Release tarballs are available at:
296
source: <20230810211619.19055-1-andy.koppe@gmail.com>
297
298
317
-* ds/upload-pack-error-sequence-fix (2023-08-10) 1 commit
299
+* ds/upload-pack-error-sequence-fix (2023-08-16) 2 commits
300
+ (merged to 'next' on 2023-08-16 at d0522d547d)
301
+ + upload-pack: fix exit code when denying fetch of unreachable object ID
302
(merged to 'next' on 2023-08-13 at 6c740593cf)
303
+ upload-pack: fix race condition in error messages
304
@@ -322,6 +306,7 @@ Release tarballs are available at:
306
307
Will cook in 'next'.
308
source: <pull.1572.git.1691678450757.gitgitgadget@gmail.com>
309
+ source: <fe028981d353158e9840eb035194ca15e6a2c15e.1692165840.git.ps@pks.im>
310
311
312
* mp/rebase-label-length-limit (2023-08-10) 2 commits
@@ -387,44 +372,22 @@ Release tarballs are available at:
372
373
374
* ds/maintenance-schedule-fuzz (2023-08-10) 8 commits
390
- - maintenance: update schedule before config
391
- - maintenance: fix systemd schedule overlaps
392
- - maintenance: use random minute in systemd scheduler
393
- - maintenance: swap method locations
394
- - maintenance: use random minute in cron scheduler
395
- - maintenance: use random minute in Windows scheduler
396
- - maintenance: use random minute in launchctl scheduler
397
- - maintenance: add get_random_minute()
375
+ (merged to 'next' on 2023-08-18 at 8d17424818)
376
+ + maintenance: update schedule before config
377
+ + maintenance: fix systemd schedule overlaps
378
+ + maintenance: use random minute in systemd scheduler
379
+ + maintenance: swap method locations
380
+ + maintenance: use random minute in cron scheduler
381
+ + maintenance: use random minute in Windows scheduler
382
+ + maintenance: use random minute in launchctl scheduler
383
+ + maintenance: add get_random_minute()
384
385
Allow "git maintenance" schedule to be randomly distributed.
386
401
- Will merge to 'next'.
387
+ Will cook in 'next'.
388
source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com>
389
390
405
-* ob/send-email-interactive-failure (2023-08-09) 1 commit
406
- . send-email: prompt-dependent exit codes
407
-
408
- "git send-email" exits with non-zero status when end-user
409
- interaction causes any prepared message not to be sent.
410
-
411
- Expecting a reroll.
412
- Without an opt-in fix, this will be a backward-incompatible
413
- change that needs mention in the release notes.
414
- source: <20230809171531.2564739-1-oswald.buddenhagen@gmx.de>
415
-
416
-
417
-* ob/sequencer-empty-hint-fix (2023-08-09) 1 commit
418
- . sequencer: rectify empty hint in call of require_clean_work_tree()
419
-
420
- Update the use of API for consistency between two calls to
421
- require_clean_work_tree() from the sequencer code.
422
-
423
- Expecting a reroll.
424
- cf. <xmqqedkahoio.fsf@gitster.g>
425
- source: <20230809171531.2564829-1-oswald.buddenhagen@gmx.de>
426
-
427
-
391
* rj/branch-in-use-error-message (2023-08-08) 2 commits
392
(merged to 'next' on 2023-08-09 at 5510985b1c)
393
+ branch: error message checking out a branch in use
@@ -453,8 +416,7 @@ Release tarballs are available at:
416
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
417
418
456
-* jc/rerere-cleanup (2023-08-03) 5 commits
457
- - rerere: plug small strbuf leak
419
+* jc/rerere-cleanup (2023-08-03) 4 commits
420
- rerere: modernize use of empty strbuf
421
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error
422
- rerere: fix comment on handle_file() helper
@@ -516,19 +478,20 @@ Release tarballs are available at:
478
479
480
* rs/parse-options-negation-help (2023-08-06) 8 commits
519
- - parse-options: simplify usage_padding()
520
- - parse-options: no --[no-]no-...
521
- - parse-options: factor out usage_indent() and usage_padding()
522
- - parse-options: show negatability of options in short help
523
- - t1502: test option negation
524
- - t1502: move optionspec help output to a file
525
- - t1502, docs: disallow --no-help
526
- - subtree: disallow --no-{help,quiet,debug,branch,message}
481
+ (merged to 'next' on 2023-08-18 at 9d37b5fbfe)
482
+ + parse-options: simplify usage_padding()
483
+ + parse-options: no --[no-]no-...
484
+ + parse-options: factor out usage_indent() and usage_padding()
485
+ + parse-options: show negatability of options in short help
486
+ + t1502: test option negation
487
+ + t1502: move optionspec help output to a file
488
+ + t1502, docs: disallow --no-help
489
+ + subtree: disallow --no-{help,quiet,debug,branch,message}
490
491
"git cmd -h" learned to signal which options can be negated by
492
listing such options like "--[no-]opt".
493
531
- Will merge to 'next'.
494
+ Will cook in 'next'.
495
cf. <xmqqbkfm3gne.fsf@gitster.g>
496
source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de>
497
@@ -565,13 +528,15 @@ Release tarballs are available at:
528
source: <20230812000011.1227371-1-christian.couder@gmail.com>
529
530
568
-* js/doc-unit-tests (2023-08-07) 1 commit
569
- - unit tests: add a project plan document
531
+* js/doc-unit-tests (2023-08-17) 3 commits
532
+ - ci: run unit tests in CI
533
+ - unit tests: add TAP unit test framework
534
+ - unit tests: Add a project plan document
535
536
Process to add some form of low-level unit tests has started.
537
538
Comments?
574
- source: <c7dca1a805a16fd4fd68e86efeec97510e3ac4b8.1691449216.git.steadmon@google.com>
539
+ source: <cover.1692297001.git.steadmon@google.com>
540
541
542
* jt/path-filter-fix (2023-08-08) 8 commits
@@ -607,3 +572,18 @@ Release tarballs are available at:
572
Will cook in 'next'.
573
source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
574
source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de>
575
+
576
+--------------------------------------------------
577
+[Discarded]
578
+
579
+* ab/tag-object-type-errors (2023-05-10) 4 commits
580
+ . tag: don't emit potentially incorrect "object is a X, not a Y"
581
+ . tag: don't misreport type of tagged objects in errors
582
+ . object tests: add test for unexpected objects in tags
583
+ . Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
584
+
585
+ Hardening checks around mismatched object types when one of those
586
+ objects is a tag.
587
+
588
+ Stalled for too long.
589
+ source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>