What's cooking (2023/08 #07)
Junio C Hamano committed
Aug 25, 2023 at 11:26 UTC
5fe49c18f18bac4372b270032c30400fdf163aa7
1 file changed
+323
-244
whats-cooking.txt
+323
-244
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2023, #06; Fri, 18)
3
-X-master-at: f9972720e9a405e4f6924a7cde0ed5880687f4d0
4
-X-next-at: 00c1cf4fe74f2ddb78eb24cb832b729034603801
2
+Subject: What's cooking in git.git (Aug 2023, #07; Fri, 25)
3
+X-master-at: 6807fcfedab84bc8cd0fbf721bc13c4e68cda9ae
4
+X-next-at: f2c9fb9f5c8eb1d665cf784c008132152540004c
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Aug 2023, #06; Fri, 18)
7
+What's cooking in git.git (Aug 2023, #07; Fri, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,7 +17,9 @@ 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 will be released early next week.
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.
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,82 +52,279 @@ Release tarballs are available at:
52
--------------------------------------------------
53
[Graduated to 'master']
54
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
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>
96
+
97
+
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
102
+
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>
106
+
107
+
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()
111
+
112
+ Code clean-up.
113
+ source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de>
114
+
115
+
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()
119
+
120
+ Test style fix.
121
+ source: <20230813104649.2919412-1-oswald.buddenhagen@gmx.de>
122
+
123
+
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
129
+
130
+ Test updates.
131
+ source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
132
+ source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de>
133
+
134
+
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
139
+
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>
146
+
147
+
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}
158
57
- Typofix to documentation added during this cycle.
58
- source: <b1b3f1d10b64e63c62db0105957a4ad5e0295d34.1692194193.git.martin.agren@gmail.com>
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>
163
164
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
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
168
65
- Mark-up fix to documentation added during this cycle.
66
- source: <f52247af9027192d0a29b8ee049db20250314d74.1692194193.git.martin.agren@gmail.com>
169
+ Code clean-up.
170
+ source: <2e2a760381be1f7cdae83e2f43b17d16aa8ab161.1691613149.git.me@ttaylorr.com>
171
172
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
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
176
74
- Typo/grammofix to documentation added during this cycle.
75
- source: <cover.1692194193.git.martin.agren@gmail.com>
177
+ Doc update.
178
+ source: <20230810012105.1423462-1-wesleys@opperschaap.net>
179
180
--------------------------------------------------
181
[New Topics]
182
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
183
+* jk/diff-result-code-cleanup (2023-08-21) 7 commits
184
+ (merged to 'next' on 2023-08-25 at 3b1280d42f)
185
+ + diff: drop useless "status" parameter from diff_result_code()
186
+ + diff: drop useless return values in git-diff helpers
187
+ + diff: drop useless return from run_diff_{files,index} functions
188
+ + diff: die when failing to read index in git-diff builtin
189
+ + diff: show usage for unknown builtin_diff_files() options
190
+ + diff-files: avoid negative exit value
191
+ + diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
192
+
193
+ "git diff --no-such-option" and other corner cases around the exit
194
+ status of the "diff" command has been corrected.
195
+
196
+ Will merge to 'master'.
197
+ source: <20230821201358.GA2663749@coredump.intra.peff.net>
198
+
199
+
200
+* tb/path-filter-fix (2023-08-21) 15 commits
201
+ - bloom: introduce `deinit_bloom_filters()`
202
+ - commit-graph: reuse existing Bloom filters where possible
203
+ - object.h: fix mis-aligned flag bits table
204
+ - commit-graph: drop unnecessary `graph_read_bloom_data_context`
205
+ - commit-graph.c: unconditionally load Bloom filters
206
+ - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()`
207
+ - bloom: prepare to discard incompatible Bloom filters
208
+ - bloom: annotate filters with hash version
209
+ - commit-graph: new filter ver. that fixes murmur3
210
+ - repo-settings: introduce commitgraph.changedPathsVersion
211
+ - t4216: test changed path filters with high bit paths
212
+ - t/helper/test-read-graph: implement `bloom-filters` mode
213
+ - bloom.h: make `load_bloom_filter_from_graph()` public
214
+ - t/helper/test-read-graph.c: extract `dump_graph_info()`
215
+ - gitformat-commit-graph: describe version 2 of BDAT
216
87
- "git diff -w --exit-code" with various options did not work
88
- correctly, which is being addressed.
217
+ The Bloom filter used for path limited history traversal was broken
218
+ on systems whose "char" is unsigned; update the implementation and
219
+ bump the format version to 2.
220
90
- Needs review.
91
- source: <20230818235932.3253552-1-gitster@pobox.com>
221
+ Comments?
222
+ source: <cover.1692654233.git.me@ttaylorr.com>
223
224
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
225
+* ch/t6300-verify-commit-test-cleanup (2023-08-23) 2 commits
226
+ (merged to 'next' on 2023-08-24 at 15b842867e)
227
+ + t/t6300: drop magic filtering
228
+ + t/lib-gpg: forcibly run a trustdb update
229
+
230
+ Test clean-up.
231
+
232
+ Will merge to 'master'.
233
+ source: <20230822150149.541ccb35@leda.eworm.net>
234
+
235
+
236
+* ts/unpacklimit-config-fix (2023-08-22) 1 commit
237
+ (merged to 'next' on 2023-08-23 at 4fabd9a697)
238
+ + transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
239
+
240
+ transfer.unpackLimit ought to be used as a fallback, but overrode
241
+ fetch.unpackLimit and receive.unpackLimit instead.
242
+
243
+ Will merge to 'master'.
244
+ source: <xmqqpm3eh7f6.fsf@gitster.g>
245
99
- "git update-index" learns "--show-index-version" to inspect
100
- the index format version used by the on-disk index file.
246
+
247
+* js/config-parse (2023-08-23) 4 commits
248
+ - config-parse: split library out of config.[c|h]
249
+ - config.c: accept config_parse_options in git_config_from_stdin
250
+ - config: report config parse errors using cb
251
+ - config: split out config_parse_options
252
+
253
+ Split out parsing routines for the configuration files into a
254
+ separate file.
255
256
Needs review.
103
- source: <20230818233729.2766281-1-gitster@pobox.com>
257
+ source: <cover.1692827403.git.steadmon@google.com>
258
+
259
+
260
+* jc/ci-skip-same-commit (2023-08-25) 1 commit
261
+ - ci: avoid building from the same commit in parallel
262
+
263
+ Tweak GitHub Actions CI so that pushing the same commit to multiple
264
+ branch tips at the same time will not waste building and testing
265
+ the same thing twice.
266
+
267
+ Will merge to 'next'.
268
+ source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
269
+
270
+
271
+* 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
288
+
289
+
290
+* tb/mark-more-tests-as-leak-free (2023-08-24) 3 commits
291
+ - leak tests: mark t5583-push-branches.sh as leak-free
292
+ - leak tests: mark t3321-notes-stripspace.sh as leak-free
293
+ - leak tests: mark a handful of tests as leak-free
294
+
295
+ source: <cover.1692902414.git.me@ttaylorr.com>
296
297
--------------------------------------------------
298
[Stalled]
299
108
-* ob/send-email-interactive-failure (2023-08-09) 1 commit
109
- . send-email: prompt-dependent exit codes
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
111
- "git send-email" exits with non-zero status when end-user
112
- interaction causes any prepared message not to be sent.
310
+ "git repack" machinery learns to pay attention to the "--filter="
311
+ option.
312
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>
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
120
-* ob/sequencer-empty-hint-fix (2023-08-09) 1 commit
121
- . sequencer: rectify empty hint in call of require_clean_work_tree()
318
+* ob/send-email-interactive-failure (2023-08-21) 1 commit
319
+ - send-email: prompt-dependent exit codes
320
123
- Update the use of API for consistency between two calls to
124
- require_clean_work_tree() from the sequencer code.
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.
127
- cf. <xmqqedkahoio.fsf@gitster.g>
128
- source: <20230809171531.2564829-1-oswald.buddenhagen@gmx.de>
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
@@ -163,114 +362,101 @@ Release tarballs are available at:
362
--------------------------------------------------
363
[Cooking]
364
166
-* ob/revert-of-revert-is-reapply (2023-08-11) 3 commits
167
- - SQUASH??? reword by Linus Arver and Phillip Wood
168
- - doc: revert: add discussion
365
+* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
366
+ (merged to 'next' on 2023-08-24 at 626c52ad72)
367
+ + sequencer: rectify empty hint in call of require_clean_work_tree()
368
+
369
+ Update the use of API for consistency between two calls to
370
+ require_clean_work_tree() from the sequencer code.
371
+
372
+ Will merge to 'master'.
373
+ source: <20230824150046.802008-1-oswald.buddenhagen@gmx.de>
374
+
375
+
376
+* jc/diff-exit-code-with-w-fixes (2023-08-21) 5 commits
377
+ (merged to 'next' on 2023-08-23 at 436a0aec3d)
378
+ + diff: the -w option breaks --exit-code for --raw and other output modes
379
+ + t4040: remove test that succeeded for a wrong reason
380
+ + diff: teach "--stat -w --exit-code" to notice differences
381
+ + diff: mode-only change should be noticed by "--patch -w --exit-code"
382
+ + diff: move the fallback "--exit-code" code down
383
+
384
+ "git diff -w --exit-code" with various options did not work
385
+ correctly, which is being addressed.
386
+
387
+ Will merge to 'master'.
388
+ source: <20230818235932.3253552-1-gitster@pobox.com>
389
+
390
+
391
+* jc/update-index-show-index-version (2023-08-18) 3 commits
392
+ - test-tool: retire "index-version"
393
+ - update-index: add --show-index-version
394
+ - update-index doc: v4 is OK with JGit and libgit2
395
+
396
+ "git update-index" learns "--show-index-version" to inspect
397
+ the index format version used by the on-disk index file.
398
+
399
+ Needs review.
400
+ source: <20230818233729.2766281-1-gitster@pobox.com>
401
+
402
+
403
+* ob/revert-of-revert-is-reapply (2023-08-21) 2 commits
404
+ - git-revert.txt: add discussion
405
- sequencer: beautify subject of reverts of reverts
406
407
Tweak the default log message created by "git revert" when
408
reverting a commit that records a revert.
409
174
- Expecting a hopefully final reroll, without the [3/2].
175
- source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
410
+ Expecting a (hopefully small and final) reroll.
411
+ cf. <ZOZnNDd2pMX6M2Au@nand.local>
412
+ source: <20230809171531.2564807-1-oswald.buddenhagen@gmx.de>
413
414
178
-* ob/format-patch-description-file (2023-08-11) 1 commit
179
- - format-patch: add --description-file option
415
+* ob/format-patch-description-file (2023-08-21) 1 commit
416
+ (merged to 'next' on 2023-08-25 at 89ea619311)
417
+ + format-patch: add --description-file option
418
419
"git format-patch" learns a way to feed cover letter description,
420
that (1) can be used on detached HEAD where there is no branch
421
description available, and (2) also can override the branch
422
description if there is one.
423
186
- Expecting a reroll.
187
- cf. <ZNa2VQQzZmaMzM4C@ugly>
188
- source: <20230809171530.2564724-1-oswald.buddenhagen@gmx.de>
424
+ Will merge to 'master'.
425
+ source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
426
427
191
-* ds/scalar-updates (2023-08-14) 2 commits
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
432
433
Scalar updates.
196
-
197
- Expecting a reroll.
198
- cf. <abae52d5-47d5-4439-9d2b-68bb6e1c96fa@github.com>
199
- source: <pull.1569.git.1692025937.gitgitgadget@gmail.com>
200
-
201
-
202
-* ja/worktree-orphan (2023-08-13) 1 commit
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
-
208
- Will cook in 'next'.
209
- source: <20230811233940.30264-1-jacobabel@nullpo.dev>
434
+ source: <pull.1569.v2.git.1692725056.gitgitgadget@gmail.com>
435
436
437
* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
213
- - mv: fix error for moving directory to another
438
+ (merged to 'next' on 2023-08-21 at 2220d22d6f)
439
+ + mv: fix error for moving directory to another
440
441
Typofix in an error message.
442
217
- Will merge to 'next'.
443
+ Will merge to 'master'.
444
source: <xmqqjzu1njt0.fsf@gitster.g>
445
446
221
-* ob/t9001-indent-fix (2023-08-13) 1 commit
222
- (merged to 'next' on 2023-08-18 at 00c1cf4fe7)
223
- + t9001: fix indentation in test_no_confirm()
224
-
225
- Test style fix.
226
-
227
- Will cook in 'next'.
228
- source: <20230813104649.2919412-1-oswald.buddenhagen@gmx.de>
229
-
230
-
447
* sl/sparse-check-attr (2023-08-11) 3 commits
232
- - check-attr: integrate with sparse-index
233
- - attr.c: read attributes in a sparse directory
234
- - t1092: add tests for 'git check-attr'
448
+ (merged to 'next' on 2023-08-21 at c202b15517)
449
+ + check-attr: integrate with sparse-index
450
+ + attr.c: read attributes in a sparse directory
451
+ + t1092: add tests for 'git check-attr'
452
453
Teach "git check-attr" work better with sparse-index.
454
238
- Will merge to 'next'.
455
+ Will merge to 'master'.
456
cf. <3b2a5b4b-ab8f-746b-6b69-8e8262b6390b@github.com>
240
- Looking good.
457
source: <20230811142211.4547-1-cheskaqiqi@gmail.com>
458
459
244
-* ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit
245
- (merged to 'next' on 2023-08-09 at df4360945c)
246
- + sequencer: simplify allocation of result array in todo_list_rearrange_squash()
247
-
248
- Code clean-up.
249
-
250
- Will cook in 'next'.
251
- source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de>
252
-
253
-
254
-* tb/repack-geometry-cleanup (2023-08-09) 1 commit
255
- (merged to 'next' on 2023-08-13 at d79c778057)
256
- + repack: move `pack_geometry` struct to the stack
257
-
258
- Code clean-up.
259
-
260
- Will cook in 'next'.
261
- source: <2e2a760381be1f7cdae83e2f43b17d16aa8ab161.1691613149.git.me@ttaylorr.com>
262
-
263
-
264
-* ws/git-push-doc-grammofix (2023-08-09) 1 commit
265
- (merged to 'next' on 2023-08-13 at f15e9bbe75)
266
- + git-push.txt: fix grammar
267
-
268
- Doc update.
269
-
270
- Will cook in 'next'.
271
- source: <20230810012105.1423462-1-wesleys@opperschaap.net>
272
-
273
-
460
* ws/svn-with-new-readline (2023-08-11) 1 commit
461
- git-svn: avoid creating more than one than one Term::ReadLine object
462
@@ -281,7 +467,8 @@ Release tarballs are available at:
467
source: <20230810011831.1423208-1-wesleys@opperschaap.net>
468
469
284
-* ak/pretty-decorate-more (2023-08-10) 7 commits
470
+* ak/pretty-decorate-more (2023-08-21) 8 commits
471
+ - decorate: use commit color for HEAD arrow
472
- pretty: add pointer and tag options to %(decorate)
473
- pretty: add %(decorate[:<options>]) format
474
- decorate: color each token separately
@@ -293,36 +480,12 @@ Release tarballs are available at:
480
Teach "git log --format" a customizable %(decorate) placeholder.
481
482
What's the status of this thing?
296
- source: <20230810211619.19055-1-andy.koppe@gmail.com>
297
-
298
-
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
-
305
- Error message generation fix.
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
313
- (merged to 'next' on 2023-08-13 at 85536da9f7)
314
- + rebase: allow overriding the maximal length of the generated labels
315
- + sequencer: truncate labels to accommodate loose refs
316
-
317
- Chomp overly long label names used in the sequencer machinery.
318
-
319
- Will cook in 'next'.
320
- source: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com>
483
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
484
485
323
-* tb/commit-graph-verify-fix (2023-08-10) 4 commits
324
- (merged to 'next' on 2023-08-13 at ba45da55f5)
325
- + commit-graph: invert negated conditional
486
+* tb/commit-graph-verify-fix (2023-08-21) 4 commits
487
+ (merged to 'next' on 2023-08-23 at 2b4b74bb0d)
488
+ + commit-graph: avoid repeated mixed generation number warnings
489
+ t/t5318-commit-graph.sh: test generation zero transitions during fsck
490
+ commit-graph: verify swapped zero/non-zero generation cases
491
+ commit-graph: introduce `commit_graph_generation_from_graph()`
@@ -330,8 +493,8 @@ Release tarballs are available at:
493
Update commit-graph verification code that detects mixture of zero
494
and non-zero generation numbers.
495
333
- Will cook in 'next'.
334
- source: <cover.1691699851.git.me@ttaylorr.com>
496
+ Will merge to 'master'.
497
+ source: <cover.1692653671.git.me@ttaylorr.com>
498
499
500
* la/trailer-cleanups (2023-08-06) 5 commits
@@ -371,38 +534,6 @@ Release tarballs are available at:
534
source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
535
536
374
-* ds/maintenance-schedule-fuzz (2023-08-10) 8 commits
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
-
387
- Will cook in 'next'.
388
- source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com>
389
-
390
-
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
394
- + branch: error message deleting a branch in use
395
-
396
- A message written in olden time prevented a branch from getting
397
- checked out saying it is already checked out elsewhere, but these
398
- days, we treat a branch that is being bisected or rebased just like
399
- a branch that is checked out and protect it. Rephrase the message
400
- to say that the branch is in use.
401
-
402
- Will cook in 'next'.
403
- source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com>
404
-
405
-
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
@@ -411,8 +542,7 @@ Release tarballs are available at:
542
oath token and password expiration data) are stored in libsecret
543
keyrings has been rethought.
544
414
- Will cook in 'next'.
415
- Needs review.
545
+ Will merge to 'master'.
546
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
547
548
@@ -477,25 +607,6 @@ Release tarballs are available at:
607
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
608
609
480
-* rs/parse-options-negation-help (2023-08-06) 8 commits
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
-
494
- Will cook in 'next'.
495
- cf. <xmqqbkfm3gne.fsf@gitster.g>
496
- source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de>
497
-
498
-
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
@@ -504,30 +615,11 @@ Release tarballs are available at:
615
Update two credential helpers to correctly match which credential
616
to erase; they dropped not the ones with stale password.
617
507
- Will cook in 'next'.
508
- Needs review.
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
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
514
- . gc: add `gc.repackFilterTo` config option
515
- . repack: implement `--filter-to` for storing filtered out objects
516
- . gc: add `gc.repackFilter` config option
517
- . repack: add `--filter=<filter-spec>` option
518
- . repack: refactor finding pack prefix
519
- . repack: refactor finishing pack-objects command
520
- . t/helper: add 'find-pack' test-tool
521
- . pack-objects: allow `--filter` without `--stdout`
522
-
523
- "git repack" machinery learns to pay attention to the "--filter="
524
- option.
525
-
526
- Kicked out of the 'seen', as it still seems to be failing tests.
527
- cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
528
- source: <20230812000011.1227371-1-christian.couder@gmail.com>
529
-
530
-
623
* js/doc-unit-tests (2023-08-17) 3 commits
624
- ci: run unit tests in CI
625
- unit tests: add TAP unit test framework
@@ -538,6 +630,8 @@ Release tarballs are available at:
630
Comments?
631
source: <cover.1692297001.git.steadmon@google.com>
632
633
+--------------------------------------------------
634
+[Discarded]
635
636
* jt/path-filter-fix (2023-08-08) 8 commits
637
(merged to 'next' on 2023-08-09 at 59952b9ec9)
@@ -555,27 +649,12 @@ Release tarballs are available at:
649
on systems whose "char" is unsigned; update the implementation and
650
bump the format version to 2.
651
558
- Will cook in 'next'.
652
+ Reverted out of 'next', superseded by the tb/path-filter-fix topic.
653
cf. <ZMqp6K2iXixWH/zT@nand.local>
654
source: <cover.1690912539.git.jonathantanmy@google.com>
655
source: <20230808192240.GA4091261@coredump.intra.peff.net>
656
657
564
-* ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits
565
- (merged to 'next' on 2023-08-13 at 16b87e890a)
566
- + t/lib-rebase: improve documentation of set_fake_editor()
567
- + t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
568
- + t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
569
-
570
- Test updates.
571
-
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
-
658
* ab/tag-object-type-errors (2023-05-10) 4 commits
659
. tag: don't emit potentially incorrect "object is a X, not a Y"
660
. tag: don't misreport type of tagged objects in errors