What's cooking (2022/11 #05)
Junio C Hamano committed
Nov 22, 2022 at 14:47 UTC
431813a4c23fe2412d82b187593693d74a1d360b
1 file changed
+252
-321
whats-cooking.txt
+252
-321
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2022, #04; Fri, 18)
2
+Subject: What's cooking in git.git (Nov 2022, #05; Tue, 22)
3
X-master-at: a0789512c5a4ae7da935cd2e419f253cb3cb4ce7
4
-X-next-at: ad972b3819afa78ac7b9beb7b5c7e8664cd2e75f
4
+X-next-at: 69dc60536b568f42ae709ad6bea424c3fdfcbf1c
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2022, #04; Fri, 18)
7
+What's cooking in git.git (Nov 2022, #05; Tue, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,9 +14,13 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
17
-Junio appears to be back online, so I expect this will be my last
18
-push-out as interim maintainer. Thanks, everybody, for all of their
19
-patience while I juggled all of the merges.
17
+I have been offline for the last couple of weeks, but it seems that
18
+the development community have continued to thrive under Taylor's
19
+care. Thanks for successfully concluding the "bus factor" exercise,
20
+everybody. It will probably take me a few more days to catch up
21
+with what is in the tree right now and has been described in the
22
+previous few issues of the "What's cooking" report, and after that
23
+we will have -rc0 for the coming release.
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
@@ -24,257 +28,132 @@ repositories have only a subset of branches.
28
29
With maint, master, next, seen, todo:
30
27
- https://github.com/git/git/
28
-
29
-The following mirrors are currently out-of-date while the usual
30
-maintainer is offline.
31
-
31
git://git.kernel.org/pub/scm/git/git.git/
32
git://repo.or.cz/alt-git.git/
33
https://kernel.googlesource.com/pub/scm/git/git/
34
+ https://github.com/git/git/
35
https://gitlab.com/git-vcs/git/
36
37
With all the integration branches and topics broken out:
38
39
- https://github.com/ttaylorr/git/
39
+ https://github.com/gitster/git/
40
41
Even though the preformatted documentation in HTML and man format
42
-are not sources, they are typically published in these repositories
43
-for convenience (replace "htmldocs" with "manpages" for the manual
44
- pages):
42
+are not sources, they are published in these repositories for
43
+convenience (replace "htmldocs" with "manpages" for the manual
44
+pages):
45
46
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
47
https://github.com/gitster/git-htmldocs.git/
48
49
-...but these and the release tarballs below are similarly out-of-date:
49
+Release tarballs are available at:
50
51
https://www.kernel.org/pub/software/scm/git/
52
53
---------------------------------------------------
54
-[Graduated to 'master']
55
-
56
-* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
57
- (merged to 'next' on 2022-11-03 at 0f01b25561)
58
- + run-command tests: test stdout of run_command_parallel()
59
- + submodule tests: reset "trace.out" between "grep" invocations
60
- + hook tests: fix redirection logic error in 96e7225b310
61
-
62
- Various test updates.
63
- source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
64
-
65
-
66
-* ab/sha-makefile-doc (2022-11-07) 10 commits
67
- (merged to 'next' on 2022-11-08 at 6d3068d7cd)
68
- + Makefile: discuss SHAttered in *_SHA{1,256} discussion
69
- + Makefile: document default SHA-1 backend on OSX
70
- + Makefile & test-tool: replace "DC_SHA1" variable with a "define"
71
- + Makefile: document SHA-1 and SHA-256 default and selection order
72
- + Makefile: document default SHA-256 backend
73
- + Makefile: rephrase the discussion of *_SHA1 knobs
74
- + Makefile: create and use sections for "define" flag listing
75
- + Makefile: correct DC_SHA1 documentation
76
- + INSTALL: remove discussion of SHA-1 backends
77
- + Makefile: always (re)set DC_SHA1 on fallback
78
-
79
- Makefile comments updates and reordering to clarify knobs used to
80
- choose SHA implementations.
81
- source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com>
82
-
83
-
84
-* en/sparse-checkout-design (2022-11-07) 1 commit
85
- (merged to 'next' on 2022-11-08 at 42e164b490)
86
- + sparse-checkout.txt: new document with sparse-checkout directions
87
-
88
- Design doc.
89
- source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
90
-
91
-
92
-* jk/branch-delete-detached (2022-11-10) 1 commit
93
- (merged to 'next' on 2022-11-14 at b185797ec0)
94
- + branch: gracefully handle '-d' on orphan HEAD
95
-
96
- Fix a bug where `git branch -d` did not work on an orphaned HEAD.
97
- source: <Y2H/1S3G+KeeEN/l@coredump.intra.peff.net>
98
-
99
-
100
-* mh/credential-unrecognized-attrs (2022-11-12) 1 commit
101
- (merged to 'next' on 2022-11-14 at 8170443d0a)
102
- + docs: clarify that credential discards unrecognised attributes
103
-
104
- Docfix.
105
- source: <pull.1393.git.1666598268697.gitgitgadget@gmail.com>
106
-
107
-
108
-* mh/increase-credential-cache-timeout (2022-11-09) 1 commit
109
- (merged to 'next' on 2022-11-14 at afe54db0f1)
110
- + Documentation: increase example cache timeout to 1 hour
111
-
112
- Update the credential-cache documentation to provide a more realistic
113
- example.
114
- source: <pull.1412.v2.git.1668010273573.gitgitgadget@gmail.com>
115
-
116
-
117
-* tb/repack-expire-to (2022-10-24) 4 commits
118
- (merged to 'next' on 2022-11-08 at 496ce3c62d)
119
- + builtin/repack.c: implement `--expire-to` for storing pruned objects
120
- + builtin/repack.c: write cruft packs to arbitrary locations
121
- + builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
122
- + builtin/repack.c: pass "out" to `prepare_pack_objects`
123
-
124
- "git repack" learns to send cruft objects out of the way into
125
- packfiles outside the repository.
126
- source: <cover.1666636974.git.me@ttaylorr.com>
127
-
128
-
129
-* vd/skip-cache-tree-update (2022-11-10) 5 commits
130
- (merged to 'next' on 2022-11-14 at 06b2da01ff)
131
- + rebase: use 'skip_cache_tree_update' option
132
- + read-tree: use 'skip_cache_tree_update' option
133
- + reset: use 'skip_cache_tree_update' option
134
- + unpack-trees: add 'skip_cache_tree_update' option
135
- + cache-tree: add perf test comparing update and prime
136
-
137
- Avoid calling 'cache_tree_update()' when doing so would be redundant.
138
- source: <pull.1411.v3.git.1668107165.gitgitgadget@gmail.com>
139
-
140
-
141
-* vd/update-refs-delete (2022-11-07) 1 commit
142
- (merged to 'next' on 2022-11-08 at 2866156953)
143
- + rebase --update-refs: avoid unintended ref deletion
144
-
145
- `git rebase --update-refs` would delete references when all
146
- `update-ref` commands in the sequencer were removed, which has been
147
- corrected.
148
- source: <20221107174752.91186-1-vdye@github.com>
149
-
53
--------------------------------------------------
54
[New Topics]
55
153
-* ab/fewer-the-index-macros (2022-11-18) 12 commits
154
- - builtin/*: remove or amend "USE_THE_INDEX_COMPATIBILITY_MACROS"
155
- - cocci: apply "pending" index-compatibility to some "builtin/*.c"
156
- - cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
157
- - {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
158
- - cocci: apply "pending" index-compatibility to "t/helper/*.c"
159
- - cocci & cache.h: apply variable section of "pending" index-compatibility
160
- - cocci & cache.h: apply a selection of "pending" index-compatibility
161
- - cocci: add a index-compatibility.pending.cocci
162
- - read-cache API & users: make discard_index() return void
163
- - cocci & cache.h: remove rarely used "the_index" compat macros
164
- - builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
165
- - cache.h: remove unused "the_index" compat macros
56
+* ew/prune-with-missing-objects-pack (2022-11-21) 1 commit
57
+ - prune: quiet ENOENT on missing directories
58
167
- Progress on removing 'the_index' convenience wrappers.
59
+ "git prune" may try to iterate over .git/objects/pack for trash
60
+ files to remove in it, and loudly fail when the directory is
61
+ missing, which is not necessary. The command has been taught to
62
+ ignore such a failure.
63
169
- Expecting a (small) reroll, then will merge to 'next'.
170
- source: <cover-00.12-00000000000-20221118T112205Z-avarab@gmail.com>
64
+ Will merge to 'next'.
65
+ source: <20221119201213.2398081-1-e@80x24.org>
66
67
173
-* ab/tag-object-type-errors (2022-11-18) 4 commits
174
- - tag: don't emit potentially incorrect "object is a X, not a Y"
175
- - tag: don't misreport type of tagged objects in errors
176
- - object tests: add test for unexpected objects in tags
177
- - object-file.c: free the "t.tag" in check_tag()
178
- (this branch uses jk/parse-object-type-mismatch.)
179
-
180
- Hardening checks around mismatched object types when one of those
181
- objects is a tag.
182
-
183
- Needs review.
184
- source: <Y3a3qcqNG8W3ueeb@coredump.intra.peff.net>
185
- source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
186
-
187
-
188
-* ew/delta-islands-free (2022-11-18) 1 commit
189
- (merged to 'next' on 2022-11-18 at 7c4899e0cb)
190
- + delta-islands: free island-related data after use
191
-
192
- Free structures related to delta islands after use.
193
-
194
- Will merge to 'master'.
195
- source: <20221117230658.M516129@dcvr>
196
-
197
-
198
-* gc/resolve-alternate-symlinks (2022-11-17) 1 commit
199
- - object-file: use real paths when adding alternates
200
-
201
- Resolve symbolic links when processing the locations of alternate
202
- object stores, since failing to do so can lead to confusing and buggy
203
- behavior.
68
+* rs/list-objects-filter-leakfix (2022-11-21) 1 commit
69
+ - list-objects-filter: plug combine_filter_data leak
70
205
- Expecting a reroll, then will merge to 'next'.
206
- source: <pull.1382.git.git.1668706274099.gitgitgadget@gmail.com>
71
+ Leakfix.
72
73
+ Will merge to 'next'.
74
+ source: <bc25ac8c-ce9a-2385-be0d-0c72798d319d@web.de>
75
209
-* jk/parse-object-type-mismatch (2022-11-18) 2 commits
210
- (merged to 'next' on 2022-11-18 at 1ee133a089)
211
- + parse_object(): check on-disk type of suspected blob
212
- + parse_object(): drop extra "has" check before checking object type
213
- (this branch is used by ab/tag-object-type-errors.)
76
215
- `parse_object()` hardening when checking for the existence of a
216
- suspected blob object.
77
+* es/locate-httpd-module-location-in-test (2022-11-22) 1 commit
78
+ - lib-httpd: extend module location auto-detection
79
218
- Will cook in 'next'.
219
- source: <Y3a3qcqNG8W3ueeb@coredump.intra.peff.net>
80
+ Add one more candidate directory that may house httpd modules while
81
+ running tests.
82
83
+ Will merge to 'next'.
84
+ source: <pull.1426.git.1668999695898.gitgitgadget@gmail.com>
85
222
-* js/range-diff-mbox (2022-11-15) 1 commit
223
- - range-diff: support reading mbox files
86
225
- 'git range-diff' gained support for reading either side from an .mbox
226
- file instead of a revision range.
87
+* zk/push-use-bitmaps (2022-11-22) 1 commit
88
+ - t5516: fail to run in verbose mode
89
228
- Expecting another round?
229
- source: <pull.1420.git.1668536405563.gitgitgadget@gmail.com>
90
+ Test fix.
91
92
+ Will merge to 'next'.
93
+ source: <20221121134040.12260-1-worldhello.net@gmail.com>
94
232
-* mg/notes-newline (2022-11-16) 1 commit
233
- (merged to 'next' on 2022-11-18 at b20234698d)
234
- + notes: avoid empty line in template
95
+--------------------------------------------------
96
+[Stalled]
97
236
- Avoid a stray empty newline in the template when creating new notes.
98
+* ms/sendemail-validate-headers (2022-11-11) 1 commit
99
+ . Expose header information to git-send-email's sendemail-validate hook
100
238
- Will merge to 'master'.
239
- source: <347ee7ad6fea7cf96bb1e51772802102082b58cc.1668614158.git.git@grubix.eu>
101
+ Expecting a reroll.
102
+ Appears to break t9001 completely?
103
+ source: <20221111194223.644845-2-michael.strawbridge@amd.com>
104
105
242
-* rj/branch-copy-and-rename (2022-11-17) 2 commits
243
- - branch: clear target branch configuration before copying or renaming
244
- - branch: force-copy a branch to itself via @{-1} is a no-op
106
+* ab/config-multi-and-nonbool (2022-11-02) 9 commits
107
+ . for-each-repo: with bad config, don't conflate <path> and <cmd>
108
+ . config API: add "string" version of *_value_multi(), fix segfaults
109
+ . config API users: test for *_get_value_multi() segfaults
110
+ . for-each-repo: error on bad --config
111
+ . config API: have *_multi() return an "int" and take a "dest"
112
+ . versioncmp.c: refactor config reading next commit
113
+ . config tests: add "NULL" tests for *_get_value_multi()
114
+ . config tests: cover blind spots in git_die_config() tests
115
+ . for-each-repo tests: test bad --config keys
116
246
- Fix a pair of bugs in 'git branch'.
117
+ A mixed bag of config API updates.
118
248
- Waiting for review discussion to settle.
249
- source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
119
+ Waiting for review.
120
+ cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
121
+ source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
122
123
252
-* tl/ls-tree--pattern (2022-11-17) 6 commits
253
- - ls-tree: introduce '--pattern' option
254
- - ls-tree: introduce 'match_pattern()' function
255
- - ls-tree: improving cohension in the print code
256
- - ls-tree: optimize params of 'show_tree_common_default_long()'
257
- - t3104: remove shift code in 'test_ls_tree_format'
258
- - ls-tree: cleanup the redundant SPACE
124
+* hl/archive-recursive (2022-10-19) 10 commits
125
+ . fixup! archive: add tests for git archive --recurse-submodules
126
+ . archive: add tests for git archive --recurse-submodules
127
+ . archive: add --recurse-submodules to git-archive command
128
+ . archive: remove global repository from archive_args
129
+ . archive: pass repo objects to write_archive handlers
130
+ . tree: add repository parameter to read_tree_fn_t
131
+ . tree: handle submodule case for read_tree_at properly
132
+ . tree: increase test coverage for tree.c
133
+ . tree: update cases to use repo_ tree methods
134
+ . tree: do not use the_repository for tree traversal methods.
135
260
- A synonym for "ls-tree | grep <pattern>", "ls-tree
261
- --pattern=<pattern>" was introduced.
136
+ "git archive" has been taught "--recurse-submodules" option to
137
+ create a tarball that includes contents from submodules.
138
263
- Waiting for review response, but leaning negative.
264
- source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>
139
+ Expecting a reroll.
140
+ Seems to break win+VS test(8).
141
+ cf. https://github.com/git/git/actions/runs/3293333066 whose only
142
+ difference from https://github.com/git/git/actions/runs/3293553109
143
+ is the inclusion of this topic.
144
+ source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
145
146
267
-* tr/am--no-verify (2022-11-18) 1 commit
268
- - am: Allow passing --no-verify flag
147
+* pw/test-todo (2022-10-06) 3 commits
148
+ . test_todo: allow [verbose] test as the command
149
+ . test_todo: allow [!] grep as the command
150
+ . tests: add test_todo() to mark known breakages
151
270
- Conditionally skip the pre-applypatch and applypatch-msg hooks when
271
- applying patches with 'git am'.
152
+ RFC for test framework improvement.
153
273
- Expecting another round.
274
- source: <20221118132743.3525725-1-thierry.reding@gmail.com>
154
+ Needs review.
155
+ source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
156
276
---------------------------------------------------
277
-[Stalled]
157
158
* cw/submodule-status-in-parallel (2022-11-08) 6 commits
159
- diff-lib: parallelize run_diff_files for submodules
@@ -397,25 +276,154 @@ for convenience (replace "htmldocs" with "manpages" for the manual
276
--------------------------------------------------
277
[Cooking]
278
400
-* ab/remove--super-prefix (2022-11-14) 12 commits
279
+* sa/cat-file-mailmap--batch-check (2022-11-21) 2 commits
280
+ - cat-file: add mailmap support to --batch-check option
281
+ - cat-file: add mailmap support to -s option
282
+
283
+ 'cat-file' gains mailmap support for its '--batch-check' and '-s'
284
+ options.
285
+ source: <20221120074852.121346-1-siddharthasthana31@gmail.com>
286
+
287
+
288
+* ab/fewer-the-index-macros (2022-11-21) 11 commits
289
+ - cocci: apply "pending" index-compatibility to some "builtin/*.c"
290
+ - cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
291
+ - {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
292
+ - cocci: apply "pending" index-compatibility to "t/helper/*.c"
293
+ - cocci & cache.h: apply variable section of "pending" index-compatibility
294
+ - cocci & cache.h: apply a selection of "pending" index-compatibility
295
+ - cocci: add a index-compatibility.pending.cocci
296
+ - read-cache API & users: make discard_index() return void
297
+ - cocci & cache.h: remove rarely used "the_index" compat macros
298
+ - builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
299
+ - cache.h: remove unused "the_index" compat macros
300
+
301
+ Progress on removing 'the_index' convenience wrappers.
302
+
303
+ Will merge to 'next'.
304
+ source: <cover-v2-00.11-00000000000-20221119T125550Z-avarab@gmail.com>
305
+
306
+
307
+* ab/tag-object-type-errors (2022-11-22) 5 commits
308
+ - tag: don't emit potentially incorrect "object is a X, not a Y"
309
+ - tag: don't misreport type of tagged objects in errors
310
+ - object tests: add test for unexpected objects in tags
311
+ - object-file.c: free the "t.tag" in check_tag()
312
+ - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
313
+ (this branch uses jk/parse-object-type-mismatch.)
314
+
315
+ Hardening checks around mismatched object types when one of those
316
+ objects is a tag.
317
+
318
+ Needs review.
319
+ source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
320
+
321
+
322
+* ew/delta-islands-free (2022-11-18) 1 commit
323
+ (merged to 'next' on 2022-11-18 at 7c4899e0cb)
324
+ + delta-islands: free island-related data after use
325
+
326
+ Free structures related to delta islands after use.
327
+
328
+ Will merge to 'master'.
329
+ source: <20221117230658.M516129@dcvr>
330
+
331
+
332
+* gc/resolve-alternate-symlinks (2022-11-22) 1 commit
333
+ - object-file: use real paths when adding alternates
334
+
335
+ Resolve symbolic links when processing the locations of alternate
336
+ object stores, since failing to do so can lead to confusing and buggy
337
+ behavior.
338
+
339
+ Will merge to 'next'.
340
+ source: <pull.1382.v2.git.git.1669074557348.gitgitgadget@gmail.com>
341
+
342
+
343
+* jk/parse-object-type-mismatch (2022-11-22) 3 commits
344
+ (merged to 'next' on 2022-11-22 at 69dc60536b)
345
+ + parse_object(): simplify blob conditional
346
+ (merged to 'next' on 2022-11-18 at 1ee133a089)
347
+ + parse_object(): check on-disk type of suspected blob
348
+ + parse_object(): drop extra "has" check before checking object type
349
+ (this branch is used by ab/tag-object-type-errors.)
350
+
351
+ `parse_object()` hardening when checking for the existence of a
352
+ suspected blob object.
353
+
354
+ Will merge to 'master'.
355
+ source: <Y3vQ/6QcTEFfpjLt@coredump.intra.peff.net>
356
+
357
+
358
+* js/range-diff-mbox (2022-11-21) 1 commit
359
+ - range-diff: support reading mbox files
360
+
361
+ 'git range-diff' gained support for reading either side from an .mbox
362
+ file instead of a revision range.
363
+ source: <pull.1420.v2.git.1668899471058.gitgitgadget@gmail.com>
364
+
365
+
366
+* mg/notes-newline (2022-11-16) 1 commit
367
+ (merged to 'next' on 2022-11-18 at b20234698d)
368
+ + notes: avoid empty line in template
369
+
370
+ Avoid a stray empty newline in the template when creating new notes.
371
+
372
+ Will merge to 'master'.
373
+ source: <347ee7ad6fea7cf96bb1e51772802102082b58cc.1668614158.git.git@grubix.eu>
374
+
375
+
376
+* rj/branch-copy-and-rename (2022-11-17) 2 commits
377
+ - branch: clear target branch configuration before copying or renaming
378
+ - branch: force-copy a branch to itself via @{-1} is a no-op
379
+
380
+ Fix a pair of bugs in 'git branch'.
381
+
382
+ Waiting for review discussion to settle.
383
+ source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
384
+
385
+
386
+* tl/ls-tree--pattern (2022-11-17) 6 commits
387
+ - ls-tree: introduce '--pattern' option
388
+ - ls-tree: introduce 'match_pattern()' function
389
+ - ls-tree: improving cohension in the print code
390
+ - ls-tree: optimize params of 'show_tree_common_default_long()'
391
+ - t3104: remove shift code in 'test_ls_tree_format'
392
+ - ls-tree: cleanup the redundant SPACE
393
+
394
+ A synonym for "ls-tree | grep <pattern>", "ls-tree
395
+ --pattern=<pattern>" was introduced.
396
+
397
+ Waiting for review response, but leaning negative.
398
+ source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>
399
+
400
+
401
+* tr/am--no-verify (2022-11-18) 1 commit
402
+ - am: Allow passing --no-verify flag
403
+
404
+ Conditionally skip the pre-applypatch and applypatch-msg hooks when
405
+ applying patches with 'git am'.
406
+
407
+ Expecting another round.
408
+ source: <20221118132743.3525725-1-thierry.reding@gmail.com>
409
+
410
+
411
+* ab/remove--super-prefix (2022-11-21) 11 commits
412
- fetch: rename "--submodule-prefix" to "--super-prefix"
413
- read-tree: add "--super-prefix" option, eliminate global
403
- - submodule tests: test "git branch -t" output and stderr
414
- submodule--helper: convert "{update,clone}" to their own "--super-prefix"
415
- submodule--helper: convert "status" to its own "--super-prefix"
416
- submodule--helper: convert "sync" to its own "--super-prefix"
417
- submodule--helper: convert "foreach" to its own "--super-prefix"
408
- - submodule--helper: "deinit" has never used "--super-prefix"
418
- submodule--helper: don't use global --super-prefix in "absorbgitdirs"
419
+ - submodule.c & submodule--helper: pass along "super_prefix" param
420
- read-tree + fetch tests: test failing "--super-prefix" interaction
421
- Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
422
- Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix
423
(this branch uses ab/submodule-helper-prep-only and ab/submodule-no-abspath.)
424
425
Remove the top-level `--super-prefix` option.
416
-
417
- Expecting a reroll?
418
- source: <cover-v2-00.10-00000000000-20221114T100803Z-avarab@gmail.com>
426
+ source: <cover-v3-0.9-00000000000-20221119T122853Z-avarab@gmail.com>
427
428
429
* ab/submodule-no-abspath (2022-11-09) 1 commit
@@ -437,8 +445,8 @@ for convenience (replace "htmldocs" with "manpages" for the manual
445
446
Fix a source of flakiness in CI when compiling with SANITIZE=leak.
447
440
- Will cook in 'next'.
441
- source: <Y3PrjMLcEGfoHifZ@nand.local>
448
+ Will merge to 'master'.
449
+ source: <patch-1.1-21a9cb49299-20221115T233516Z-avarab@gmail.com>
450
451
452
* es/chainlint-lineno (2022-11-11) 4 commits
@@ -502,18 +510,10 @@ for convenience (replace "htmldocs" with "manpages" for the manual
510
511
Doc update.
512
505
- Will cook in 'next'.
513
+ Will merge to 'master'.
514
source: <pull.1379.git.git.1668217470500.gitgitgadget@gmail.com>
515
516
509
-* ms/sendemail-validate-headers (2022-11-11) 1 commit
510
- . Expose header information to git-send-email's sendemail-validate hook
511
-
512
- Expecting a reroll.
513
- Appears to break t9001 completely?
514
- source: <20221111194223.644845-2-michael.strawbridge@amd.com>
515
-
516
-
517
* pw/strict-label-lookups (2022-11-10) 2 commits
518
(merged to 'next' on 2022-11-14 at 7db4398d23)
519
+ sequencer: tighten label lookups
@@ -522,24 +522,22 @@ for convenience (replace "htmldocs" with "manpages" for the manual
522
Correct an error where `git rebase` would mistakenly use a branch or
523
tag named "refs/rewritten/xyz" when missing a rebase label.
524
525
- Will cook in 'next'.
525
+ Will merge to 'master'.
526
source: <pull.1414.git.1668098622.gitgitgadget@gmail.com>
527
528
529
-* rs/multi-filter-args (2022-11-12) 3 commits
530
- - list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()
531
- - pack-object: simplify --filter handling
532
- - pack-objects: fix handling of multiple --filter options
529
+* rs/multi-filter-args (2022-11-21) 3 commits
530
+ - Revert "pack-objects: lazily set up "struct rev_info", don't leak"
531
+ - t5317: demonstrate failure to handle multiple --filter options
532
+ - t5317: stop losing return codes of git ls-files
533
534
Fix a bug where `pack-objects` would not respect multiple `--filter`
535
arguments when invoked directly.
536
-
537
- Expecting a reroll?
538
- source: <c64e4fa5-62c2-2a93-a4ef-bd84407ea570@web.de>
536
+ source: <d19c6cb4-611f-afea-8a14-5e58d7509113@web.de>
537
538
541
-* ab/various-leak-fixes (2022-11-08) 18 commits
542
- (merged to 'next' on 2022-11-18 at 8828bb7161)
539
+* ab/various-leak-fixes (2022-11-21) 16 commits
540
+ (merged to 'next' on 2022-11-21 at eff484a27c)
541
+ built-ins: use free() not UNLEAK() if trivial, rm dead code
542
+ revert: fix parse_options_concat() leak
543
+ cherry-pick: free "struct replay_opts" members
@@ -556,13 +554,11 @@ for convenience (replace "htmldocs" with "manpages" for the manual
554
+ {reset,merge}: call discard_index() before returning
555
+ tests: mark tests as passing with SANITIZE=leak
556
+ Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
559
- + rebase: stop exporting GIT_REFLOG_ACTION
560
- + sequencer: stop exporting GIT_REFLOG_ACTION
561
- (this branch is used by ab/merge-index-prep.)
557
+ (this branch uses pw/rebase-no-reflog-action.)
558
559
Various leak fixes.
560
565
- Will merge to 'master'.
561
+ Will cook in 'next'.
562
source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
563
564
@@ -587,7 +583,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
583
arguments to the command given to 'git bisect run' as arguments to
584
the helper.
585
590
- Will cook in 'next'.
586
+ Will merge to 'master'.
587
source: <cover.1668097286.git.congdanhqx@gmail.com>
588
589
@@ -686,7 +682,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
682
'scalar reconfigure -a' is taught to automatically remove
683
scalar.repo entires which no longer exist.
684
689
- Will cook in 'next'.
685
+ Will merge to 'master'.
686
source: <pull.1415.git.1668065327120.gitgitgadget@gmail.com>
687
688
@@ -697,7 +693,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
693
Push all submodules recursively with
694
'--recurse-submodules=on-demand'.
695
700
- Will cook in 'next'.
696
+ Will merge to 'master'.
697
source: <20221114213713.2341945-1-jonathantanmy@google.com>
698
699
@@ -705,12 +701,12 @@ for convenience (replace "htmldocs" with "manpages" for the manual
701
(merged to 'next' on 2022-11-14 at 790dadc8d3)
702
+ rebase: stop exporting GIT_REFLOG_ACTION
703
+ sequencer: stop exporting GIT_REFLOG_ACTION
708
- (this branch is used by ab/merge-index-prep.)
704
+ (this branch is used by ab/various-leak-fixes.)
705
706
Avoid setting GIT_REFLOG_ACTION to improve readability of the
707
sequencer internals.
708
713
- Will cook in 'next'.
709
+ Will merge to 'master'.
710
source: <31df037eafede799c2ef27df66c6da309b719b1b.1668003719.git.gitgitgadget@gmail.com>
711
712
@@ -727,24 +723,11 @@ for convenience (replace "htmldocs" with "manpages" for the manual
723
arbitrary path, and 'git for-each-repo' is taught to expand tilde
724
characters in paths.
725
730
- Will cook in 'next'.
726
+ Will merge to 'master'.
727
source: <20221109190708.22725-1-ronan@rjp.ie>
728
source: <patch-1.1-54d405f15f1-20221115T080212Z-avarab@gmail.com>
729
730
735
-* sa/cat-file-mailmap--batch-check (2022-11-14) 3 commits
736
- . doc/cat-file: allow --use-mailmap for --batch options
737
- . cat-file: add mailmap support to --batch-check option
738
- . cat-file: add mailmap support to -s option
739
-
740
- 'cat-file' gains mailmap support for its '--batch-check' and '-s'
741
- options.
742
-
743
- Expecting another round.
744
- Breaks t4203 when run with 'GIT_TEST_DEFAULT_HASH=sha256'.
745
- source: <20221113212830.92609-1-siddharthasthana31@gmail.com>
746
-
747
-
731
* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
732
(merged to 'next' on 2022-11-18 at ad972b3819)
733
+ fsmonitor--daemon: on macOS support symlink
@@ -795,7 +778,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
778
779
Preparation to remove git-submodule.sh and replace it with a builtin.
780
798
- Will cook in 'next'.
781
+ Will merge to 'master'.
782
source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
783
784
@@ -823,7 +806,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
806
807
A handful of leaks in the line-log machinery have been plugged.
808
826
- Expecting a reroll.
809
+ Will merge to 'next'.
810
source: <20221102220142.574890-1-szeder.dev@gmail.com>
811
812
@@ -846,7 +829,8 @@ for convenience (replace "htmldocs" with "manpages" for the manual
829
The pack-bitmap machinery is taught to log the paths of redundant
830
bitmap(s) to trace2 instead of stderr.
831
849
- Will merge to 'master'.
832
+ Waiting for two follow-on patches.
833
+ cf. <xmqqbkozvqbt.fsf@gitster.g>
834
source: <cover.1668063122.git.dyroneteng@gmail.com>
835
836
@@ -874,10 +858,10 @@ for convenience (replace "htmldocs" with "manpages" for the manual
858
859
860
* ab/make-bin-wrappers (2022-10-31) 4 commits
877
- - Makefile: simplify $(test_bindir_programs) rule by splitting it up
878
- - Makefile: rename "test_bindir_programs" variable, pre-declare
879
- - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
880
- - Makefile: factor sed-powered '#!/bin/sh' munging into a variable
861
+ . Makefile: simplify $(test_bindir_programs) rule by splitting it up
862
+ . Makefile: rename "test_bindir_programs" variable, pre-declare
863
+ . Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
864
+ . Makefile: factor sed-powered '#!/bin/sh' munging into a variable
865
866
Resolve issues with the bin-wrappers/% rules where "make
867
bin-wrappers/git" would generate the script but not "git" itself.
@@ -916,24 +900,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
900
source: <pull.1384.v6.git.1668547188070.gitgitgadget@gmail.com>
901
902
919
-* ab/config-multi-and-nonbool (2022-11-02) 9 commits
920
- . for-each-repo: with bad config, don't conflate <path> and <cmd>
921
- . config API: add "string" version of *_value_multi(), fix segfaults
922
- . config API users: test for *_get_value_multi() segfaults
923
- . for-each-repo: error on bad --config
924
- . config API: have *_multi() return an "int" and take a "dest"
925
- . versioncmp.c: refactor config reading next commit
926
- . config tests: add "NULL" tests for *_get_value_multi()
927
- . config tests: cover blind spots in git_die_config() tests
928
- . for-each-repo tests: test bad --config keys
929
-
930
- A mixed bag of config API updates.
931
-
932
- Waiting for review.
933
- cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
934
- source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
935
-
936
-
903
* ps/receive-use-only-advertised (2022-11-17) 7 commits
904
(merged to 'next' on 2022-11-18 at e4a288a7a5)
905
+ receive-pack: only use visible refs for connectivity check
@@ -950,7 +916,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
916
the .hideRefs configuration, this reduces the resources needed to
917
perform the check.
918
953
- Will cook in 'next'.
919
+ Will merge to 'master'.
920
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
921
cf. <xmqqr0yrizqm.fsf@gitster.g>
922
source: <cover.1668663795.git.ps@pks.im>
@@ -980,8 +946,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
946
947
Assorted fixes of parsing end-user input as integers.
948
983
- Will merge to 'next'?
984
- cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
949
+ Will merge to 'next'.
950
source: <pull.1389.v2.git.1668003388.gitgitgadget@gmail.com>
951
952
@@ -1015,40 +980,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
980
source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>
981
982
1018
-* hl/archive-recursive (2022-10-19) 10 commits
1019
- . fixup! archive: add tests for git archive --recurse-submodules
1020
- . archive: add tests for git archive --recurse-submodules
1021
- . archive: add --recurse-submodules to git-archive command
1022
- . archive: remove global repository from archive_args
1023
- . archive: pass repo objects to write_archive handlers
1024
- . tree: add repository parameter to read_tree_fn_t
1025
- . tree: handle submodule case for read_tree_at properly
1026
- . tree: increase test coverage for tree.c
1027
- . tree: update cases to use repo_ tree methods
1028
- . tree: do not use the_repository for tree traversal methods.
1029
-
1030
- "git archive" has been taught "--recurse-submodules" option to
1031
- create a tarball that includes contents from submodules.
1032
-
1033
- Expecting a reroll.
1034
- Seems to break win+VS test(8).
1035
- cf. https://github.com/git/git/actions/runs/3293333066 whose only
1036
- difference from https://github.com/git/git/actions/runs/3293553109
1037
- is the inclusion of this topic.
1038
- source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
1039
-
1040
-
1041
-* pw/test-todo (2022-10-06) 3 commits
1042
- . test_todo: allow [verbose] test as the command
1043
- . test_todo: allow [!] grep as the command
1044
- . tests: add test_todo() to mark known breakages
1045
-
1046
- RFC for test framework improvement.
1047
-
1048
- Needs review.
1049
- source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
1050
-
1051
-
983
* ab/coccicheck-incremental (2022-11-11) 14 commits
984
(merged to 'next' on 2022-11-14 at 8a70133571)
985
+ Makefile: don't create a ".build/.build/" for cocci, fix output
@@ -1070,6 +1001,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
1001
"make coccicheck" is time consuming. It has been made to run more
1002
incrementally.
1003
1073
- Will cook in 'next'.
1004
+ Will merge to 'master'.
1005
source: <221109.86tu38p1x8.gmgdl@evledraar.gmail.com>
1006
source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>