What's cooking (2022/11 #4)

Taylor Blau committed Nov 18, 2022 at 20:07 UTC bd69d8289e76b9e56331b5fc88e3b23e5c670992
1 file changed +382 -295
whats-cooking.txt
+382 -295
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Nov 2022, #03; Mon, 14)
3 -X-master-at: eea7033409a0ed713c78437fc76486983d211e25
4 -X-next-at: 34eb0ea05a4e3296eee641767d1ed2edda20609d
2 +Subject: What's cooking in git.git (Nov 2022, #04; Fri, 18)
3 +X-master-at: a0789512c5a4ae7da935cd2e419f253cb3cb4ce7
4 +X-next-at: ad972b3819afa78ac7b9beb7b5c7e8664cd2e75f
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Nov 2022, #03; Mon, 14)
7 +What's cooking in git.git (Nov 2022, #04; Fri, 18)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -14,10 +14,9 @@ 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 -There are still a large-ish number of topics in 'seen' that are
18 -waiting for review. Otherwise, the remaining topics are graduating at
19 -a reasonable pace, and the queue for 'next' has returned to a normal
20 -level.
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.
20
21 Copies of the source code to Git live in many repositories, and the
22 following is a list of the ones I push into or their mirrors. Some
@@ -54,227 +53,225 @@ for convenience (replace "htmldocs" with "manpages" for the manual
53 --------------------------------------------------
54 [Graduated to 'master']
55
57 -* ab/rev-info-init (2022-11-08) 1 commit
58 - (merged to 'next' on 2022-11-08 at 909ad9ed3a)
59 - + revisions API: extend the nascent REV_INFO_INIT macro
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
61 - Progress on being able to initialize a rev_info struct with a macro.
62 - source: <patch-1.1-c3afcd69ddb-20221108T140134Z-avarab@gmail.com>
62 + Various test updates.
63 + source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
64
65
65 -* al/trace2-clearing-skip-worktree (2022-11-04) 2 commits
66 - (merged to 'next' on 2022-11-08 at 567aeb8d83)
67 - + index: raise a bug if the index is materialised more than once
68 - + index: add trace2 region for clear skip worktree
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
70 - Add trace2 counters to the region to clear skip worktree bits in a
71 - sparse checkout.
72 - source: <pull.1368.v4.git.git.1667516701.gitgitgadget@gmail.com>
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
75 -* do/modernize-t7001 (2022-11-04) 1 commit
76 - (merged to 'next' on 2022-11-08 at dfc9c80e73)
77 - + t7001-mv.sh: modernizing test script using functions
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
79 - Modernize test script to avoid "test -f" and friends.
80 - source: <pull.1372.v3.git.git.1667574352244.gitgitgadget@gmail.com>
88 + Design doc.
89 + source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
90
91
83 -* js/ci-set-output (2022-11-08) 1 commit
84 - (merged to 'next' on 2022-11-08 at 553062428c)
85 - + ci: use a newer `github-script` version
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
87 - Update the actions/github-script dependency in CI to avoid a
88 - deprecation warning.
89 - source: <pull.1387.git.1667902408921.gitgitgadget@gmail.com>
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
92 -* mh/password-can-be-pat (2022-11-08) 1 commit
93 - (merged to 'next' on 2022-11-08 at 3135ade2a6)
94 - + Documentation/gitcredentials.txt: mention password alternatives
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
96 - Documentation update to git-credential(1).
97 - source: <pull.1396.v3.git.1667912487608.gitgitgadget@gmail.com>
104 + Docfix.
105 + source: <pull.1393.git.1666598268697.gitgitgadget@gmail.com>
106
99 ---------------------------------------------------
100 -[New Topics]
107
102 -* ab/remove--super-prefix (2022-11-14) 12 commits
103 - - fetch: rename "--submodule-prefix" to "--super-prefix"
104 - - read-tree: add "--super-prefix" option, eliminate global
105 - - submodule tests: test "git branch -t" output and stderr
106 - - submodule--helper: convert "{update,clone}" to their own "--super-prefix"
107 - - submodule--helper: convert "status" to its own "--super-prefix"
108 - - submodule--helper: convert "sync" to its own "--super-prefix"
109 - - submodule--helper: convert "foreach" to its own "--super-prefix"
110 - - submodule--helper: "deinit" has never used "--super-prefix"
111 - - submodule--helper: don't use global --super-prefix in "absorbgitdirs"
112 - - read-tree + fetch tests: test failing "--super-prefix" interaction
113 - - Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
114 - - Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix
115 - (this branch uses ab/submodule-helper-prep-only and ab/submodule-no-abspath.)
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
117 - Remove the top-level `--super-prefix` option.
112 + Update the credential-cache documentation to provide a more realistic
113 + example.
114 + source: <pull.1412.v2.git.1668010273573.gitgitgadget@gmail.com>
115
119 - Expecting a reroll?
120 - source: <cover-v2-00.10-00000000000-20221114T100803Z-avarab@gmail.com>
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
123 -* ab/submodule-no-abspath (2022-11-09) 1 commit
124 - - submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
125 - (this branch is used by ab/remove--super-prefix.)
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
127 - Remove an absolute path in the "Migrating git directory" message.
128
129 - Will merge to 'next'.
130 - source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>
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
133 -* ab/t7610-timeout (2022-11-09) 1 commit
134 - (merged to 'next' on 2022-11-14 at 82a4abdb1d)
135 - + t7610: fix flaky timeout issue, don't clone from example.com
140
137 - Fix a source of flakiness in CI when compiling with SANITIZE=leak.
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
139 - Will cook in 'next'.
140 - source: <patch-1.1-83eca7b5a7c-20221105T115420Z-avarab@gmail.com>
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
150 +--------------------------------------------------
151 +[New Topics]
152
143 -* es/chainlint-lineno (2022-11-11) 4 commits
144 - - chainlint: prefix annotated test definition with line numbers
145 - - chainlint: latch line numbers at which each token starts and ends
146 - - chainlint: sidestep impoverished macOS "terminfo"
147 - - Merge branch 'es/chainlint-output' into es/chainlint-lineno
148 - (this branch uses es/chainlint-output.)
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
166
150 - Teach chainlint.pl to annotate the original test definition instead
151 - of the token stream.
167 + Progress on removing 'the_index' convenience wrappers.
168
153 - Will merge to 'next'.
154 - source: <pull.1413.v2.git.1668152094.gitgitgadget@gmail.com>
169 + Expecting a (small) reroll, then will merge to 'next'.
170 + source: <cover-00.12-00000000000-20221118T112205Z-avarab@gmail.com>
171
172
157 -* ew/format-patch-mboxrd (2022-11-14) 1 commit
158 - - format-patch: add --mboxrd alias for --pretty=mboxrd
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
160 - Teach `format-patch` a convenient alias for `--pretty=mboxrd`.
180 + Hardening checks around mismatched object types when one of those
181 + objects is a tag.
182
162 - Waiting for discussion to settle.
163 - source: <20221114094114.18986-1-e@80x24.org>
183 + Needs review.
184 + source: <Y3a3qcqNG8W3ueeb@coredump.intra.peff.net>
185 + source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
186
187
166 -* gc/redact-h2h3-headers (2022-11-14) 2 commits
167 - (merged to 'next' on 2022-11-14 at 34157d24e9)
168 - + http: redact curl h2h3 headers in info
169 - + t: run t5551 tests with both HTTP and HTTP/2
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
171 - Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
172 - others.
192 + Free structures related to delta islands after use.
193
194 Will merge to 'master'.
175 - source: <pull.1377.v3.git.git.1668206106.gitgitgadget@gmail.com>
176 -
177 -
178 -* jk/branch-delete-detached (2022-11-10) 1 commit
179 - (merged to 'next' on 2022-11-14 at b185797ec0)
180 - + branch: gracefully handle '-d' on orphan HEAD
181 -
182 - Fix a bug where `git branch -d` did not work on an orphaned HEAD.
183 - source: <Y2H/1S3G+KeeEN/l@coredump.intra.peff.net>
195 + source: <20221117230658.M516129@dcvr>
196
197
186 -* js/drop-mingw-test-cmp (2022-11-14) 2 commits
187 - - tests(mingw): avoid very slow `mingw_test_cmp`
188 - - t0021: use Windows-friendly `pwd`
189 -
190 - Use `git diff --no-index` as a test_cmp on Windows.
191 -
192 - Expecting a reroll.
193 - source: <pull.1309.v4.git.1668434812.gitgitgadget@gmail.com>
194 -
195 -
196 -* mc/switch-advice (2022-11-09) 1 commit
197 - - po: use `switch` over `checkout` in error message
198 +* gc/resolve-alternate-symlinks (2022-11-17) 1 commit
199 + - object-file: use real paths when adding alternates
200
199 - Use 'switch' instead of 'checkout' in an error message.
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.
204
201 - Waiting for review response.
202 - source: <pull.1308.git.git.1668018620148.gitgitgadget@gmail.com>
205 + Expecting a reroll, then will merge to 'next'.
206 + source: <pull.1382.git.git.1668706274099.gitgitgadget@gmail.com>
207
208
205 -* mh/credential-unrecognized-attrs (2022-11-12) 1 commit
206 - (merged to 'next' on 2022-11-14 at 8170443d0a)
207 - + docs: clarify that credential discards unrecognised attributes
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.)
214
209 - Docfix.
215 + `parse_object()` hardening when checking for the existence of a
216 + suspected blob object.
217
211 - Will merge to 'master'.
212 - source: <pull.1393.git.1666598268697.gitgitgadget@gmail.com>
218 + Will cook in 'next'.
219 + source: <Y3a3qcqNG8W3ueeb@coredump.intra.peff.net>
220
221
215 -* mh/gitcredentials-generate (2022-11-14) 1 commit
216 - - Docs: describe how a credential-generating helper works
222 +* js/range-diff-mbox (2022-11-15) 1 commit
223 + - range-diff: support reading mbox files
224
218 - Doc update.
225 + 'git range-diff' gained support for reading either side from an .mbox
226 + file instead of a revision range.
227
220 - Waiting for review.
221 - source: <pull.1379.git.git.1668217470500.gitgitgadget@gmail.com>
228 + Expecting another round?
229 + source: <pull.1420.git.1668536405563.gitgitgadget@gmail.com>
230
231
224 -* mh/increase-credential-cache-timeout (2022-11-09) 1 commit
225 - (merged to 'next' on 2022-11-14 at afe54db0f1)
226 - + Documentation: increase example cache timeout to 1 hour
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
235
228 - Update the credential-cache documentation to provide a more realistic
229 - example.
236 + Avoid a stray empty newline in the template when creating new notes.
237
238 Will merge to 'master'.
232 - source: <pull.1412.v2.git.1668010273573.gitgitgadget@gmail.com>
233 -
234 -
235 -* ms/sendemail-validate-headers (2022-11-11) 1 commit
236 - - Expose header information to git-send-email's sendemail-validate hook
237 -
238 - Expecting a reroll.
239 - source: <20221111194223.644845-2-michael.strawbridge@amd.com>
239 + source: <347ee7ad6fea7cf96bb1e51772802102082b58cc.1668614158.git.git@grubix.eu>
240
241
242 -* pw/strict-label-lookups (2022-11-10) 2 commits
243 - (merged to 'next' on 2022-11-14 at 7db4398d23)
244 - + sequencer: tighten label lookups
245 - + sequencer: unify label lookup
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
245
247 - Correct an error where `git rebase` would mistakenly use a branch or
248 - tag named "refs/rewritten/xyz" when missing a rebase label.
246 + Fix a pair of bugs in 'git branch'.
247
250 - Will cook in 'next'.
251 - source: <pull.1414.git.1668098622.gitgitgadget@gmail.com>
248 + Waiting for review discussion to settle.
249 + source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
250
251
254 -* rs/multi-filter-args (2022-11-12) 3 commits
255 - - list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()
256 - - pack-object: simplify --filter handling
257 - - pack-objects: fix handling of multiple --filter options
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
259
259 - Fix a bug where `pack-objects` would not respect multiple `--filter`
260 - arguments when invoked directly.
260 + A synonym for "ls-tree | grep <pattern>", "ls-tree
261 + --pattern=<pattern>" was introduced.
262
262 - Expecting a reroll?
263 - source: <c64e4fa5-62c2-2a93-a4ef-bd84407ea570@web.de>
263 + Waiting for review response, but leaning negative.
264 + source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>
265
266
266 -* vd/skip-cache-tree-update (2022-11-10) 5 commits
267 - (merged to 'next' on 2022-11-14 at 06b2da01ff)
268 - + rebase: use 'skip_cache_tree_update' option
269 - + read-tree: use 'skip_cache_tree_update' option
270 - + reset: use 'skip_cache_tree_update' option
271 - + unpack-trees: add 'skip_cache_tree_update' option
272 - + cache-tree: add perf test comparing update and prime
267 +* tr/am--no-verify (2022-11-18) 1 commit
268 + - am: Allow passing --no-verify flag
269
274 - Avoid calling 'cache_tree_update()' when doing so would be redundant.
270 + Conditionally skip the pre-applypatch and applypatch-msg hooks when
271 + applying patches with 'git am'.
272
276 - Will merge to 'master'.
277 - source: <pull.1411.v3.git.1668107165.gitgitgadget@gmail.com>
273 + Expecting another round.
274 + source: <20221118132743.3525725-1-thierry.reding@gmail.com>
275
276 --------------------------------------------------
277 [Stalled]
@@ -315,7 +312,8 @@ for convenience (replace "htmldocs" with "manpages" for the manual
312
313 Final bits of "git bisect.sh" have been rewritten in C.
314
318 - Needs review.
315 + Temporarily ejected from 'seen'. Waiting for a response on how this
316 + topic interacts with 'dd/git-bisect-builtin'.
317 cf. <xmqqv8pr8903.fsf@gitster.g>
318 source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
319
@@ -331,20 +329,19 @@ for convenience (replace "htmldocs" with "manpages" for the manual
329 source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
330
331
334 -* ed/fsmonitor-inotify (2022-10-14) 7 commits
335 - . fsmonitor: update doc for Linux
336 - . fsmonitor: test updates
337 - . fsmonitor: enable fsmonitor for Linux
338 - . fsmonitor: implement filesystem change listener for Linux
339 - . fsmonitor: determine if filesystem is local or remote
340 - . fsmonitor: prepare to share code between Mac OS and Linux
341 - . Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
332 +* ed/fsmonitor-inotify (2022-11-16) 6 commits
333 + - fsmonitor: update doc for Linux
334 + - fsmonitor: test updates
335 + - fsmonitor: enable fsmonitor for Linux
336 + - fsmonitor: implement filesystem change listener for Linux
337 + - fsmonitor: determine if filesystem is local or remote
338 + - fsmonitor: prepare to share code between Mac OS and Linux
339
340 Bundled fsmonitor for Linux using inotify API.
341
345 - Needs review.
346 - Occasional breakages of t7527.16?
347 - source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
342 + Needs review on the updated round.
343 + Occasional breakages of t7527.16??
344 + source: <pull.1352.v3.git.git.1668641019.gitgitgadget@gmail.com>
345
346
347 * ag/merge-strategies-in-c (2022-08-10) 14 commits
@@ -400,29 +397,172 @@ for convenience (replace "htmldocs" with "manpages" for the manual
397 --------------------------------------------------
398 [Cooking]
399
400 +* ab/remove--super-prefix (2022-11-14) 12 commits
401 + - fetch: rename "--submodule-prefix" to "--super-prefix"
402 + - read-tree: add "--super-prefix" option, eliminate global
403 + - submodule tests: test "git branch -t" output and stderr
404 + - submodule--helper: convert "{update,clone}" to their own "--super-prefix"
405 + - submodule--helper: convert "status" to its own "--super-prefix"
406 + - submodule--helper: convert "sync" to its own "--super-prefix"
407 + - submodule--helper: convert "foreach" to its own "--super-prefix"
408 + - submodule--helper: "deinit" has never used "--super-prefix"
409 + - submodule--helper: don't use global --super-prefix in "absorbgitdirs"
410 + - read-tree + fetch tests: test failing "--super-prefix" interaction
411 + - Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
412 + - Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix
413 + (this branch uses ab/submodule-helper-prep-only and ab/submodule-no-abspath.)
414 +
415 + Remove the top-level `--super-prefix` option.
416 +
417 + Expecting a reroll?
418 + source: <cover-v2-00.10-00000000000-20221114T100803Z-avarab@gmail.com>
419 +
420 +
421 +* ab/submodule-no-abspath (2022-11-09) 1 commit
422 + (merged to 'next' on 2022-11-18 at 34d0accc7b)
423 + + submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
424 + (this branch is used by ab/remove--super-prefix.)
425 +
426 + Remove an absolute path in the "Migrating git directory" message.
427 +
428 + Will merge to 'master'.
429 + source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>
430 +
431 +
432 +* ab/t7610-timeout (2022-11-15) 2 commits
433 + (merged to 'next' on 2022-11-15 at 9dadac032a)
434 + + t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
435 + (merged to 'next' on 2022-11-14 at 82a4abdb1d)
436 + + t7610: fix flaky timeout issue, don't clone from example.com
437 +
438 + Fix a source of flakiness in CI when compiling with SANITIZE=leak.
439 +
440 + Will cook in 'next'.
441 + source: <Y3PrjMLcEGfoHifZ@nand.local>
442 +
443 +
444 +* es/chainlint-lineno (2022-11-11) 4 commits
445 + (merged to 'next' on 2022-11-18 at 20c9692235)
446 + + chainlint: prefix annotated test definition with line numbers
447 + + chainlint: latch line numbers at which each token starts and ends
448 + + chainlint: sidestep impoverished macOS "terminfo"
449 + + Merge branch 'es/chainlint-output' into es/chainlint-lineno
450 + (this branch uses es/chainlint-output.)
451 +
452 + Teach chainlint.pl to show corresponding line numbers when printing
453 + the source of a test.
454 +
455 + Will merge to 'master'.
456 + source: <pull.1413.v2.git.1668152094.gitgitgadget@gmail.com>
457 +
458 +
459 +* ew/format-patch-mboxrd (2022-11-14) 1 commit
460 + - format-patch: add --mboxrd alias for --pretty=mboxrd
461 +
462 + Teach `format-patch` a convenient alias for `--pretty=mboxrd`.
463 +
464 + Waiting for discussion to settle.
465 + source: <20221114094114.18986-1-e@80x24.org>
466 +
467 +
468 +* gc/redact-h2h3-headers (2022-11-14) 2 commits
469 + (merged to 'next' on 2022-11-14 at 34157d24e9)
470 + + http: redact curl h2h3 headers in info
471 + + t: run t5551 tests with both HTTP and HTTP/2
472 +
473 + Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
474 + others.
475 +
476 + Will merge to 'master'.
477 + source: <pull.1377.v3.git.git.1668206106.gitgitgadget@gmail.com>
478 +
479 +
480 +* js/drop-mingw-test-cmp (2022-11-14) 2 commits
481 + - tests(mingw): avoid very slow `mingw_test_cmp`
482 + - t0021: use Windows-friendly `pwd`
483 +
484 + Use `git diff --no-index` as a test_cmp on Windows.
485 +
486 + Waiting for review response.
487 + source: <pull.1309.v4.git.1668434812.gitgitgadget@gmail.com>
488 +
489 +
490 +* mc/switch-advice (2022-11-09) 1 commit
491 + - po: use `switch` over `checkout` in error message
492 +
493 + Use 'switch' instead of 'checkout' in an error message.
494 +
495 + Waiting for review response.
496 + source: <pull.1308.git.git.1668018620148.gitgitgadget@gmail.com>
497 +
498 +
499 +* mh/gitcredentials-generate (2022-11-14) 1 commit
500 + (merged to 'next' on 2022-11-18 at 99f2365d6b)
501 + + Docs: describe how a credential-generating helper works
502 +
503 + Doc update.
504 +
505 + Will cook in 'next'.
506 + source: <pull.1379.git.git.1668217470500.gitgitgadget@gmail.com>
507 +
508 +
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
520 + + sequencer: unify label lookup
521 +
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'.
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
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>
539 +
540 +
541 * ab/various-leak-fixes (2022-11-08) 18 commits
404 - - built-ins: use free() not UNLEAK() if trivial, rm dead code
405 - - revert: fix parse_options_concat() leak
406 - - cherry-pick: free "struct replay_opts" members
407 - - rebase: don't leak on "--abort"
408 - - connected.c: free the "struct packed_git"
409 - - sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
410 - - ls-files: fix a --with-tree memory leak
411 - - revision API: call graph_clear() in release_revisions()
412 - - unpack-file: fix ancient leak in create_temp_file()
413 - - built-ins & libs & helpers: add/move destructors, fix leaks
414 - - dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
415 - - read-cache.c: clear and free "sparse_checkout_patterns"
416 - - commit: discard partial cache before (re-)reading it
417 - - {reset,merge}: call discard_index() before returning
418 - - tests: mark tests as passing with SANITIZE=leak
419 - - Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
420 - - rebase: stop exporting GIT_REFLOG_ACTION
421 - - sequencer: stop exporting GIT_REFLOG_ACTION
542 + (merged to 'next' on 2022-11-18 at 8828bb7161)
543 + + built-ins: use free() not UNLEAK() if trivial, rm dead code
544 + + revert: fix parse_options_concat() leak
545 + + cherry-pick: free "struct replay_opts" members
546 + + rebase: don't leak on "--abort"
547 + + connected.c: free the "struct packed_git"
548 + + sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
549 + + ls-files: fix a --with-tree memory leak
550 + + revision API: call graph_clear() in release_revisions()
551 + + unpack-file: fix ancient leak in create_temp_file()
552 + + built-ins & libs & helpers: add/move destructors, fix leaks
553 + + dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
554 + + read-cache.c: clear and free "sparse_checkout_patterns"
555 + + commit: discard partial cache before (re-)reading it
556 + + {reset,merge}: call discard_index() before returning
557 + + tests: mark tests as passing with SANITIZE=leak
558 + + 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.)
562
563 Various leak fixes.
564
425 - Will merge to 'next'.
565 + Will merge to 'master'.
566 source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
567
568
@@ -451,7 +591,9 @@ for convenience (replace "htmldocs" with "manpages" for the manual
591 source: <cover.1668097286.git.congdanhqx@gmail.com>
592
593
454 -* dd/git-bisect-builtin (2022-11-11) 12 commits
594 +* dd/git-bisect-builtin (2022-11-15) 13 commits
595 + (merged to 'next' on 2022-11-15 at e16e754058)
596 + + bisect; remove unused "git-bisect.sh" and ".gitignore" entry
597 (merged to 'next' on 2022-11-14 at fc304fb52f)
598 + Turn `git bisect` into a full built-in
599 + bisect--helper: log: allow arbitrary number of arguments
@@ -520,7 +662,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
662 Teach chainlint.pl to annotate the original test definition instead
663 of the token stream.
664
523 - Will cook in 'next'.
665 + Will merge to 'master'.
666 source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com>
667
668
@@ -531,7 +673,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
673 'git worktree add' learned how to create a worktree based on an
674 orphaned branch with `--orphan`.
675
534 - Waiting for review discussion to settle, but leaning negative.
676 + Expecting another round?
677 source: <20221110233137.10414-1-jacobabel@nullpo.dev>
678
679
@@ -549,12 +691,13 @@ for convenience (replace "htmldocs" with "manpages" for the manual
691
692
693 * jt/submodule-on-demand (2022-11-14) 1 commit
552 - - Doc: document push.recurseSubmodules=only
694 + (merged to 'next' on 2022-11-18 at a89ee23abb)
695 + + Doc: document push.recurseSubmodules=only
696
697 Push all submodules recursively with
698 '--recurse-submodules=on-demand'.
699
557 - Expecting a reroll?
700 + Will cook in 'next'.
701 source: <20221114213713.2341945-1-jonathantanmy@google.com>
702
703
@@ -562,15 +705,20 @@ for convenience (replace "htmldocs" with "manpages" for the manual
705 (merged to 'next' on 2022-11-14 at 790dadc8d3)
706 + rebase: stop exporting GIT_REFLOG_ACTION
707 + sequencer: stop exporting GIT_REFLOG_ACTION
708 + (this branch is used by ab/merge-index-prep.)
709
710 Avoid setting GIT_REFLOG_ACTION to improve readability of the
711 sequencer internals.
712
569 - Expecting a (final?) reroll.
713 + Will cook in 'next'.
714 source: <31df037eafede799c2ef27df66c6da309b719b1b.1668003719.git.gitgitgadget@gmail.com>
715
716
573 -* rp/maintenance-qol (2022-11-14) 2 commits
717 +* rp/maintenance-qol (2022-11-15) 4 commits
718 + (merged to 'next' on 2022-11-15 at be4379029c)
719 + + builtin/gc.c: fix use-after-free in maintenance_unregister()
720 + (merged to 'next' on 2022-11-15 at 53dc6c8b0d)
721 + + maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
722 (merged to 'next' on 2022-11-14 at 17db40bf26)
723 + maintenance: add option to register in a specific config
724 + for-each-repo: interpolate repo path arguments
@@ -581,27 +729,30 @@ for convenience (replace "htmldocs" with "manpages" for the manual
729
730 Will cook in 'next'.
731 source: <20221109190708.22725-1-ronan@rjp.ie>
732 + source: <patch-1.1-54d405f15f1-20221115T080212Z-avarab@gmail.com>
733
734
735 * sa/cat-file-mailmap--batch-check (2022-11-14) 3 commits
587 - - doc/cat-file: allow --use-mailmap for --batch options
588 - - cat-file: add mailmap support to --batch-check option
589 - - cat-file: add mailmap support to -s option
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
594 - Will merge to 'next'.
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
748 * sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
599 - - fsmonitor--daemon: on macOS support symlink
749 + (merged to 'next' on 2022-11-18 at ad972b3819)
750 + + fsmonitor--daemon: on macOS support symlink
751
752 Fix an issue where core.fsmonitor on macOS would not notice created
753 or modified symbolic links.
754
604 - Waiting for review.
755 + Will merge to 'master'.
756 source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>
757
758
@@ -629,14 +780,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
780 source: <cover.1667980450.git.dyroneteng@gmail.com>
781
782
632 -* vd/update-refs-delete (2022-11-07) 1 commit
633 - (merged to 'next' on 2022-11-08 at 2866156953)
634 - + rebase --update-refs: avoid unintended ref deletion
635 -
636 - Will merge to 'master'.
637 - source: <20221107174752.91186-1-vdye@github.com>
638 -
639 -
783 * ab/submodule-helper-prep-only (2022-11-08) 9 commits
784 (merged to 'next' on 2022-11-08 at c0c4f4d1c3)
785 + submodule--helper: use OPT_SUBCOMMAND() API
@@ -656,11 +799,11 @@ for convenience (replace "htmldocs" with "manpages" for the manual
799 source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
800
801
659 -* ds/bundle-uri-4 (2022-10-31) 9 commits
802 +* ds/bundle-uri-4 (2022-11-16) 9 commits
803 - clone: unbundle the advertised bundles
804 - bundle-uri: download bundles from an advertised list
805 - bundle-uri: allow relative URLs in bundle lists
663 - - strbuf: reintroduce strbuf_parent_directory()
806 + - strbuf: introduce strbuf_strip_file_from_path()
807 - bundle-uri client: add boolean transfer.bundleURI setting
808 - bundle-uri: serve bundle.* keys from config
809 - bundle-uri client: add helper for testing server
@@ -670,7 +813,7 @@ for convenience (replace "htmldocs" with "manpages" for the manual
813 Bundle URIs part 4.
814
815 Waiting for review.
673 - source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
816 + source: <pull.1400.v2.git.1668628302.gitgitgadget@gmail.com>
817
818
819 * sg/plug-line-log-leaks (2022-11-02) 3 commits
@@ -685,12 +828,13 @@ for convenience (replace "htmldocs" with "manpages" for the manual
828
829
830 * tb/howto-maintain-git-fixes (2022-10-31) 2 commits
688 - - Documentation: build redo-seen.sh from jch..seen
689 - - Documentation: build redo-jch.sh from master..jch
831 + (merged to 'next' on 2022-11-18 at e631f9f305)
832 + + Documentation: build redo-seen.sh from jch..seen
833 + + Documentation: build redo-jch.sh from master..jch
834
835 A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
836
693 - Will merge to 'next'.
837 + Will merge to 'master'.
838 source: <cover.1667260044.git.me@ttaylorr.com>
839
840
@@ -742,18 +886,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
886 source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
887
888
745 -* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
746 - (merged to 'next' on 2022-11-03 at 0f01b25561)
747 - + run-command tests: test stdout of run_command_parallel()
748 - + submodule tests: reset "trace.out" between "grep" invocations
749 - + hook tests: fix redirection logic error in 96e7225b310
750 -
751 - Various test updates.
752 -
753 - Will merge to 'master'?
754 - source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
755 -
756 -
889 * kz/merge-tree-merge-base (2022-11-12) 2 commits
890 (merged to 'next' on 2022-11-14 at 76d48ae21f)
891 + merge-tree.c: allow specifying the merge-base when --stdin is passed
@@ -774,14 +906,14 @@ for convenience (replace "htmldocs" with "manpages" for the manual
906 source: <20221112143616.1429-1-philipoakley@iee.email>
907
908
777 -* rr/long-status-advice (2022-11-10) 1 commit
909 +* rr/long-status-advice (2022-11-15) 1 commit
910 - status: long status advice adapted to recent capabilities
911
912 The advice message emitted by a slow "status" run is amended to
913 mention fsmonitor.
914
915 Waiting for reviewer feedback on the updated round.
784 - source: <pull.1384.v5.git.1668110679098.gitgitgadget@gmail.com>
916 + source: <pull.1384.v6.git.1668547188070.gitgitgadget@gmail.com>
917
918
919 * ab/config-multi-and-nonbool (2022-11-02) 9 commits
@@ -802,47 +934,26 @@ for convenience (replace "htmldocs" with "manpages" for the manual
934 source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
935
936
805 -* ab/sha-makefile-doc (2022-11-07) 10 commits
806 - (merged to 'next' on 2022-11-08 at 6d3068d7cd)
807 - + Makefile: discuss SHAttered in *_SHA{1,256} discussion
808 - + Makefile: document default SHA-1 backend on OSX
809 - + Makefile & test-tool: replace "DC_SHA1" variable with a "define"
810 - + Makefile: document SHA-1 and SHA-256 default and selection order
811 - + Makefile: document default SHA-256 backend
812 - + Makefile: rephrase the discussion of *_SHA1 knobs
813 - + Makefile: create and use sections for "define" flag listing
814 - + Makefile: correct DC_SHA1 documentation
815 - + INSTALL: remove discussion of SHA-1 backends
816 - + Makefile: always (re)set DC_SHA1 on fallback
817 -
818 - Makefile comments updates and reordering to clarify knobs used to
819 - choose SHA implementations.
820 -
821 - Will merge to 'master'?
822 - source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com>
937 +* ps/receive-use-only-advertised (2022-11-17) 7 commits
938 + (merged to 'next' on 2022-11-18 at e4a288a7a5)
939 + + receive-pack: only use visible refs for connectivity check
940 + + rev-parse: add `--exclude-hidden=` option
941 + + revision: add new parameter to exclude hidden refs
942 + + revision: introduce struct to handle exclusions
943 + + revision: move together exclusion-related functions
944 + + refs: get rid of global list of hidden refs
945 + + refs: fix memory leak when parsing hideRefs config
946
947 + "git receive-pack" used to use all the local refs as the boundary for
948 + checking connectivity of the data "git push" sent, but now it uses
949 + only the refs that it advertised to the pusher. In a repository with
950 + the .hideRefs configuration, this reduces the resources needed to
951 + perform the check.
952
825 -* ps/receive-use-only-advertised (2022-11-11) 7 commits
826 - - receive-pack: only use visible refs for connectivity check
827 - - rev-parse: add `--exclude-hidden=` option
828 - - revision: add new parameter to exclude hidden refs
829 - - revision: introduce struct to handle exclusions
830 - - revision: move together exclusion-related functions
831 - - refs: get rid of global list of hidden refs
832 - - refs: fix memory leak when parsing hideRefs config
833 -
834 - "git receive-pack" used to use all the local refs as the boundary
835 - for checking connectivity of the data "git push" sent, but now it
836 - uses only the refs that it advertised to the pusher. In a
837 - repository with the .hideRefs configuration, this reduces the
838 - resource needed to perform the check, and also forces the pusher to
839 - prove they have all objects that are necessary to complete the
840 - history on top of only the history available to them.
841 -
842 - Expecting a (final?) reroll.
953 + Will cook in 'next'.
954 cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
955 cf. <xmqqr0yrizqm.fsf@gitster.g>
845 - source: <cover.1668149149.git.ps@pks.im>
956 + source: <cover.1668663795.git.ps@pks.im>
957
958
959 * gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
@@ -874,20 +985,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
985 source: <pull.1389.v2.git.1668003388.gitgitgadget@gmail.com>
986
987
877 -* tb/repack-expire-to (2022-10-24) 4 commits
878 - (merged to 'next' on 2022-11-08 at 496ce3c62d)
879 - + builtin/repack.c: implement `--expire-to` for storing pruned objects
880 - + builtin/repack.c: write cruft packs to arbitrary locations
881 - + builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
882 - + builtin/repack.c: pass "out" to `prepare_pack_objects`
883 -
884 - "git repack" learns to send cruft objects out of the way into
885 - packfiles outside the repository.
886 -
887 - Will merge to 'master'.
888 - source: <cover.1666636974.git.me@ttaylorr.com>
889 -
890 -
988 * cc/filtered-repack (2022-10-25) 2 commits
989 - repack: add --filter=<filter-spec> option
990 - pack-objects: allow --filter without --stdout
@@ -941,16 +1038,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual
1038 source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
1039
1040
944 -* en/sparse-checkout-design (2022-11-07) 1 commit
945 - (merged to 'next' on 2022-11-08 at 42e164b490)
946 - + sparse-checkout.txt: new document with sparse-checkout directions
947 -
948 - Design doc.
949 -
950 - Needs review.
951 - source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
952 -
953 -
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