What's cooking (2023/08 #08)
Junio C Hamano committed
Aug 28, 2023 at 11:39 UTC
d82fdc2e24a21168278717ca45d16dead9259165
1 file changed
+114
-224
whats-cooking.txt
+114
-224
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2023, #07; Fri, 25)
3
-X-master-at: 6807fcfedab84bc8cd0fbf721bc13c4e68cda9ae
4
-X-next-at: f2c9fb9f5c8eb1d665cf784c008132152540004c
2
+Subject: What's cooking in git.git (Aug 2023, #08; Mon, 28)
3
+X-master-at: 5dc72c0fbcbccf7dbb42e470e55dafbd2afdf343
4
+X-next-at: 7437a81fcf65029fe0d26191d952ee59c0ab922b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Aug 2023, #07; Fri, 25)
7
+What's cooking in git.git (Aug 2023, #08; Mon, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -19,7 +19,7 @@ arise).
19
20
The cycle for 2.43 has started. Hopefully we can drain the topics
21
that have been cooking in 'next' during the pre-release freeze
22
-period down to 'master' by the end of next week.
22
+period down to 'master' by the end of this week.
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
@@ -50,135 +50,109 @@ Release tarballs are available at:
50
https://www.kernel.org/pub/software/scm/git/
51
52
--------------------------------------------------
53
-[Graduated to 'master']
54
-
55
-* ds/maintenance-schedule-fuzz (2023-08-10) 8 commits
56
- (merged to 'next' on 2023-08-18 at 8d17424818)
57
- + maintenance: update schedule before config
58
- + maintenance: fix systemd schedule overlaps
59
- + maintenance: use random minute in systemd scheduler
60
- + maintenance: swap method locations
61
- + maintenance: use random minute in cron scheduler
62
- + maintenance: use random minute in Windows scheduler
63
- + maintenance: use random minute in launchctl scheduler
64
- + maintenance: add get_random_minute()
65
-
66
- Hourly and other schedule of "git maintenance" jobs are randomly
67
- distributed now.
68
- source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com>
69
-
70
-
71
-* ds/upload-pack-error-sequence-fix (2023-08-16) 2 commits
72
- (merged to 'next' on 2023-08-16 at d0522d547d)
73
- + upload-pack: fix exit code when denying fetch of unreachable object ID
74
- (merged to 'next' on 2023-08-13 at 6c740593cf)
75
- + upload-pack: fix race condition in error messages
76
-
77
- Error message generation fix.
78
- source: <pull.1572.git.1691678450757.gitgitgadget@gmail.com>
79
- source: <fe028981d353158e9840eb035194ca15e6a2c15e.1692165840.git.ps@pks.im>
80
-
81
-
82
-* ja/worktree-orphan (2023-08-13) 1 commit
83
- (merged to 'next' on 2023-08-18 at b2a6f7fb71)
84
- + builtin/worktree.c: fix typo in "forgot fetch" msg
85
-
86
- Typofix in an error message.
87
- source: <20230811233940.30264-1-jacobabel@nullpo.dev>
88
-
89
-
90
-* jk/function-pointer-mismatches-fix (2023-08-19) 1 commit
91
- (merged to 'next' on 2023-08-19 at d59a3bf2b4)
92
- + hashmap: use expected signatures for comparison functions
93
-
94
- Code clean-up to please clang-18.
95
- source: <20230819235530.GB600744@coredump.intra.peff.net>
53
+[New Topics]
54
55
+* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
56
+ - parse-options: allow omitting option help text
57
98
-* mp/rebase-label-length-limit (2023-08-10) 2 commits
99
- (merged to 'next' on 2023-08-13 at 85536da9f7)
100
- + rebase: allow overriding the maximal length of the generated labels
101
- + sequencer: truncate labels to accommodate loose refs
58
+ It may be tempting to leave the help text NULL for a command line
59
+ option that is either hidden or too obvious, but "git subcmd -h"
60
+ and "git subcmd --help-all" would have segfaulted if done so. Now
61
+ the help text is optional.
62
103
- Overly long label names used in the sequencer machinery are now
104
- chopped to fit under filesystem limitation.
105
- source: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com>
63
+ Will merge to 'next'.
64
+ source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
65
66
+--------------------------------------------------
67
+[Graduated to 'master']
68
108
-* ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit
109
- (merged to 'next' on 2023-08-09 at df4360945c)
110
- + sequencer: simplify allocation of result array in todo_list_rearrange_squash()
69
+* mh/credential-erase-improvements-more (2023-07-26) 2 commits
70
+ (merged to 'next' on 2023-08-08 at fd1ba4accf)
71
+ + credential/wincred: erase matching creds only
72
+ + credential/libsecret: erase matching creds only
73
112
- Code clean-up.
113
- source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de>
74
+ Update two credential helpers to correctly match which credential
75
+ to erase; they dropped not the ones with stale password.
76
+ source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
77
+ source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
78
79
116
-* ob/t9001-indent-fix (2023-08-13) 1 commit
117
- (merged to 'next' on 2023-08-18 at 00c1cf4fe7)
118
- + t9001: fix indentation in test_no_confirm()
80
+* mh/credential-libsecret-attrs (2023-06-16) 1 commit
81
+ (merged to 'next' on 2023-08-08 at dc73a2c55a)
82
+ + credential/libsecret: store new attributes
83
120
- Test style fix.
121
- source: <20230813104649.2919412-1-oswald.buddenhagen@gmx.de>
84
+ The way authentication related data other than passwords (e.g.
85
+ oath token and password expiration data) are stored in libsecret
86
+ keyrings has been rethought.
87
+ source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
88
89
+--------------------------------------------------
90
+[Stalled]
91
124
-* ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits
125
- (merged to 'next' on 2023-08-13 at 16b87e890a)
126
- + t/lib-rebase: improve documentation of set_fake_editor()
127
- + t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
128
- + t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
92
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
93
+ . gc: add `gc.repackFilterTo` config option
94
+ . repack: implement `--filter-to` for storing filtered out objects
95
+ . gc: add `gc.repackFilter` config option
96
+ . repack: add `--filter=<filter-spec>` option
97
+ . repack: refactor finding pack prefix
98
+ . repack: refactor finishing pack-objects command
99
+ . t/helper: add 'find-pack' test-tool
100
+ . pack-objects: allow `--filter` without `--stdout`
101
130
- Test updates.
131
- source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
132
- source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de>
102
+ "git repack" machinery learns to pay attention to the "--filter="
103
+ option.
104
105
+ Kicked out of the 'seen', as it still seems to be failing tests.
106
+ cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
107
+ source: <20230812000011.1227371-1-christian.couder@gmail.com>
108
135
-* rj/branch-in-use-error-message (2023-08-08) 2 commits
136
- (merged to 'next' on 2023-08-09 at 5510985b1c)
137
- + branch: error message checking out a branch in use
138
- + branch: error message deleting a branch in use
109
140
- A message written in olden time prevented a branch from getting
141
- checked out saying it is already checked out elsewhere, but these
142
- days, we treat a branch that is being bisected or rebased just like
143
- a branch that is checked out and protect it. Rephrase the message
144
- to say that the branch is in use.
145
- source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com>
110
+* ob/send-email-interactive-failure (2023-08-21) 1 commit
111
+ - send-email: prompt-dependent exit codes
112
113
+ "git send-email" exits with non-zero status when end-user
114
+ interaction causes any prepared message not to be sent.
115
148
-* rs/parse-options-negation-help (2023-08-06) 8 commits
149
- (merged to 'next' on 2023-08-18 at 9d37b5fbfe)
150
- + parse-options: simplify usage_padding()
151
- + parse-options: no --[no-]no-...
152
- + parse-options: factor out usage_indent() and usage_padding()
153
- + parse-options: show negatability of options in short help
154
- + t1502: test option negation
155
- + t1502: move optionspec help output to a file
156
- + t1502, docs: disallow --no-help
157
- + subtree: disallow --no-{help,quiet,debug,branch,message}
116
+ Expecting a reroll.
117
+ Without an opt-in fix, this will be a backward-incompatible
118
+ change that needs mention in the release notes.
119
+ source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
120
159
- "git cmd -h" learned to signal which options can be negated by
160
- listing such options like "--[no-]opt".
161
- cf. <xmqqbkfm3gne.fsf@gitster.g>
162
- source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de>
121
122
+* cc/git-replay (2023-06-03) 15 commits
123
+ - replay: stop assuming replayed branches do not diverge
124
+ - replay: add --contained to rebase contained branches
125
+ - replay: add --advance or 'cherry-pick' mode
126
+ - replay: disallow revision specific options and pathspecs
127
+ - replay: use standard revision ranges
128
+ - replay: make it a minimal server side command
129
+ - replay: remove HEAD related sanity check
130
+ - replay: remove progress and info output
131
+ - replay: add an important FIXME comment about gpg signing
132
+ - replay: don't simplify history
133
+ - replay: introduce pick_regular_commit()
134
+ - replay: die() instead of failing assert()
135
+ - replay: start using parse_options API
136
+ - replay: introduce new builtin
137
+ - t6429: remove switching aspects of fast-rebase
138
165
-* tb/repack-geometry-cleanup (2023-08-09) 1 commit
166
- (merged to 'next' on 2023-08-13 at d79c778057)
167
- + repack: move `pack_geometry` struct to the stack
139
+ No reviews?
140
+ source: <20230602102533.876905-1-christian.couder@gmail.com>
141
169
- Code clean-up.
170
- source: <2e2a760381be1f7cdae83e2f43b17d16aa8ab161.1691613149.git.me@ttaylorr.com>
142
143
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
144
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
145
173
-* ws/git-push-doc-grammofix (2023-08-09) 1 commit
174
- (merged to 'next' on 2023-08-13 at f15e9bbe75)
175
- + git-push.txt: fix grammar
146
+ "git cherry-pick A" that replays a single commit stopped before
147
+ clobbering local modification, but "git cherry-pick A..B" did not,
148
+ which has been corrected.
149
177
- Doc update.
178
- source: <20230810012105.1423462-1-wesleys@opperschaap.net>
150
+ Expecting a reroll.
151
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
152
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
153
154
--------------------------------------------------
181
-[New Topics]
155
+[Cooking]
156
157
* jk/diff-result-code-cleanup (2023-08-21) 7 commits
158
(merged to 'next' on 2023-08-25 at 3b1280d42f)
@@ -258,33 +232,39 @@ Release tarballs are available at:
232
233
234
* jc/ci-skip-same-commit (2023-08-25) 1 commit
261
- - ci: avoid building from the same commit in parallel
235
+ (merged to 'next' on 2023-08-28 at e978717961)
236
+ + ci: avoid building from the same commit in parallel
237
238
Tweak GitHub Actions CI so that pushing the same commit to multiple
239
branch tips at the same time will not waste building and testing
240
the same thing twice.
241
267
- Will merge to 'next'.
242
+ Will merge to 'master'.
243
source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
244
245
246
* py/git-gui-updates (2023-08-24) 16 commits
272
- - Merge https://github.com/prati0100/git-gui
273
- - Merge branch 'ml/cygwin-fixes'
274
- - git-gui - use mkshortcut on Cygwin
275
- - git-gui - use cygstart to browse on Cygwin
276
- - git-gui - remove obsolete Cygwin specific code
277
- - git gui Makefile - remove Cygwin modifications
278
- - Merge branch 'ab/makeflags'
279
- - Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
280
- - Merge branch 'js/windows-rce'
281
- - Work around Tcl's default `PATH` lookup
282
- - Move the `_which` function (almost) to the top
283
- - Move is_<platform> functions to the beginning
284
- - is_Cygwin: avoid `exec`ing anything
285
- - windows: ignore empty `PATH` elements
286
- - Merge branch 'vk/readme-typo'
287
- - git-gui: Fix a typo in README
247
+ (merged to 'next' on 2023-08-28 at df0b742344)
248
+ + Merge https://github.com/prati0100/git-gui
249
+ + Merge branch 'ml/cygwin-fixes'
250
+ + git-gui - use mkshortcut on Cygwin
251
+ + git-gui - use cygstart to browse on Cygwin
252
+ + git-gui - remove obsolete Cygwin specific code
253
+ + git gui Makefile - remove Cygwin modifications
254
+ + Merge branch 'ab/makeflags'
255
+ + Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
256
+ + Merge branch 'js/windows-rce'
257
+ + Work around Tcl's default `PATH` lookup
258
+ + Move the `_which` function (almost) to the top
259
+ + Move is_<platform> functions to the beginning
260
+ + is_Cygwin: avoid `exec`ing anything
261
+ + windows: ignore empty `PATH` elements
262
+ + Merge branch 'vk/readme-typo'
263
+ + git-gui: Fix a typo in README
264
+
265
+ Git GUI updates.
266
+
267
+ Will merge to 'master'.
268
269
270
* tb/mark-more-tests-as-leak-free (2023-08-24) 3 commits
@@ -294,73 +274,6 @@ Release tarballs are available at:
274
275
source: <cover.1692902414.git.me@ttaylorr.com>
276
297
---------------------------------------------------
298
-[Stalled]
299
-
300
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
301
- . gc: add `gc.repackFilterTo` config option
302
- . repack: implement `--filter-to` for storing filtered out objects
303
- . gc: add `gc.repackFilter` config option
304
- . repack: add `--filter=<filter-spec>` option
305
- . repack: refactor finding pack prefix
306
- . repack: refactor finishing pack-objects command
307
- . t/helper: add 'find-pack' test-tool
308
- . pack-objects: allow `--filter` without `--stdout`
309
-
310
- "git repack" machinery learns to pay attention to the "--filter="
311
- option.
312
-
313
- Kicked out of the 'seen', as it still seems to be failing tests.
314
- cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
315
- source: <20230812000011.1227371-1-christian.couder@gmail.com>
316
-
317
-
318
-* ob/send-email-interactive-failure (2023-08-21) 1 commit
319
- - send-email: prompt-dependent exit codes
320
-
321
- "git send-email" exits with non-zero status when end-user
322
- interaction causes any prepared message not to be sent.
323
-
324
- Expecting a reroll.
325
- Without an opt-in fix, this will be a backward-incompatible
326
- change that needs mention in the release notes.
327
- source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
328
-
329
-
330
-* cc/git-replay (2023-06-03) 15 commits
331
- - replay: stop assuming replayed branches do not diverge
332
- - replay: add --contained to rebase contained branches
333
- - replay: add --advance or 'cherry-pick' mode
334
- - replay: disallow revision specific options and pathspecs
335
- - replay: use standard revision ranges
336
- - replay: make it a minimal server side command
337
- - replay: remove HEAD related sanity check
338
- - replay: remove progress and info output
339
- - replay: add an important FIXME comment about gpg signing
340
- - replay: don't simplify history
341
- - replay: introduce pick_regular_commit()
342
- - replay: die() instead of failing assert()
343
- - replay: start using parse_options API
344
- - replay: introduce new builtin
345
- - t6429: remove switching aspects of fast-rebase
346
-
347
- No reviews?
348
- source: <20230602102533.876905-1-christian.couder@gmail.com>
349
-
350
-
351
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
352
- - cherry-pick: refuse cherry-pick sequence if index is dirty
353
-
354
- "git cherry-pick A" that replays a single commit stopped before
355
- clobbering local modification, but "git cherry-pick A..B" did not,
356
- which has been corrected.
357
-
358
- Expecting a reroll.
359
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
360
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
361
-
362
---------------------------------------------------
363
-[Cooking]
277
278
* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
279
(merged to 'next' on 2023-08-24 at 626c52ad72)
@@ -425,13 +338,15 @@ Release tarballs are available at:
338
source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
339
340
428
-* ds/scalar-updates (2023-08-22) 3 commits
429
- - scalar reconfigure: help users remove buggy repos
430
- - setup: add discover_git_directory_reason()
431
- - scalar: add --[no-]src option
341
+* ds/scalar-updates (2023-08-28) 3 commits
342
+ (merged to 'next' on 2023-08-28 at 093e6bcb9c)
343
+ + scalar reconfigure: help users remove buggy repos
344
+ + setup: add discover_git_directory_reason()
345
+ + scalar: add --[no-]src option
346
347
Scalar updates.
434
- source: <pull.1569.v2.git.1692725056.gitgitgadget@gmail.com>
348
+ Will merge to 'master'.
349
+ source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
350
351
352
* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
@@ -534,19 +449,7 @@ Release tarballs are available at:
449
source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
450
451
537
-* mh/credential-libsecret-attrs (2023-06-16) 1 commit
538
- (merged to 'next' on 2023-08-08 at dc73a2c55a)
539
- + credential/libsecret: store new attributes
540
-
541
- The way authentication related data other than passwords (e.g.
542
- oath token and password expiration data) are stored in libsecret
543
- keyrings has been rethought.
544
-
545
- Will merge to 'master'.
546
- source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
547
-
548
-
549
-* jc/rerere-cleanup (2023-08-03) 4 commits
452
+* jc/rerere-cleanup (2023-08-25) 4 commits
453
- rerere: modernize use of empty strbuf
454
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error
455
- rerere: fix comment on handle_file() helper
@@ -607,19 +510,6 @@ Release tarballs are available at:
510
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
511
512
610
-* mh/credential-erase-improvements-more (2023-07-26) 2 commits
611
- (merged to 'next' on 2023-08-08 at fd1ba4accf)
612
- + credential/wincred: erase matching creds only
613
- + credential/libsecret: erase matching creds only
614
-
615
- Update two credential helpers to correctly match which credential
616
- to erase; they dropped not the ones with stale password.
617
-
618
- Will merge to 'master'.
619
- source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
620
- source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
621
-
622
-
513
* js/doc-unit-tests (2023-08-17) 3 commits
514
- ci: run unit tests in CI
515
- unit tests: add TAP unit test framework