What's cooking (2023/09 #03)
Junio C Hamano committed
Sep 8, 2023 at 14:35 UTC
4d456c54bf1852e825d56e627a8ffd672ce5da9d
1 file changed
+254
-192
whats-cooking.txt
+254
-192
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2023, #02; Tue, 5)
3
-X-master-at: 1fc548b2d6a3596f3e1c1f8b1930d8dbd1e30bf3
4
-X-next-at: b48617a3a5a37018fe707db5c6041699c4579ab7
2
+Subject: What's cooking in git.git (Sep 2023, #03; Fri, 8)
3
+X-master-at: 94e83dcf5b5faaa22e32729305f8fd7090bfdfed
4
+X-next-at: 461bb28fbd1decdee16a6abbeec79832ca32638f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2023, #02; Tue, 5)
7
+What's cooking in git.git (Sep 2023, #03; Fri, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,143 +48,184 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* jk/test-lsan-denoise-output (2023-08-28) 1 commit
52
- (merged to 'next' on 2023-08-29 at 9642d76264)
53
- + test-lib: ignore uninteresting LSan output
51
+* dd/format-patch-rfc-updates (2023-08-31) 1 commit
52
+ (merged to 'next' on 2023-09-01 at ad87c89ee3)
53
+ + format-patch: --rfc honors what --subject-prefix sets
54
55
- Tests with LSan from time to time seem to emit harmless message
56
- that makes our tests unnecessarily flakey; we work it around by
57
- filtering the uninteresting output.
58
- source: <20230828183735.GA3015072@coredump.intra.peff.net>
55
+ "git format-patch --rfc --subject-prefix=<foo>" used to ignore the
56
+ "--subject-prefix" option and used "[RFC PATCH]"; now we will add
57
+ "RFC" prefix to whatever subject prefix is specified.
58
59
+ This is a backward compatible change that may deserve a note.
60
+ source: <20230830064646.30904-1-sir@cmpwn.com>
61
61
-* js/ci-san-skip-p4-and-svn-tests (2023-08-29) 1 commit
62
- (merged to 'next' on 2023-08-29 at 9617f99668)
63
- + ci(linux-asan-ubsan): let's save some time
62
65
- Flakey "git p4" tests, as well as "git svn" tests, are now skipped
66
- in the (rather expensive) sanitizer CI job.
67
- source: <pull.1578.v2.git.1693342048633.gitgitgadget@gmail.com>
63
+* jk/ci-retire-allow-ref (2023-08-30) 2 commits
64
+ (merged to 'next' on 2023-08-31 at 5fe4861f16)
65
+ + ci: deprecate ci/config/allow-ref script
66
+ + ci: allow branch selection through "vars"
67
68
+ CI update.
69
+ source: <20230830194919.GA1709446@coredump.intra.peff.net>
70
70
-* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
71
- (merged to 'next' on 2023-08-29 at 5466f7fcb2)
72
- + parse-options: allow omitting option help text
71
74
- It may be tempting to leave the help text NULL for a command line
75
- option that is either hidden or too obvious, but "git subcmd -h"
76
- and "git subcmd --help-all" would have segfaulted if done so. Now
77
- the help text is optional.
78
- source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
72
+* jk/unused-post-2.42 (2023-08-29) 22 commits
73
+ (merged to 'next' on 2023-08-30 at ab0538e754)
74
+ + update-ref: mark unused parameter in parser callbacks
75
+ + gc: mark unused descriptors in scheduler callbacks
76
+ + bundle-uri: mark unused parameters in callbacks
77
+ + fetch: mark unused parameter in ref_transaction callback
78
+ + credential: mark unused parameter in urlmatch callback
79
+ + grep: mark unused parmaeters in pcre fallbacks
80
+ + imap-send: mark unused parameters with NO_OPENSSL
81
+ + worktree: mark unused parameters in noop repair callback
82
+ + negotiator/noop: mark unused callback parameters
83
+ + add-interactive: mark unused callback parameters
84
+ + grep: mark unused parameter in output function
85
+ + test-trace2: mark unused argv/argc parameters
86
+ + trace2: mark unused config callback parameter
87
+ + trace2: mark unused us_elapsed_absolute parameters
88
+ + stash: mark unused parameter in diff callback
89
+ + ls-tree: mark unused parameter in callback
90
+ + commit-graph: mark unused data parameters in generation callbacks
91
+ + worktree: mark unused parameters in each_ref_fn callback
92
+ + pack-bitmap: mark unused parameters in show_object callback
93
+ + ref-filter: mark unused parameters in parser callbacks
94
+ + sequencer: mark repository argument as unused
95
+ + sequencer: use repository parameter in short_commit_name()
96
97
+ Unused parameters to functions are marked as such, and/or removed,
98
+ in order to bring us closer to -Wunused-parameter clean.
99
+ source: <20230829234305.GA226944@coredump.intra.peff.net>
100
81
-* tb/mark-more-tests-as-leak-free (2023-08-29) 3 commits
82
- (merged to 'next' on 2023-08-29 at c1db288281)
83
- + leak tests: mark t5583-push-branches.sh as leak-free
84
- + leak tests: mark t3321-notes-stripspace.sh as leak-free
85
- + leak tests: mark a handful of tests as leak-free
101
87
- Tests that are known to pass with LSan are now marked as such.
88
- source: <cover.1693263171.git.me@ttaylorr.com>
102
+* tb/multi-cruft-pack (2023-08-29) 4 commits
103
+ (merged to 'next' on 2023-08-30 at 15f0b56ed0)
104
+ + Documentation/gitformat-pack.txt: drop mixed version section
105
+ + Documentation/gitformat-pack.txt: remove multi-cruft packs alternative
106
+ + builtin/pack-objects.c: support `--max-pack-size` with `--cruft`
107
+ + builtin/pack-objects.c: remove unnecessary strbuf_reset()
108
+
109
+ Use of --max-pack-size to allow multiple packfiles to be created is
110
+ now supported even when we are sending unreachable objects to cruft
111
+ packs.
112
+ source: <cover.1693262936.git.me@ttaylorr.com>
113
+
114
+
115
+* ws/git-svn-retire-faketerm (2023-08-30) 1 commit
116
+ (merged to 'next' on 2023-08-31 at cb6e0d658d)
117
+ + git-svn: drop FakeTerm hack
118
+
119
+ Code clean-up.
120
+ source: <xmqqa5u888lz.fsf_-_@gitster.g>
121
122
--------------------------------------------------
123
[New Topics]
124
93
-* bc/more-git-var (2023-09-05) 1 commit
94
- - var: avoid a segmentation fault when `HOME` is unset
125
+* so/diff-doc-for-patch-update (2023-09-06) 1 commit
126
+ (merged to 'next' on 2023-09-07 at 6da5e9defd)
127
+ + doc/diff-options: fix link to generating patch section
128
96
- source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
129
+ References from description of the `--patch` option in various
130
+ manual pages have been simplified and improved.
131
+
132
+ Will merge to 'master'.
133
+ source: <87msxzpybo.fsf_-_@osv.gnss.ru>
134
135
99
-* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
100
- - ref-filter: sort numerically when ":size" is used
136
+* tb/repack-existing-packs-cleanup (2023-09-06) 8 commits
137
+ - builtin/repack.c: extract common cruft pack loop
138
+ - builtin/repack.c: drop `DELETE_PACK` macro
139
+ - builtin/repack.c: store existing cruft packs separately
140
+ - builtin/repack.c: extract `has_existing_non_kept_packs()`
141
+ - builtin/repack.c: extract redundant pack cleanup for existing packs
142
+ - builtin/repack.c: extract redundant pack cleanup for --geometric
143
+ - builtin/repack.c: extract marking packs for deletion
144
+ - builtin/repack.c: extract structure to store existing packs
145
102
- source: <20230902090155.8978-1-five231003@gmail.com>
146
+ The code to keep track of existing packs in the repository while
147
+ repacking has been refactored.
148
149
+ Will merge to 'next'?
150
+ source: <cover.1693946195.git.me@ttaylorr.com>
151
105
-* ob/sequencer-reword-error-message (2023-09-05) 1 commit
106
- - sequencer: fix error message on failure to copy SQUASH_MSG
152
108
- source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
153
+* pb/complete-commit-trailers (2023-09-07) 1 commit
154
+ (merged to 'next' on 2023-09-08 at 842587016d)
155
+ + completion: commit: complete configured trailer tokens
156
157
+ The command-line complation support (in contrib/) learned to
158
+ complete "git commit --trailer=" for possible trailer keys.
159
111
-* rs/grep-parseopt-simplify (2023-09-05) 1 commit
112
- - grep: use OPT_INTEGER_F for --max-depth
160
+ Will merge to 'master'.
161
+ source: <pull.1583.git.1694108551683.gitgitgadget@gmail.com>
162
114
- source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
163
164
+* pw/rebase-sigint (2023-09-07) 1 commit
165
+ - rebase -i: ignore signals when forking subprocesses
166
117
-* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
118
- - name-rev: use OPT_HIDDEN_BOOL for --peel-tag
167
+ If the commit log editor or other external programs (spawned via
168
+ "exec" insn in the todo list) receive internactive signal during
169
+ "git rebase -i", it caused not just the spawned program but the
170
+ "Git" process that spawned them, which is often not what the end
171
+ user intended. "git" learned to ignore SIGINT and SIGQUIT while
172
+ waiting for these subprocesses.
173
120
- source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
174
+ Will merge to 'next'?
175
+ source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
176
122
---------------------------------------------------
123
-[Stalled]
177
125
-* la/trailer-cleanups (2023-08-06) 5 commits
126
- - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
127
- - trailer: teach find_patch_start about --no-divider
128
- - trailer: split process_command_line_args into separate functions
129
- - trailer: split process_input_file into separate pieces
130
- - trailer: separate public from internal portion of trailer_iterator
178
+* rs/grep-no-no-or (2023-09-07) 1 commit
179
+ (merged to 'next' on 2023-09-08 at 33849032bc)
180
+ + grep: reject --no-or
181
132
- Code clean-up.
182
+ "git grep -e A --no-or -e B" is accepted, even though the negation
183
+ of "or" did not mean anything, which has been tightened.
184
134
- Expecting a reroll.
135
- cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
136
- source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
185
+ Will merge to 'master'.
186
+ source: <6aeb0ebe-0fea-ccd3-089a-ee0b5b5baf10@web.de>
187
188
139
-* la/trailer-test-and-doc-updates (2023-08-10) 14 commits
140
- - SQUASH???
141
- - trailer doc: <token> is a <key> or <keyAlias>, not both
142
- - trailer doc: separator within key suppresses default separator
143
- - trailer doc: emphasize the effect of configuration variables
144
- - trailer --unfold help: prefer "reformat" over "join"
145
- - trailer --parse docs: add explanation for its usefulness
146
- - trailer --only-input: prefer "configuration variables" over "rules"
147
- - trailer --parse help: expose aliased options
148
- - trailer --no-divider help: describe usual "---" meaning
149
- - trailer: trailer location is a place, not an action
150
- - trailer doc: narrow down scope of --where and related flags
151
- - trailer: add tests to check defaulting behavior with --no-* flags
152
- - trailer test description: this tests --where=after, not --where=before
153
- - trailer tests: make test cases self-contained
189
+* js/complete-checkout-t (2023-09-08) 1 commit
190
+ (merged to 'next' on 2023-09-08 at 461bb28fbd)
191
+ + completion(switch/checkout): treat --track and -t the same
192
155
- Test coverage for trailers has been improved.
193
+ The completion script (in contrib/) has been taught to treat the
194
+ "-t" option to "git checkout" and "git switch" just like the
195
+ "--track" option, to complete remote-tracking branches.
196
157
- Expecting a reroll.
158
- cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
159
- source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
197
+ Will merge to 'master'.
198
+ source: <pull.1584.git.1694176123471.gitgitgadget@gmail.com>
199
200
162
-* js/doc-unit-tests (2023-08-17) 3 commits
163
- - ci: run unit tests in CI
164
- - unit tests: add TAP unit test framework
165
- - unit tests: Add a project plan document
166
- (this branch is used by js/doc-unit-tests-with-cmake.)
201
+* cw/git-std-lib (2023-09-08) 6 commits
202
+ - git-std-lib: add test file to call git-std-lib.a functions
203
+ - git-std-lib: introduce git standard library
204
+ - parse: create new library for parsing strings and env values
205
+ - config: correct bad boolean env value error message
206
+ - wrapper: remove dependency to Git-specific internal file
207
+ - hex-ll: split out functionality from hex
208
168
- Process to add some form of low-level unit tests has started.
209
+ Another libification effort.
210
211
Comments?
171
- source: <cover.1692297001.git.steadmon@google.com>
212
+ source: <20230908174134.1026823-1-calvinwan@google.com>
213
214
+--------------------------------------------------
215
+[Stalled]
216
174
-* ak/pretty-decorate-more (2023-08-21) 8 commits
175
- - decorate: use commit color for HEAD arrow
176
- - pretty: add pointer and tag options to %(decorate)
177
- - pretty: add %(decorate[:<options>]) format
178
- - decorate: color each token separately
179
- - decorate: avoid some unnecessary color overhead
180
- - decorate: refactor format_decorations()
181
- - pretty-formats: enclose options in angle brackets
182
- - pretty-formats: define "literal formatting code"
217
+* la/trailer-cleanups (2023-08-06) 5 commits
218
+ - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
219
+ - trailer: teach find_patch_start about --no-divider
220
+ - trailer: split process_command_line_args into separate functions
221
+ - trailer: split process_input_file into separate pieces
222
+ - trailer: separate public from internal portion of trailer_iterator
223
184
- "git log --format" has been taught the %(decorate) placeholder.
224
+ Code clean-up.
225
186
- What's the status of this thing?
187
- source: <20230820185009.20095-1-andy.koppe@gmail.com>
226
+ Expecting a reroll.
227
+ cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
228
+ source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
229
230
231
* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
@@ -205,7 +246,21 @@ Release tarballs are available at:
246
source: <20230812000011.1227371-1-christian.couder@gmail.com>
247
248
208
-* cc/git-replay (2023-06-03) 15 commits
249
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
250
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
251
+
252
+ "git cherry-pick A" that replays a single commit stopped before
253
+ clobbering local modification, but "git cherry-pick A..B" did not,
254
+ which has been corrected.
255
+
256
+ Expecting a reroll.
257
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
258
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
259
+
260
+--------------------------------------------------
261
+[Cooking]
262
+
263
+* cc/git-replay (2023-09-07) 15 commits
264
- replay: stop assuming replayed branches do not diverge
265
- replay: add --contained to rebase contained branches
266
- replay: add --advance or 'cherry-pick' mode
@@ -222,104 +277,95 @@ Release tarballs are available at:
277
- replay: introduce new builtin
278
- t6429: remove switching aspects of fast-rebase
279
225
- No reviews?
226
- source: <20230602102533.876905-1-christian.couder@gmail.com>
280
+ source: <20230907092521.733746-1-christian.couder@gmail.com>
281
282
229
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
230
- - cherry-pick: refuse cherry-pick sequence if index is dirty
283
+* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
284
+ - trailer doc: <token> is a <key> or <keyAlias>, not both
285
+ - trailer doc: separator within key suppresses default separator
286
+ - trailer doc: emphasize the effect of configuration variables
287
+ - trailer --unfold help: prefer "reformat" over "join"
288
+ - trailer --parse docs: add explanation for its usefulness
289
+ - trailer --only-input: prefer "configuration variables" over "rules"
290
+ - trailer --parse help: expose aliased options
291
+ - trailer --no-divider help: describe usual "---" meaning
292
+ - trailer: trailer location is a place, not an action
293
+ - trailer doc: narrow down scope of --where and related flags
294
+ - trailer: add tests to check defaulting behavior with --no-* flags
295
+ - trailer test description: this tests --where=after, not --where=before
296
+ - trailer tests: make test cases self-contained
297
232
- "git cherry-pick A" that replays a single commit stopped before
233
- clobbering local modification, but "git cherry-pick A..B" did not,
234
- which has been corrected.
298
+ Test coverage for trailers has been improved.
299
+ source: <pull.1564.v3.git.1694125209.gitgitgadget@gmail.com>
300
236
- Expecting a reroll.
237
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
238
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
301
240
---------------------------------------------------
241
-[Cooking]
302
+* ak/pretty-decorate-more (2023-08-21) 8 commits
303
+ (merged to 'next' on 2023-09-07 at 6f5e14cef2)
304
+ + decorate: use commit color for HEAD arrow
305
+ + pretty: add pointer and tag options to %(decorate)
306
+ + pretty: add %(decorate[:<options>]) format
307
+ + decorate: color each token separately
308
+ + decorate: avoid some unnecessary color overhead
309
+ + decorate: refactor format_decorations()
310
+ + pretty-formats: enclose options in angle brackets
311
+ + pretty-formats: define "literal formatting code"
312
243
-* dd/format-patch-rfc-updates (2023-08-31) 1 commit
244
- (merged to 'next' on 2023-09-01 at ad87c89ee3)
245
- + format-patch: --rfc honors what --subject-prefix sets
313
+ "git log --format" has been taught the %(decorate) placeholder.
314
247
- "git format-patch --rfc --subject-prefix=<foo>" used to ignore the
248
- "--subject-prefix" option and used "[RFC PATCH]"; now we will add
249
- "RFC" prefix to whatever subject prefix is specified.
315
+ Will merge to 'master'.
316
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
317
251
- This is a backward compatible change that may deserve a note.
318
+
319
+* bc/more-git-var (2023-09-05) 1 commit
320
+ (merged to 'next' on 2023-09-06 at d8af32874c)
321
+ + var: avoid a segmentation fault when `HOME` is unset
322
+
323
+ Fix-up for a topic that already has graduated.
324
325
Will merge to 'master'.
254
- source: <20230830064646.30904-1-sir@cmpwn.com>
326
+ source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
327
328
257
-* jk/unused-post-2.42 (2023-08-29) 22 commits
258
- (merged to 'next' on 2023-08-30 at ab0538e754)
259
- + update-ref: mark unused parameter in parser callbacks
260
- + gc: mark unused descriptors in scheduler callbacks
261
- + bundle-uri: mark unused parameters in callbacks
262
- + fetch: mark unused parameter in ref_transaction callback
263
- + credential: mark unused parameter in urlmatch callback
264
- + grep: mark unused parmaeters in pcre fallbacks
265
- + imap-send: mark unused parameters with NO_OPENSSL
266
- + worktree: mark unused parameters in noop repair callback
267
- + negotiator/noop: mark unused callback parameters
268
- + add-interactive: mark unused callback parameters
269
- + grep: mark unused parameter in output function
270
- + test-trace2: mark unused argv/argc parameters
271
- + trace2: mark unused config callback parameter
272
- + trace2: mark unused us_elapsed_absolute parameters
273
- + stash: mark unused parameter in diff callback
274
- + ls-tree: mark unused parameter in callback
275
- + commit-graph: mark unused data parameters in generation callbacks
276
- + worktree: mark unused parameters in each_ref_fn callback
277
- + pack-bitmap: mark unused parameters in show_object callback
278
- + ref-filter: mark unused parameters in parser callbacks
279
- + sequencer: mark repository argument as unused
280
- + sequencer: use repository parameter in short_commit_name()
329
+* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
330
+ (merged to 'next' on 2023-09-06 at aa4d156366)
331
+ + ref-filter: sort numerically when ":size" is used
332
282
- Unused parameters to functions are marked as such, and/or removed,
283
- in order to bring us closer to -Wunused-parameter clean.
333
+ "git for-each-ref --sort='contents:size'" sorts the refs according
334
+ to size numerically, giving a ref that points at a blob twelve-byte
335
+ (12) long before showing a blob hundred-byte (100) long.
336
337
Will merge to 'master'.
286
- source: <20230829234305.GA226944@coredump.intra.peff.net>
338
+ source: <20230902090155.8978-1-five231003@gmail.com>
339
340
289
-* tb/multi-cruft-pack (2023-08-29) 4 commits
290
- (merged to 'next' on 2023-08-30 at 15f0b56ed0)
291
- + Documentation/gitformat-pack.txt: drop mixed version section
292
- + Documentation/gitformat-pack.txt: remove multi-cruft packs alternative
293
- + builtin/pack-objects.c: support `--max-pack-size` with `--cruft`
294
- + builtin/pack-objects.c: remove unnecessary strbuf_reset()
341
+* ob/sequencer-reword-error-message (2023-09-05) 1 commit
342
+ (merged to 'next' on 2023-09-06 at c5154b7aa2)
343
+ + sequencer: fix error message on failure to copy SQUASH_MSG
344
296
- Use of --max-pack-size to allow multiple packfiles to be created is
297
- now supported even when we are sending unreachable objects to cruft
298
- packs.
345
+ Update an error message (which would probably never been seen).
346
347
Will merge to 'master'.
301
- source: <cover.1693262936.git.me@ttaylorr.com>
348
+ source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
349
350
304
-* jk/ci-retire-allow-ref (2023-08-30) 2 commits
305
- (merged to 'next' on 2023-08-31 at 5fe4861f16)
306
- + ci: deprecate ci/config/allow-ref script
307
- + ci: allow branch selection through "vars"
351
+* rs/grep-parseopt-simplify (2023-09-05) 1 commit
352
+ (merged to 'next' on 2023-09-06 at 249b69cfd2)
353
+ + grep: use OPT_INTEGER_F for --max-depth
354
309
- CI update.
355
+ Simplify use of parse-options API a bit.
356
357
Will merge to 'master'.
312
- source: <20230830194919.GA1709446@coredump.intra.peff.net>
358
+ source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
359
360
315
-* ws/git-svn-retire-faketerm (2023-08-30) 1 commit
316
- (merged to 'next' on 2023-08-31 at cb6e0d658d)
317
- + git-svn: drop FakeTerm hack
361
+* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
362
+ (merged to 'next' on 2023-09-06 at 9b251a5392)
363
+ + name-rev: use OPT_HIDDEN_BOOL for --peel-tag
364
319
- Code clean-up.
365
+ Simplify use of parse-options API a bit.
366
367
Will merge to 'master'.
322
- source: <xmqqa5u888lz.fsf_-_@gitster.g>
368
+ source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
369
370
371
* jk/unused-post-2.42-part2 (2023-09-05) 10 commits
@@ -343,22 +389,37 @@ Release tarballs are available at:
389
390
391
* jk/tree-name-and-depth-limit (2023-08-31) 10 commits
346
- - lower core.maxTreeDepth default to 2048
347
- - tree-diff: respect max_allowed_tree_depth
348
- - list-objects: respect max_allowed_tree_depth
349
- - read_tree(): respect max_allowed_tree_depth
350
- - traverse_trees(): respect max_allowed_tree_depth
351
- - add core.maxTreeDepth config
352
- - fsck: detect very large tree pathnames
353
- - tree-walk: rename "error" variable
354
- - tree-walk: drop MAX_TRAVERSE_TREES macro
355
- - tree-walk: reduce stack size for recursive functions
392
+ (merged to 'next' on 2023-09-07 at 7ad767ab0d)
393
+ + lower core.maxTreeDepth default to 2048
394
+ + tree-diff: respect max_allowed_tree_depth
395
+ + list-objects: respect max_allowed_tree_depth
396
+ + read_tree(): respect max_allowed_tree_depth
397
+ + traverse_trees(): respect max_allowed_tree_depth
398
+ + add core.maxTreeDepth config
399
+ + fsck: detect very large tree pathnames
400
+ + tree-walk: rename "error" variable
401
+ + tree-walk: drop MAX_TRAVERSE_TREES macro
402
+ + tree-walk: reduce stack size for recursive functions
403
404
We now limit depth of the tree objects and maximum length of
405
pathnames recorded in tree objects.
406
+
407
+ Will merge to 'master'.
408
source: <20230831061735.GA2702156@coredump.intra.peff.net>
409
410
411
+* js/doc-unit-tests (2023-08-17) 3 commits
412
+ - ci: run unit tests in CI
413
+ - unit tests: add TAP unit test framework
414
+ - unit tests: Add a project plan document
415
+ (this branch is used by js/doc-unit-tests-with-cmake.)
416
+
417
+ Process to add some form of low-level unit tests has started.
418
+
419
+ Comments?
420
+ source: <cover.1692297001.git.steadmon@google.com>
421
+
422
+
423
* js/doc-unit-tests-with-cmake (2023-08-31) 4 commits
424
- artifacts-tar: when including `.dll` files, don't forget the unit-tests
425
- unit-tests: do show relative file paths
@@ -432,14 +493,16 @@ Release tarballs are available at:
493
494
495
* ob/revert-of-revert-is-reapply (2023-09-02) 2 commits
435
- - git-revert.txt: add discussion
436
- - sequencer: beautify subject of reverts of reverts
496
+ (merged to 'next' on 2023-09-07 at 9a54f66511)
497
+ + git-revert.txt: add discussion
498
+ + sequencer: beautify subject of reverts of reverts
499
500
The default log message created by "git revert", when reverting a
501
commit that records a revert, has been tweaked.
502
441
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <20230821170720.577850-1-oswald.buddenhagen@gmx.de>
505
+ source: <20230902072035.652549-1-oswald.buddenhagen@gmx.de>
506
507
508
* jc/rerere-cleanup (2023-08-25) 4 commits
@@ -455,23 +518,22 @@ Release tarballs are available at:
518
source: <20230731224409.4181277-1-gitster@pobox.com>
519
520
458
-* pw/rebase-i-after-failure (2023-08-01) 7 commits
459
- - rebase -i: fix adding failed command to the todo list
460
- - rebase --continue: refuse to commit after failed command
461
- - rebase: fix rewritten list for failed pick
462
- - sequencer: factor out part of pick_commits()
463
- - sequencer: use rebase_path_message()
464
- - rebase -i: remove patch file after conflict resolution
465
- - rebase -i: move unlink() calls
521
+* pw/rebase-i-after-failure (2023-09-06) 7 commits
522
+ (merged to 'next' on 2023-09-07 at 3cbc3c4d63)
523
+ + rebase -i: fix adding failed command to the todo list
524
+ + rebase --continue: refuse to commit after failed command
525
+ + rebase: fix rewritten list for failed pick
526
+ + sequencer: factor out part of pick_commits()
527
+ + sequencer: use rebase_path_message()
528
+ + rebase -i: remove patch file after conflict resolution
529
+ + rebase -i: move unlink() calls
530
531
Various fixes to the behaviour of "rebase -i" when the command got
532
interrupted by conflicting changes.
533
470
- Expecting a reroll.
471
- The latter half of the series should be reviewed by those who have
472
- more stake in the sequencer code than myself.
473
- cf. <619e458b-218b-a790-dfb4-9200e201b513@gmail.com>
474
- source: <pull.1492.v3.git.1690903412.gitgitgadget@gmail.com>
534
+ Will merge to 'master'.
535
+ cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de>
536
+ source: <pull.1492.v4.git.1694013771.gitgitgadget@gmail.com>
537
538
539
* jc/unresolve-removal (2023-07-31) 7 commits