What's cooking (2023/09 #02)
Junio C Hamano committed
Sep 5, 2023 at 16:54 UTC
05c5b73108a8212ac96a5c82241afbdd4caae6f0
1 file changed
+179
-353
whats-cooking.txt
+179
-353
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2023, #01; Fri, 1)
3
-X-master-at: d814540bb75bbd2257f9a6bf59661a84fe8cf3cf
4
-X-next-at: 54e51ff1ac8d5254ec31bb709a94c598aa7cdeda
2
+Subject: What's cooking in git.git (Sep 2023, #02; Tue, 5)
3
+X-master-at: 1fc548b2d6a3596f3e1c1f8b1930d8dbd1e30bf3
4
+X-next-at: b48617a3a5a37018fe707db5c6041699c4579ab7
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2023, #01; Fri, 1)
7
+What's cooking in git.git (Sep 2023, #02; Tue, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,146 +48,197 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* ch/t6300-verify-commit-test-cleanup (2023-08-23) 2 commits
52
- (merged to 'next' on 2023-08-24 at 15b842867e)
53
- + t/t6300: drop magic filtering
54
- + t/lib-gpg: forcibly run a trustdb update
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
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>
59
+
60
+
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
64
+
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>
68
+
69
+
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
73
56
- Test clean-up.
57
- source: <20230822150149.541ccb35@leda.eworm.net>
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>
79
80
60
-* ds/scalar-updates (2023-08-28) 3 commits
61
- (merged to 'next' on 2023-08-28 at 093e6bcb9c)
62
- + scalar reconfigure: help users remove buggy repos
63
- + setup: add discover_git_directory_reason()
64
- + scalar: add --[no-]src option
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
86
66
- Scalar updates.
67
- source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
87
+ Tests that are known to pass with LSan are now marked as such.
88
+ source: <cover.1693263171.git.me@ttaylorr.com>
89
+
90
+--------------------------------------------------
91
+[New Topics]
92
93
+* bc/more-git-var (2023-09-05) 1 commit
94
+ - var: avoid a segmentation fault when `HOME` is unset
95
70
-* jc/ci-skip-same-commit (2023-08-25) 1 commit
71
- (merged to 'next' on 2023-08-28 at e978717961)
72
- + ci: avoid building from the same commit in parallel
96
+ source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
97
74
- Tweak GitHub Actions CI so that pushing the same commit to multiple
75
- branch tips at the same time will not waste building and testing
76
- the same thing twice.
77
- source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
98
99
+* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
100
+ - ref-filter: sort numerically when ":size" is used
101
80
-* jc/diff-exit-code-with-w-fixes (2023-08-21) 5 commits
81
- (merged to 'next' on 2023-08-23 at 436a0aec3d)
82
- + diff: the -w option breaks --exit-code for --raw and other output modes
83
- + t4040: remove test that succeeded for a wrong reason
84
- + diff: teach "--stat -w --exit-code" to notice differences
85
- + diff: mode-only change should be noticed by "--patch -w --exit-code"
86
- + diff: move the fallback "--exit-code" code down
102
+ source: <20230902090155.8978-1-five231003@gmail.com>
103
88
- "git diff -w --exit-code" with various options did not work
89
- correctly, which is being addressed.
90
- source: <20230818235932.3253552-1-gitster@pobox.com>
104
105
+* ob/sequencer-reword-error-message (2023-09-05) 1 commit
106
+ - sequencer: fix error message on failure to copy SQUASH_MSG
107
93
-* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
94
- (merged to 'next' on 2023-08-21 at 2220d22d6f)
95
- + mv: fix error for moving directory to another
108
+ source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
109
97
- Typofix in an error message.
98
- source: <xmqqjzu1njt0.fsf@gitster.g>
110
111
+* rs/grep-parseopt-simplify (2023-09-05) 1 commit
112
+ - grep: use OPT_INTEGER_F for --max-depth
113
101
-* jk/diff-result-code-cleanup (2023-08-21) 7 commits
102
- (merged to 'next' on 2023-08-25 at 3b1280d42f)
103
- + diff: drop useless "status" parameter from diff_result_code()
104
- + diff: drop useless return values in git-diff helpers
105
- + diff: drop useless return from run_diff_{files,index} functions
106
- + diff: die when failing to read index in git-diff builtin
107
- + diff: show usage for unknown builtin_diff_files() options
108
- + diff-files: avoid negative exit value
109
- + diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
114
+ source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
115
111
- "git diff --no-such-option" and other corner cases around the exit
112
- status of the "diff" command has been corrected.
113
- source: <20230821201358.GA2663749@coredump.intra.peff.net>
116
117
+* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
118
+ - name-rev: use OPT_HIDDEN_BOOL for --peel-tag
119
+
120
+ source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
121
+
122
+--------------------------------------------------
123
+[Stalled]
124
+
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
131
+
132
+ Code clean-up.
133
+
134
+ Expecting a reroll.
135
+ cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
136
+ source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
137
+
138
+
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
154
+
155
+ Test coverage for trailers has been improved.
156
+
157
+ Expecting a reroll.
158
+ cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
159
+ source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
160
+
161
+
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.)
167
+
168
+ Process to add some form of low-level unit tests has started.
169
116
-* ob/format-patch-description-file (2023-08-21) 1 commit
117
- (merged to 'next' on 2023-08-25 at 89ea619311)
118
- + format-patch: add --description-file option
170
+ Comments?
171
+ source: <cover.1692297001.git.steadmon@google.com>
172
120
- "git format-patch" learns a way to feed cover letter description,
121
- that (1) can be used on detached HEAD where there is no branch
122
- description available, and (2) also can override the branch
123
- description if there is one.
124
- source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
173
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"
183
127
-* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
128
- (merged to 'next' on 2023-08-24 at 626c52ad72)
129
- + sequencer: rectify empty hint in call of require_clean_work_tree()
184
+ "git log --format" has been taught the %(decorate) placeholder.
185
131
- The use of API between two calls to require_clean_work_tree() from
132
- the sequencer code has been cleaned up for consistency.
133
- source: <20230824150046.802008-1-oswald.buddenhagen@gmx.de>
186
+ What's the status of this thing?
187
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
188
189
136
-* py/git-gui-updates (2023-08-24) 16 commits
137
- (merged to 'next' on 2023-08-28 at df0b742344)
138
- + Merge https://github.com/prati0100/git-gui
139
- + Merge branch 'ml/cygwin-fixes'
140
- + git-gui - use mkshortcut on Cygwin
141
- + git-gui - use cygstart to browse on Cygwin
142
- + git-gui - remove obsolete Cygwin specific code
143
- + git gui Makefile - remove Cygwin modifications
144
- + Merge branch 'ab/makeflags'
145
- + Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
146
- + Merge branch 'js/windows-rce'
147
- + Work around Tcl's default `PATH` lookup
148
- + Move the `_which` function (almost) to the top
149
- + Move is_<platform> functions to the beginning
150
- + is_Cygwin: avoid `exec`ing anything
151
- + windows: ignore empty `PATH` elements
152
- + Merge branch 'vk/readme-typo'
153
- + git-gui: Fix a typo in README
190
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
191
+ . gc: add `gc.repackFilterTo` config option
192
+ . repack: implement `--filter-to` for storing filtered out objects
193
+ . gc: add `gc.repackFilter` config option
194
+ . repack: add `--filter=<filter-spec>` option
195
+ . repack: refactor finding pack prefix
196
+ . repack: refactor finishing pack-objects command
197
+ . t/helper: add 'find-pack' test-tool
198
+ . pack-objects: allow `--filter` without `--stdout`
199
155
- Git GUI updates.
200
+ "git repack" machinery learns to pay attention to the "--filter="
201
+ option.
202
203
+ Kicked out of the 'seen', as it still seems to be failing tests.
204
+ cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
205
+ source: <20230812000011.1227371-1-christian.couder@gmail.com>
206
158
-* sl/sparse-check-attr (2023-08-11) 3 commits
159
- (merged to 'next' on 2023-08-21 at c202b15517)
160
- + check-attr: integrate with sparse-index
161
- + attr.c: read attributes in a sparse directory
162
- + t1092: add tests for 'git check-attr'
207
164
- Teach "git check-attr" work better with sparse-index.
165
- cf. <3b2a5b4b-ab8f-746b-6b69-8e8262b6390b@github.com>
166
- source: <20230811142211.4547-1-cheskaqiqi@gmail.com>
208
+* cc/git-replay (2023-06-03) 15 commits
209
+ - replay: stop assuming replayed branches do not diverge
210
+ - replay: add --contained to rebase contained branches
211
+ - replay: add --advance or 'cherry-pick' mode
212
+ - replay: disallow revision specific options and pathspecs
213
+ - replay: use standard revision ranges
214
+ - replay: make it a minimal server side command
215
+ - replay: remove HEAD related sanity check
216
+ - replay: remove progress and info output
217
+ - replay: add an important FIXME comment about gpg signing
218
+ - replay: don't simplify history
219
+ - replay: introduce pick_regular_commit()
220
+ - replay: die() instead of failing assert()
221
+ - replay: start using parse_options API
222
+ - replay: introduce new builtin
223
+ - t6429: remove switching aspects of fast-rebase
224
225
+ No reviews?
226
+ source: <20230602102533.876905-1-christian.couder@gmail.com>
227
169
-* tb/commit-graph-verify-fix (2023-08-21) 4 commits
170
- (merged to 'next' on 2023-08-23 at 2b4b74bb0d)
171
- + commit-graph: avoid repeated mixed generation number warnings
172
- + t/t5318-commit-graph.sh: test generation zero transitions during fsck
173
- + commit-graph: verify swapped zero/non-zero generation cases
174
- + commit-graph: introduce `commit_graph_generation_from_graph()`
228
176
- The commit-graph verification code that detects mixture of zero and
177
- non-zero generation numbers has been updated.
178
- source: <cover.1692653671.git.me@ttaylorr.com>
229
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
230
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
231
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.
235
181
-* ts/unpacklimit-config-fix (2023-08-22) 1 commit
182
- (merged to 'next' on 2023-08-23 at 4fabd9a697)
183
- + transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
184
-
185
- transfer.unpackLimit ought to be used as a fallback, but overrode
186
- fetch.unpackLimit and receive.unpackLimit instead.
187
- source: <xmqqpm3eh7f6.fsf@gitster.g>
236
+ Expecting a reroll.
237
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
238
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
239
240
--------------------------------------------------
190
-[New Topics]
241
+[Cooking]
242
243
* dd/format-patch-rfc-updates (2023-08-31) 1 commit
244
(merged to 'next' on 2023-09-01 at ad87c89ee3)
@@ -203,18 +254,6 @@ Release tarballs are available at:
254
source: <20230830064646.30904-1-sir@cmpwn.com>
255
256
206
-* jk/test-lsan-denoise-output (2023-08-28) 1 commit
207
- (merged to 'next' on 2023-08-29 at 9642d76264)
208
- + test-lib: ignore uninteresting LSan output
209
-
210
- Tests with LSan from time to time seem to emit harmless message
211
- that makes our tests unnecessarily flakey; we work it around by
212
- filtering the uninteresting output.
213
-
214
- Will merge to 'master'.
215
- source: <20230828183735.GA3015072@coredump.intra.peff.net>
216
-
217
-
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
@@ -247,17 +286,6 @@ Release tarballs are available at:
286
source: <20230829234305.GA226944@coredump.intra.peff.net>
287
288
250
-* js/ci-san-skip-p4-and-svn-tests (2023-08-29) 1 commit
251
- (merged to 'next' on 2023-08-29 at 9617f99668)
252
- + ci(linux-asan-ubsan): let's save some time
253
-
254
- Flakey "git p4" tests, as well as "git svn" tests, are now skipped
255
- in the (rather expensive) sanitizer CI job.
256
-
257
- Will merge to 'master'.
258
- source: <pull.1578.v2.git.1693342048633.gitgitgadget@gmail.com>
259
-
260
-
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
@@ -294,22 +322,23 @@ Release tarballs are available at:
322
source: <xmqqa5u888lz.fsf_-_@gitster.g>
323
324
297
-* jk/unused-post-2.42-part2 (2023-08-31) 10 commits
298
- - parse-options: mark unused parameters in noop callback
299
- - interpret-trailers: mark unused "unset" parameters in option callbacks
300
- - parse-options: add more BUG_ON() annotations
301
- - merge: do not pass unused opt->value parameter
302
- - parse-options: mark unused "opt" parameter in callbacks
303
- - parse-options: prefer opt->value to globals in callbacks
304
- - checkout-index: delay automatic setting of to_tempfile
305
- - format-patch: use OPT_STRING_LIST for to/cc options
306
- - merge: simplify parsing of "-n" option
307
- - merge: make xopts a strvec
325
+* jk/unused-post-2.42-part2 (2023-09-05) 10 commits
326
+ (merged to 'next' on 2023-09-05 at 308ca3a052)
327
+ + parse-options: mark unused parameters in noop callback
328
+ + interpret-trailers: mark unused "unset" parameters in option callbacks
329
+ + parse-options: add more BUG_ON() annotations
330
+ + merge: do not pass unused opt->value parameter
331
+ + parse-options: mark unused "opt" parameter in callbacks
332
+ + parse-options: prefer opt->value to globals in callbacks
333
+ + checkout-index: delay automatic setting of to_tempfile
334
+ + format-patch: use OPT_STRING_LIST for to/cc options
335
+ + merge: simplify parsing of "-n" option
336
+ + merge: make xopts a strvec
337
338
Unused parameters to functions are marked as such, and/or removed,
339
in order to bring us closer to -Wunused-parameter clean.
340
312
- Will merge to 'next'?
341
+ Will merge to 'master'.
342
source: <20230831211637.GA949188@coredump.intra.peff.net>
343
344
@@ -342,108 +371,13 @@ Release tarballs are available at:
371
372
373
* ew/hash-with-openssl-evp (2023-08-31) 1 commit
345
- - treewide: fix various bugs w/ OpenSSL 3+ EVP API
374
+ (merged to 'next' on 2023-09-05 at 1ddc0078c8)
375
+ + treewide: fix various bugs w/ OpenSSL 3+ EVP API
376
377
Fix-up new-ish code to support OpenSSL EVP API.
378
349
- Will merge to 'next'?
350
- source: <20230901020928.M610756@dcvr>
351
-
352
---------------------------------------------------
353
-[Stalled]
354
-
355
-* js/doc-unit-tests (2023-08-17) 3 commits
356
- - ci: run unit tests in CI
357
- - unit tests: add TAP unit test framework
358
- - unit tests: Add a project plan document
359
- (this branch is used by js/doc-unit-tests-with-cmake.)
360
-
361
- Process to add some form of low-level unit tests has started.
362
-
363
- Comments?
364
- source: <cover.1692297001.git.steadmon@google.com>
365
-
366
-
367
-* ak/pretty-decorate-more (2023-08-21) 8 commits
368
- - decorate: use commit color for HEAD arrow
369
- - pretty: add pointer and tag options to %(decorate)
370
- - pretty: add %(decorate[:<options>]) format
371
- - decorate: color each token separately
372
- - decorate: avoid some unnecessary color overhead
373
- - decorate: refactor format_decorations()
374
- - pretty-formats: enclose options in angle brackets
375
- - pretty-formats: define "literal formatting code"
376
-
377
- "git log --format" has been taught the %(decorate) placeholder.
378
-
379
- What's the status of this thing?
380
- source: <20230820185009.20095-1-andy.koppe@gmail.com>
381
-
382
-
383
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
384
- . gc: add `gc.repackFilterTo` config option
385
- . repack: implement `--filter-to` for storing filtered out objects
386
- . gc: add `gc.repackFilter` config option
387
- . repack: add `--filter=<filter-spec>` option
388
- . repack: refactor finding pack prefix
389
- . repack: refactor finishing pack-objects command
390
- . t/helper: add 'find-pack' test-tool
391
- . pack-objects: allow `--filter` without `--stdout`
392
-
393
- "git repack" machinery learns to pay attention to the "--filter="
394
- option.
395
-
396
- Kicked out of the 'seen', as it still seems to be failing tests.
397
- cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
398
- source: <20230812000011.1227371-1-christian.couder@gmail.com>
399
-
400
-
401
-* cc/git-replay (2023-06-03) 15 commits
402
- - replay: stop assuming replayed branches do not diverge
403
- - replay: add --contained to rebase contained branches
404
- - replay: add --advance or 'cherry-pick' mode
405
- - replay: disallow revision specific options and pathspecs
406
- - replay: use standard revision ranges
407
- - replay: make it a minimal server side command
408
- - replay: remove HEAD related sanity check
409
- - replay: remove progress and info output
410
- - replay: add an important FIXME comment about gpg signing
411
- - replay: don't simplify history
412
- - replay: introduce pick_regular_commit()
413
- - replay: die() instead of failing assert()
414
- - replay: start using parse_options API
415
- - replay: introduce new builtin
416
- - t6429: remove switching aspects of fast-rebase
417
-
418
- No reviews?
419
- source: <20230602102533.876905-1-christian.couder@gmail.com>
420
-
421
-
422
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
423
- - cherry-pick: refuse cherry-pick sequence if index is dirty
424
-
425
- "git cherry-pick A" that replays a single commit stopped before
426
- clobbering local modification, but "git cherry-pick A..B" did not,
427
- which has been corrected.
428
-
429
- Expecting a reroll.
430
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
431
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
432
-
433
---------------------------------------------------
434
-[Cooking]
435
-
436
-* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
437
- (merged to 'next' on 2023-08-29 at 5466f7fcb2)
438
- + parse-options: allow omitting option help text
439
-
440
- It may be tempting to leave the help text NULL for a command line
441
- option that is either hidden or too obvious, but "git subcmd -h"
442
- and "git subcmd --help-all" would have segfaulted if done so. Now
443
- the help text is optional.
444
-
379
Will merge to 'master'.
446
- source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
380
+ source: <20230901020928.M610756@dcvr>
381
382
383
* tb/path-filter-fix (2023-08-30) 15 commits
@@ -485,18 +419,6 @@ Release tarballs are available at:
419
source: <cover.1692827403.git.steadmon@google.com>
420
421
488
-* tb/mark-more-tests-as-leak-free (2023-08-29) 3 commits
489
- (merged to 'next' on 2023-08-29 at c1db288281)
490
- + leak tests: mark t5583-push-branches.sh as leak-free
491
- + leak tests: mark t3321-notes-stripspace.sh as leak-free
492
- + leak tests: mark a handful of tests as leak-free
493
-
494
- Tests that are known to pass with LSan are now marked as such.
495
-
496
- Will merge to 'master'.
497
- source: <cover.1693263171.git.me@ttaylorr.com>
498
-
499
-
422
* jc/update-index-show-index-version (2023-08-18) 3 commits
423
- test-tool: retire "index-version"
424
- update-index: add --show-index-version
@@ -509,53 +431,15 @@ Release tarballs are available at:
431
source: <20230818233729.2766281-1-gitster@pobox.com>
432
433
512
-* ob/revert-of-revert-is-reapply (2023-08-21) 2 commits
434
+* 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
437
438
The default log message created by "git revert", when reverting a
439
commit that records a revert, has been tweaked.
440
519
- Expecting a (hopefully small and final) reroll.
520
- cf. <ZOZnNDd2pMX6M2Au@nand.local>
521
- source: <20230809171531.2564807-1-oswald.buddenhagen@gmx.de>
522
-
523
-
524
-* la/trailer-cleanups (2023-08-06) 5 commits
525
- - trailer: rename *_DEFAULT enums to *_UNSPECIFIED
526
- - trailer: teach find_patch_start about --no-divider
527
- - trailer: split process_command_line_args into separate functions
528
- - trailer: split process_input_file into separate pieces
529
- - trailer: separate public from internal portion of trailer_iterator
530
-
531
- Code clean-up.
532
-
533
- Expecting a reroll.
534
- cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
535
- source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
536
-
537
-
538
-* la/trailer-test-and-doc-updates (2023-08-10) 14 commits
539
- - SQUASH???
540
- - trailer doc: <token> is a <key> or <keyAlias>, not both
541
- - trailer doc: separator within key suppresses default separator
542
- - trailer doc: emphasize the effect of configuration variables
543
- - trailer --unfold help: prefer "reformat" over "join"
544
- - trailer --parse docs: add explanation for its usefulness
545
- - trailer --only-input: prefer "configuration variables" over "rules"
546
- - trailer --parse help: expose aliased options
547
- - trailer --no-divider help: describe usual "---" meaning
548
- - trailer: trailer location is a place, not an action
549
- - trailer doc: narrow down scope of --where and related flags
550
- - trailer: add tests to check defaulting behavior with --no-* flags
551
- - trailer test description: this tests --where=after, not --where=before
552
- - trailer tests: make test cases self-contained
553
-
554
- Test coverage for trailers has been improved.
555
-
556
- Expecting a reroll.
557
- cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
558
- source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
441
+ Will merge to 'next'.
442
+ source: <20230821170720.577850-1-oswald.buddenhagen@gmx.de>
443
444
445
* jc/rerere-cleanup (2023-08-25) 4 commits
@@ -617,61 +501,3 @@ Release tarballs are available at:
501
Needs review.
502
cf. <xmqqtttia3vn.fsf@gitster.g>
503
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
620
-
621
---------------------------------------------------
622
-[Discarded]
623
-
624
-* jt/path-filter-fix (2023-08-08) 8 commits
625
- (merged to 'next' on 2023-08-09 at 59952b9ec9)
626
- + commit-graph: fix small leak with invalid changedPathsVersion
627
- (merged to 'next' on 2023-08-03 at d99958c287)
628
- + commit-graph: new filter ver. that fixes murmur3
629
- + repo-settings: introduce commitgraph.changedPathsVersion
630
- + t4216: test changed path filters with high bit paths
631
- + t/helper/test-read-graph: implement `bloom-filters` mode
632
- + bloom.h: make `load_bloom_filter_from_graph()` public
633
- + t/helper/test-read-graph.c: extract `dump_graph_info()`
634
- + gitformat-commit-graph: describe version 2 of BDAT
635
-
636
- The Bloom filter used for path limited history traversal was broken
637
- on systems whose "char" is unsigned; update the implementation and
638
- bump the format version to 2.
639
-
640
- Reverted out of 'next', superseded by the tb/path-filter-fix topic.
641
- cf. <ZMqp6K2iXixWH/zT@nand.local>
642
- source: <cover.1690912539.git.jonathantanmy@google.com>
643
- source: <20230808192240.GA4091261@coredump.intra.peff.net>
644
-
645
-
646
-* ab/tag-object-type-errors (2023-05-10) 4 commits
647
- . tag: don't emit potentially incorrect "object is a X, not a Y"
648
- . tag: don't misreport type of tagged objects in errors
649
- . object tests: add test for unexpected objects in tags
650
- . Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
651
-
652
- Hardening checks around mismatched object types when one of those
653
- objects is a tag.
654
-
655
- Stalled for too long.
656
- source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
657
-
658
-
659
-* ob/send-email-interactive-failure (2023-08-29) 2 commits
660
- . SQUASH???
661
- . send-email: prompt-dependent exit codes
662
-
663
- "git send-email" exits with non-zero status when end-user
664
- interaction causes any prepared message not to be sent.
665
-
666
- Breaks existing users without even an opt-out knob.
667
- source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
668
-
669
-
670
-* ws/svn-with-new-readline (2023-08-11) 1 commit
671
- . git-svn: avoid creating more than one than one Term::ReadLine object
672
-
673
- Adjust to newer Term::ReadLine to prevent it from breaking
674
- the interactive prompt code in git-svn.
675
-
676
- Superseded by ws/git-svn-retire-faketerm
677
- source: <20230810011831.1423208-1-wesleys@opperschaap.net>