What's cooking (2023/08 #04)
Junio C Hamano committed
Aug 10, 2023 at 17:45 UTC
7ff8a6d01d1b505c7ac42d39f4be2be1add2961d
1 file changed
+288
-193
whats-cooking.txt
+288
-193
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2023, #03; Tue, 8)
3
-X-master-at: a82fb66fed250e16d3010c75404503bea3f0ab61
4
-X-next-at: fd1ba4accffeede84a3a0c749bb6e1e407769a41
2
+Subject: What's cooking in git.git (Aug 2023, #04; Thu, 10)
3
+X-master-at: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd
4
+X-next-at: 551eb34607c0f3837c0a567622e251f9ea1cdc27
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Aug 2023, #03; Tue, 8)
7
+What's cooking in git.git (Aug 2023, #04; Thu, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,9 +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
-There are some last-minute fixes that update or add messages that
21
-are marked for i18n, and they may have to be fast-tracked to -rc1,
22
-which we may want to delay by one day for that reason.
20
+Git 2.42-rc1 has been tagged. From here on, the 'master' front is
21
+expected to merge only fixes for new regressions that happened in
22
+this cycle, while other topics will wait in 'next' or on the mailing
23
+list for their turn after the release is done.
24
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
@@ -52,185 +53,184 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
55
-* am/doc-sha256 (2023-07-31) 1 commit
56
- (merged to 'next' on 2023-08-01 at d7419bf527)
57
- + doc: sha256 is no longer experimental
56
+* bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit
57
+ (merged to 'next' on 2023-08-03 at e786442a9b)
58
+ + ident: don't consider '.' a crud
59
59
- Tone down the warning on SHA-256 repositories being an experimental
60
- curiosity. We do not have support for them to interoperate with
61
- traditional SHA-1 repositories, but at this point, we do not plan
62
- to make breaking changes to SHA-256 repositories and there is no
63
- longer need for such a strongly phrased warning.
64
- source: <ZMe6KmzZGVubYpvO@adams>
60
+ Exclude "." from the set of characters to be removed from the
61
+ beginning and the end of the human-readable name.
62
+ source: <xmqqsf918k4j.fsf@gitster.g>
63
64
67
-* ew/sha256-gcrypt-leak-fixes (2023-07-31) 3 commits
68
- (merged to 'next' on 2023-08-01 at eed83801c3)
69
- + sha256/gcrypt: die on gcry_md_open failures
70
- + sha256/gcrypt: fix memory leak with SHA-256 repos
71
- + sha256/gcrypt: fix build with SANITIZE=leak
65
+* bc/ignore-clangd-cache (2023-08-04) 1 commit
66
+ (merged to 'next' on 2023-08-04 at 5cf8d41911)
67
+ + gitignore: ignore clangd .cache directory
68
73
- Leakfixes.
74
- source: <20230731120808.1230210-1-e@80x24.org>
69
+ .gitignore update.
70
+ source: <20230804171328.1737188-1-sandals@crustytoothpaste.net>
71
72
77
-* rs/bundle-parseopt-cleanup (2023-07-31) 1 commit
78
- (merged to 'next' on 2023-08-01 at 405eb138fa)
79
- + bundle: use OPT_PASSTHRU_ARGV
73
+* ew/hash-with-openssl-evp (2023-08-01) 2 commits
74
+ (merged to 'next' on 2023-08-02 at 996db74865)
75
+ + avoid SHA-1 functions deprecated in OpenSSL 3+
76
+ + sha256: avoid functions deprecated in OpenSSL 3+
77
81
- Code clean-up.
82
- source: <2dcb915f-b926-e024-6394-23aff200955c@web.de>
78
+ Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
79
+ its traditional API, by using its EVP API instead.
80
+ source: <20230801025454.1137802-1-e@80x24.org>
81
82
85
-* tb/commit-graph-tests (2023-07-24) 5 commits
86
- (merged to 'next' on 2023-07-31 at 740a260315)
87
- + t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
88
- + t5328: avoid top-level directory changes
89
- + t5318: avoid top-level directory changes
90
- + t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`
91
- + t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories
83
+* ma/locate-in-path-for-windows (2023-08-04) 3 commits
84
+ (merged to 'next' on 2023-08-06 at 02bc13f4a3)
85
+ + docs: update when `git bisect visualize` uses `gitk`
86
+ + compat/mingw: implement a native locate_in_PATH()
87
+ + run-command: conditionally define locate_in_PATH()
88
+
89
+ "git bisect visualize" stopped running "gitk" on Git for Windows
90
+ when the command was reimplemented in C around Git 2.34 timeframe.
91
+ This has been corrected.
92
+ source: <pull.1560.v2.git.1691122124.gitgitgadget@gmail.com>
93
93
- Test updates.
94
- source: <cover.1690216758.git.me@ttaylorr.com>
94
+
95
+* pw/rebase-skip-commit-message-fix (2023-08-03) 1 commit
96
+ (merged to 'next' on 2023-08-06 at 1e44443e65)
97
+ + rebase --skip: fix commit message clean up when skipping squash
98
+
99
+ "git rebase -i" with a series of squash/fixup, when one of the
100
+ steps stopped in conflicts and ended up getting skipped, did not
101
+ handle the accumulated commit log messages, which has been
102
+ corrected.
103
+ source: <pull.1558.git.git.1691068176051.gitgitgadget@gmail.com>
104
105
--------------------------------------------------
106
[New Topics]
107
99
-* la/trailer-cleanups (2023-08-06) 5 commits
100
- - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
101
- - trailer: teach find_patch_start about --no-divider
102
- - trailer: split process_command_line_args into separate functions
103
- - trailer: split process_input_file into separate pieces
104
- - trailer: separate public from internal portion of trailer_iterator
108
+* ds/maintenance-on-windows-fix (2023-08-09) 2 commits
109
+ (merged to 'next' on 2023-08-09 at 3d7abef9be)
110
+ + git maintenance: avoid console window in scheduled tasks on Windows
111
+ + win32: add a helper to run `git.exe` without a foreground window
112
106
- Code clean-up.
113
+ Windows updates.
114
108
- Needs review.
109
- source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
115
+ Will merge to 'master'.
116
+ source: <pull.1570.git.1691600087.gitgitgadget@gmail.com>
117
118
112
-* la/trailer-test-and-doc-updates (2023-08-06) 5 commits
113
- - trailer --no-divider help: describe usual "---" meaning
114
- - trailer: trailer location is a place, not an action
115
- - trailer: add tests to check defaulting behavior with --no-* flags
116
- - trailer test description: this tests --where=after, not --where=before
117
- - trailer tests: make test cases self-contained
119
+* jc/send-email-pre-process-fix (2023-08-09) 1 commit
120
+ (merged to 'next' on 2023-08-09 at ba1b999ec2)
121
+ + t9001: remove excessive GIT_SEND_EMAIL_NOTTY=1
122
119
- Test coverage improvement for trailers.
123
+ Test fix.
124
121
- Needs review.
122
- source: <pull.1564.git.1691210737.gitgitgadget@gmail.com>
125
+ Will merge to 'master'.
126
+ source: <20230809171531.2564754-1-oswald.buddenhagen@gmx.de>
127
128
125
-* jk/repack-leakfix (2023-08-08) 1 commit
126
- - repack: free geometry struct
129
+* ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit
130
+ (merged to 'next' on 2023-08-09 at df4360945c)
131
+ + sequencer: simplify allocation of result array in todo_list_rearrange_squash()
132
128
- Leakfix.
133
+ Code clean-up.
134
130
- Will merge to 'next'.
131
- source: <20230808185023.GA3498623@coredump.intra.peff.net>
135
+ Will cook in 'next'.
136
+ source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de>
137
138
134
-* jk/send-email-with-new-readline (2023-08-08) 2 commits
135
- - send-email: avoid creating more than one Term::ReadLine object
136
- - send-email: drop FakeTerm hack
139
+* st/mv-lstat-fix (2023-08-09) 1 commit
140
+ (merged to 'next' on 2023-08-09 at 4b5708df7c)
141
+ + mv: handle lstat() failure correctly
142
138
- Adjust to newer Term::ReadLine to prevent it from breaking
139
- the interactive prompt code in send-email.
143
+ Correct use of lstat() that assumed a failing call would not
144
+ clobber the statbuf.
145
141
- Will merge to 'next'.
142
- source: <20230808180935.GA2096901@coredump.intra.peff.net>
146
+ Will merge to 'master'.
147
+ source: <pull.1561.v2.git.1691567261701.gitgitgadget@gmail.com>
148
149
145
-* js/allow-t4000-to-be-indented-with-spaces (2023-08-08) 1 commit
146
- - t0040: declare non-tab indentation to be okay in this script
150
+* tb/repack-geometry-cleanup (2023-08-09) 1 commit
151
+ - repack: move `pack_geometry` struct to the stack
152
+ (this branch uses jk/repack-leakfix.)
153
148
- File attribute update.
154
+ Code clean-up.
155
156
Will merge to 'next'.
151
- source: <pull.1568.git.1691491054706.gitgitgadget@gmail.com>
157
+ source: <cover.1691613149.git.me@ttaylorr.com>
158
159
154
-* ob/rebase-conflict-advice-i18n-fix (2023-08-07) 1 commit
155
- - advice: handle "rebase" in error_resolve_conflict()
160
+* ws/git-push-doc-grammofix (2023-08-09) 1 commit
161
+ - git-push.txt: fix grammar
162
157
- i18n coverage improvement and avoidance of sentence lego.
163
+ Doc update.
164
165
Will merge to 'next'.
160
- source: <20230807170935.2336715-1-oswald.buddenhagen@gmx.de>
166
+ source: <20230810012105.1423462-1-wesleys@opperschaap.net>
167
168
163
-* rs/parse-opt-forbid-set-int-0-without-noneg (2023-08-08) 1 commit
164
- - parse-options: disallow negating OPTION_SET_INT 0
169
+* ws/svn-with-new-readline (2023-08-09) 1 commit
170
+ - git-svn: avoid creating more than one than one Term::ReadLine object
171
+ (this branch uses jk/send-email-with-new-readline.)
172
166
- Developer support to detect meaningless combination of options.
173
+ Adjust to newer Term::ReadLine to prevent it from breaking
174
+ the interactive prompt code in git-svn.
175
168
- Will merge to 'next'.
169
- source: <c4cd1591-3a83-920a-6a80-19ffbfe3089d@web.de>
176
+ Will merge to 'next' and then to 'master'.
177
+ source: <20230810011831.1423208-1-wesleys@opperschaap.net>
178
179
172
-* ds/maintenance-schedule-fuzz (2023-08-07) 6 commits
173
- - maintenance: use random minute in systemd scheduler
174
- - maintenance: swap method locations
175
- - maintenance: use random minute in cron scheduler
176
- - maintenance: use random minute in Windows scheduler
177
- - maintenance: use random minute in launchctl scheduler
178
- - maintenance: add get_random_minute()
180
+* ak/pretty-decorate-more (2023-08-10) 7 commits
181
+ - pretty: add pointer and tag options to %(decorate)
182
+ - pretty: add %(decorate[:<options>]) format
183
+ - decorate: color each token separately
184
+ - decorate: avoid some unnecessary color overhead
185
+ - decorate: refactor format_decorations()
186
+ - pretty-formats: enclose options in angle brackets
187
+ - pretty-formats: define "literal formatting code"
188
180
- Allow "git maintenance" schedule to be randomly distributed.
189
+ Teach "git log --format" a customizable %(decorate) placeholder.
190
182
- Still under discussion.
183
- Expecting a reroll.
184
- source: <pull.1567.git.1691434300.gitgitgadget@gmail.com>
191
+ Needs review.
192
+ source: <20230715160730.4046-1-andy.koppe@gmail.com>
193
194
187
-* ob/send-email-interactive-failure (2023-08-07) 1 commit
188
- - send-email: prompt-dependent exit codes
195
+* ds/upload-pack-error-sequence-fix (2023-08-10) 1 commit
196
+ - upload-pack: fix race condition in error messages
197
190
- "git send-email" exits with non-zero status when end-user
191
- interaction causes any prepared message not to be sent.
198
+ Error message generation fix.
199
193
- Expecting a reroll.
194
- Without an opt-in fix, this will be a backward-incompatible
195
- change that needs mention in the release notes.
196
- source: <20230807165850.2335067-1-oswald.buddenhagen@gmx.de>
200
+ Will merge to 'next'.
201
+ source: <pull.1572.git.1691678450757.gitgitgadget@gmail.com>
202
203
199
-* ob/sequencer-empty-hint-fix (2023-08-07) 1 commit
200
- - sequencer: rectify empty hint in call of require_clean_work_tree()
204
+* mp/rebase-label-length-limit (2023-08-10) 2 commits
205
+ - rebase: allow overriding the maximal length of the generated labels
206
+ - sequencer: truncate labels to accommodate loose refs
207
202
- Under some unspecified condition, a code that calls into the
203
- sequencer can produce an extra "error:" output that has no
204
- meaningful message on it.
208
+ Chomp overly long label names used in the sequencer machinery.
209
206
- Expecting a reroll.
207
- cf. <xmqqcyzx6ma1.fsf@gitster.g>
208
- source: <20230807170935.2336730-1-oswald.buddenhagen@gmx.de>
210
+ Will merge to 'next'.
211
+ source: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com>
212
213
211
-* ob/test-lib-rebase-fake-editor-updates (2023-08-07) 3 commits
212
- - t/lib-rebase: improve documentation of set_fake_editor()
213
- - t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
214
- - t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
214
+* pw/diff-no-index-from-named-pipes (2023-08-10) 1 commit
215
+ - t4053: avoid race when killing background processes
216
217
Test updates.
218
218
- Will merge to 'next'.
219
- source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
219
+ Will merge to 'next'?
220
+ source: <pull.1571.git.1691677993195.gitgitgadget@gmail.com>
221
222
222
-* rj/branch-in-use-error-message (2023-08-08) 2 commits
223
- - branch: error message checking out a branch in use
224
- - branch: error message deleting a branch in use
223
+* tb/commit-graph-verify-fix (2023-08-10) 4 commits
224
+ - commit-graph: invert negated conditional
225
+ - t/t5318-commit-graph.sh: test generation zero transitions during fsck
226
+ - commit-graph: verify swapped zero/non-zero generation cases
227
+ - commit-graph: introduce `commit_graph_generation_from_graph()`
228
226
- A message written in olden time prevented a branch from getting
227
- checked out saying it is already checked out elsewhere, but these
228
- days, we treat a branch that is being bisected or rebased just like
229
- a branch that is checked out and protect it. Rephrase the message
230
- to say that the branch is in use.
229
+ Update commit-graph verification code that detects mixture of zero
230
+ and non-zero generation numbers.
231
232
Will merge to 'next'.
233
- source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com>
233
+ source: <cover.1691699851.git.me@ttaylorr.com>
234
235
--------------------------------------------------
236
[Stalled]
@@ -297,6 +297,147 @@ Release tarballs are available at:
297
--------------------------------------------------
298
[Cooking]
299
300
+* la/trailer-cleanups (2023-08-06) 5 commits
301
+ - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
302
+ - trailer: teach find_patch_start about --no-divider
303
+ - trailer: split process_command_line_args into separate functions
304
+ - trailer: split process_input_file into separate pieces
305
+ - trailer: separate public from internal portion of trailer_iterator
306
+
307
+ Code clean-up.
308
+
309
+ Needs review.
310
+ source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
311
+
312
+
313
+* la/trailer-test-and-doc-updates (2023-08-10) 14 commits
314
+ - SQUASH???
315
+ - trailer doc: <token> is a <key> or <keyAlias>, not both
316
+ - trailer doc: separator within key suppresses default separator
317
+ - trailer doc: emphasize the effect of configuration variables
318
+ - trailer --unfold help: prefer "reformat" over "join"
319
+ - trailer --parse docs: add explanation for its usefulness
320
+ - trailer --only-input: prefer "configuration variables" over "rules"
321
+ - trailer --parse help: expose aliased options
322
+ - trailer --no-divider help: describe usual "---" meaning
323
+ - trailer: trailer location is a place, not an action
324
+ - trailer doc: narrow down scope of --where and related flags
325
+ - trailer: add tests to check defaulting behavior with --no-* flags
326
+ - trailer test description: this tests --where=after, not --where=before
327
+ - trailer tests: make test cases self-contained
328
+
329
+ Test coverage improvement for trailers.
330
+
331
+ Needs review.
332
+ source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
333
+
334
+
335
+* jk/repack-leakfix (2023-08-08) 1 commit
336
+ (merged to 'next' on 2023-08-09 at 8692d7b2e0)
337
+ + repack: free geometry struct
338
+ (this branch is used by tb/repack-geometry-cleanup.)
339
+
340
+ Leakfix.
341
+
342
+ Will merge to 'master'.
343
+ source: <20230808185023.GA3498623@coredump.intra.peff.net>
344
+
345
+
346
+* jk/send-email-with-new-readline (2023-08-08) 2 commits
347
+ (merged to 'next' on 2023-08-09 at d42e4ca9f8)
348
+ + send-email: avoid creating more than one Term::ReadLine object
349
+ + send-email: drop FakeTerm hack
350
+ (this branch is used by ws/svn-with-new-readline.)
351
+
352
+ Adjust to newer Term::ReadLine to prevent it from breaking
353
+ the interactive prompt code in send-email.
354
+
355
+ Will merge to 'master'.
356
+ source: <20230808180935.GA2096901@coredump.intra.peff.net>
357
+
358
+
359
+* js/allow-t4000-to-be-indented-with-spaces (2023-08-08) 1 commit
360
+ (merged to 'next' on 2023-08-09 at 9c0d6659ec)
361
+ + t0040: declare non-tab indentation to be okay in this script
362
+
363
+ File attribute update.
364
+
365
+ Will merge to 'master'.
366
+ source: <pull.1568.git.1691491054706.gitgitgadget@gmail.com>
367
+
368
+
369
+* ob/rebase-conflict-advice-i18n-fix (2023-08-07) 1 commit
370
+ (merged to 'next' on 2023-08-09 at 0e02113510)
371
+ + advice: handle "rebase" in error_resolve_conflict()
372
+
373
+ i18n coverage improvement and avoidance of sentence lego.
374
+
375
+ Will merge to 'master'.
376
+ source: <20230807170935.2336715-1-oswald.buddenhagen@gmx.de>
377
+
378
+
379
+* rs/parse-opt-forbid-set-int-0-without-noneg (2023-08-08) 1 commit
380
+ (merged to 'next' on 2023-08-09 at fab1193dbc)
381
+ + parse-options: disallow negating OPTION_SET_INT 0
382
+
383
+ Developer support to detect meaningless combination of options.
384
+
385
+ Will merge to 'master'.
386
+ source: <c4cd1591-3a83-920a-6a80-19ffbfe3089d@web.de>
387
+
388
+
389
+* 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()
398
+
399
+ Allow "git maintenance" schedule to be randomly distributed.
400
+
401
+ Looking good.
402
+ source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com>
403
+
404
+
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
+ source: <20230809171531.2564829-1-oswald.buddenhagen@gmx.de>
424
+
425
+
426
+* rj/branch-in-use-error-message (2023-08-08) 2 commits
427
+ (merged to 'next' on 2023-08-09 at 5510985b1c)
428
+ + branch: error message checking out a branch in use
429
+ + branch: error message deleting a branch in use
430
+
431
+ A message written in olden time prevented a branch from getting
432
+ checked out saying it is already checked out elsewhere, but these
433
+ days, we treat a branch that is being bisected or rebased just like
434
+ a branch that is checked out and protect it. Rephrase the message
435
+ to say that the branch is in use.
436
+
437
+ Will cook in 'next'.
438
+ source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com>
439
+
440
+
441
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
442
(merged to 'next' on 2023-08-08 at dc73a2c55a)
443
+ credential/libsecret: store new attributes
@@ -324,43 +465,6 @@ Release tarballs are available at:
465
source: <20230731224409.4181277-1-gitster@pobox.com>
466
467
327
-* ma/locate-in-path-for-windows (2023-08-04) 3 commits
328
- (merged to 'next' on 2023-08-06 at 02bc13f4a3)
329
- + docs: update when `git bisect visualize` uses `gitk`
330
- + compat/mingw: implement a native locate_in_PATH()
331
- + run-command: conditionally define locate_in_PATH()
332
-
333
- "git bisect visualize" stopped running "gitk" on Git for Windows
334
- when the command was reimplemented in C around Git 2.34 timeframe.
335
- This has been corrected.
336
-
337
- Will merge to 'master'.
338
- source: <pull.1560.v2.git.1691122124.gitgitgadget@gmail.com>
339
-
340
-
341
-* pw/rebase-skip-commit-message-fix (2023-08-03) 1 commit
342
- (merged to 'next' on 2023-08-06 at 1e44443e65)
343
- + rebase --skip: fix commit message clean up when skipping squash
344
-
345
- "git rebase -i" with a series of squash/fixup, when one of the
346
- steps stopped in conflicts and ended up getting skipped, did not
347
- handle the accumulated commit log messages, which has been
348
- corrected.
349
-
350
- Will merge to 'master'.
351
- source: <pull.1558.git.git.1691068176051.gitgitgadget@gmail.com>
352
-
353
-
354
-* bc/ignore-clangd-cache (2023-08-04) 1 commit
355
- (merged to 'next' on 2023-08-04 at 5cf8d41911)
356
- + gitignore: ignore clangd .cache directory
357
-
358
- .gitignore update.
359
-
360
- Will merge to 'master'.
361
- source: <20230804171328.1737188-1-sandals@crustytoothpaste.net>
362
-
363
-
468
* pw/rebase-i-after-failure (2023-08-01) 7 commits
469
- rebase -i: fix adding failed command to the todo list
470
- rebase --continue: refuse to commit after failed command
@@ -380,17 +484,6 @@ Release tarballs are available at:
484
source: <pull.1492.v3.git.1690903412.gitgitgadget@gmail.com>
485
486
383
-* bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit
384
- (merged to 'next' on 2023-08-03 at e786442a9b)
385
- + ident: don't consider '.' a crud
386
-
387
- Exclude "." from the set of characters to be removed from the
388
- beginning and the end of the human-readable name.
389
-
390
- Will merge to 'master'.
391
- source: <xmqqsf918k4j.fsf@gitster.g>
392
-
393
-
487
* jc/unresolve-removal (2023-07-31) 7 commits
488
- checkout: allow "checkout -m path" to unmerge removed paths
489
- checkout/restore: add basic tests for --merge
@@ -409,18 +502,6 @@ Release tarballs are available at:
502
source: <20230731224409.4181277-1-gitster@pobox.com>
503
504
412
-* ew/hash-with-openssl-evp (2023-08-01) 2 commits
413
- (merged to 'next' on 2023-08-02 at 996db74865)
414
- + avoid SHA-1 functions deprecated in OpenSSL 3+
415
- + sha256: avoid functions deprecated in OpenSSL 3+
416
-
417
- Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
418
- its traditional API, by using its EVP API instead.
419
-
420
- Will merge to 'master'.
421
- source: <20230801025454.1137802-1-e@80x24.org>
422
-
423
-
505
* rj/status-bisect-while-rebase (2023-08-01) 1 commit
506
- status: fix branch shown when not only bisecting
507
@@ -462,20 +543,21 @@ Release tarballs are available at:
543
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
544
545
465
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-08) 8 commits
466
- . gc: add `gc.repackFilterTo` config option
467
- . repack: implement `--filter-to` for storing filtered out objects
468
- . gc: add `gc.repackFilter` config option
469
- . repack: add `--filter=<filter-spec>` option
470
- . repack: refactor finding pack prefix
471
- . repack: refactor finishing pack-objects command
472
- . t/helper: add 'find-pack' test-tool
473
- . pack-objects: allow `--filter` without `--stdout`
546
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-09) 9 commits
547
+ - SQUASH???
548
+ - gc: add `gc.repackFilterTo` config option
549
+ - repack: implement `--filter-to` for storing filtered out objects
550
+ - gc: add `gc.repackFilter` config option
551
+ - repack: add `--filter=<filter-spec>` option
552
+ - repack: refactor finding pack prefix
553
+ - repack: refactor finishing pack-objects command
554
+ - t/helper: add 'find-pack' test-tool
555
+ - pack-objects: allow `--filter` without `--stdout`
556
557
"git repack" machinery learns to pay attention to the "--filter="
558
option.
559
478
- Comments?
560
+ cf. https://github.com/git/git/actions/runs/5812873987
561
source: <20230808082608.582319-1-christian.couder@gmail.com>
562
563
@@ -489,7 +571,8 @@ Release tarballs are available at:
571
572
573
* jt/path-filter-fix (2023-08-08) 8 commits
492
- - commit-graph: fix small leak with invalid changedPathsVersion
574
+ (merged to 'next' on 2023-08-09 at 59952b9ec9)
575
+ + commit-graph: fix small leak with invalid changedPathsVersion
576
(merged to 'next' on 2023-08-03 at d99958c287)
577
+ commit-graph: new filter ver. that fixes murmur3
578
+ repo-settings: introduce commitgraph.changedPathsVersion
@@ -507,3 +590,15 @@ Release tarballs are available at:
590
cf. <ZMqp6K2iXixWH/zT@nand.local>
591
source: <cover.1690912539.git.jonathantanmy@google.com>
592
source: <20230808192240.GA4091261@coredump.intra.peff.net>
593
+
594
+
595
+* ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits
596
+ - t/lib-rebase: improve documentation of set_fake_editor()
597
+ - t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
598
+ - t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
599
+
600
+ Test updates.
601
+
602
+ Will merge to 'next'.
603
+ source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
604
+ source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de>