@matheusbsbs / matheus-bagliano / commits / 6d3ecae174

What's cooking (2023/04 #01)

Junio C Hamano committed Apr 4, 2023 at 16:08 UTC 6d3ecae174559b4decd971d908f2658e9bd90833
1 file changed +420 -345
whats-cooking.txt
+420 -345
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Mar 2023, #06; Wed, 29)
3 -X-master-at: 8d90352acc5c855620042fdcc6092f23a276af6d
4 -X-next-at: 7aeee1b6c6ffd94d2145753860ccc6d375edb1da
2 +Subject: What's cooking in git.git (Apr 2023, #01; Tue, 4)
3 +X-master-at: ae73b2c8f1da39c39335ee76a0f95857712c22a7
4 +X-next-at: 699aa5c54e8a07724f4438867e3ecd26ba51585d
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Mar 2023, #06; Wed, 29)
7 +What's cooking in git.git (Apr 2023, #01; Tue, 4)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -16,10 +16,6 @@ message that raises issues but they are no means exhaustive. A
16 topic without enough support may be discarded after a long period of
17 no activity.
18
19 -The first two batches of topics are in 'master' for the next feature
20 -release, and the tip of 'maint' now points at Git 2.40.0 to start
21 -another maintenance track.
22 -
19 Copies of the source code to Git live in many repositories, and the
20 following is a list of the ones I push into or their mirrors. Some
21 repositories have only a subset of branches.
@@ -51,57 +47,94 @@ Release tarballs are available at:
47 --------------------------------------------------
48 [Graduated to 'master']
49
54 -* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
55 - (merged to 'next' on 2023-03-19 at 35911c8f54)
56 - + completion: prompt: use generic colors
50 +* ab/retire-scripted-add-p (2023-03-27) 1 commit
51 + (merged to 'next' on 2023-03-27 at f8cbc0c604)
52 + + t3701: we don't need no Perl for `add -i` anymore
53 +
54 + Test fix.
55 + source: <pull.1504.git.1679898996492.gitgitgadget@gmail.com>
56 +
57 +
58 +* ah/rebase-merges-config (2023-03-27) 3 commits
59 + (merged to 'next' on 2023-03-27 at c8a894ba4b)
60 + + rebase: add a config option for --rebase-merges
61 + + rebase: deprecate --rebase-merges=""
62 + + rebase: add documentation and test for --no-rebase-merges
63 +
64 + Streamline --rebase-merges command line option handling and
65 + introduce rebase.merges configuration variable.
66 + source: <20230326030636.2635642-1-alexhenrie24@gmail.com>
67 +
68 +
69 +* ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits
70 + (merged to 'next' on 2023-03-28 at ad035b41ea)
71 + + t1507: assert output of rev-parse
72 + + t1404: don't create unused file
73 + + t1400: assert output of update-ref
74 + + t1302: don't create unused file
75 + + t1010: don't create unused files
76 + + t1006: assert error output of cat-file
77 + + t1005: assert output of ls-files
78 +
79 + Test clean-up.
80 + source: <20230312201520.370234-1-rybak.a.v@gmail.com>
81
58 - Lift the limitation that colored prompts can only be used with
59 - PROMPT_COMMAND mode.
60 - source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
82
83 +* bb/unicode-width-table-15 (2023-03-30) 1 commit
84 + (merged to 'next' on 2023-03-31 at b8f3e899ac)
85 + + unicode: update the width tables to Unicode 15
86
63 -* fc/docbook-remove-groff-workaround (2023-03-21) 1 commit
64 - (merged to 'next' on 2023-03-21 at 6c59b16205)
65 - + doc: remove GNU troff workaround
87 + Update width table for the latest edition of Unicode.
88 + source: <20230330191517.1762375-1-dev+git@drbeat.li>
89
67 - Remove workaround for ancient versions of DocBook to make it work
68 - correctly with groff, which has not been necessary since docbook
69 - 1.76 from 2010.
70 - source: <20230320190047.79836-1-felipe.contreras@gmail.com>
90
91 +* ds/p2000-fix-grep-sparse (2023-03-28) 1 commit
92 + (merged to 'next' on 2023-03-29 at 6a59283aa3)
93 + + p2000: remove stray '--sparse' flag from test
94 +
95 + Fix perf test.
96 + source: <pull.1505.git.1680034162144.gitgitgadget@gmail.com>
97
73 -* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
74 - (merged to 'next' on 2023-03-21 at 593883005f)
75 - + object-name: fix quiet @{u} parsing
98
77 - "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
78 - parsed with GET_OID_QUIETLY option, did not quietly fail, which has
79 - been corrected.
80 - source: <20230316171514.23741-1-felipe.contreras@gmail.com>
99 +* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
100 + (merged to 'next' on 2023-03-23 at 01b35c0581)
101 + + am: refer to format-patch in the documentation
102
103 + Doc update.
104 + source: <xmqq1qlij9qr.fsf@gitster.g>
105
83 -* jk/fix-proto-downgrade-to-v0 (2023-03-17) 1 commit
84 - (merged to 'next' on 2023-03-21 at ed9e43d3ed)
85 - + git_connect(): fix corner cases in downgrading v2 to v0
106
87 - Transports that do not support protocol v2 did not correctly fall
88 - back to protocol v0 under certain conditions, which has been
89 - corrected.
90 - source: <ZBS6wwWXcEBwGBm/@coredump.intra.peff.net>
107 +* jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit
108 + (merged to 'next' on 2023-03-27 at 74beb3baf9)
109 + + blame: allow --contents to work with non-HEAD commit
110
111 + "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
112 + but now it finds the origins of lines starting at <file> contents
113 + through the history that leads to <rev>.
114 + source: <20230324170800.331022-1-jacob.e.keller@intel.com>
115
93 -* pe/time-use-gettimeofday (2023-03-21) 1 commit
94 - (merged to 'next' on 2023-03-21 at 456b65b4c2)
95 - + git-compat-util: use gettimeofday(2) for time(2)
116
97 - time(2) on glib 2.31+, especially on Linux, goes out of sync with
98 - higher resolution timers used for gettimeofday(2) and by the
99 - filesystem. Replace all calls to it with a git_time() wrapper and
100 - use gettimeofday(2) in its implementation.
101 - source: <20230320230507.3932018-1-gitster@pobox.com>
117 +* jk/document-rev-list-object-name (2023-03-28) 1 commit
118 + (merged to 'next' on 2023-03-29 at e1cd79f572)
119 + + docs: document caveats of rev-list's object-name output
120 +
121 + Document what the pathname-looking strings in "rev-list --object"
122 + output are for and what they mean.
123 + source: <20230328182650.GC18558@coredump.intra.peff.net>
124 +
125 +
126 +* jk/fast-export-cleanup (2023-03-22) 6 commits
127 + (merged to 'next' on 2023-03-27 at 12b9a9308e)
128 + + fast-export: drop unused parameter from anonymize_commit_message()
129 + + fast-export: drop data parameter from anonymous generators
130 + + fast-export: de-obfuscate --anonymize-map handling
131 + + fast-export: factor out anonymized_entry creation
132 + + fast-export: simplify initialization of anonymized hashmaps
133 + + fast-export: drop const when storing anonymized values
134 +
135 + Code clean-up.
136 + source: <20230322173636.GA5643@coredump.intra.peff.net>
137
103 ---------------------------------------------------
104 -[New Topics]
138
139 * jk/really-deprecate-pack-redundant (2023-03-23) 1 commit
140 (merged to 'next' on 2023-03-29 at 4d1bc9ac42)
@@ -110,55 +143,47 @@ Release tarballs are available at:
143 "git pack-redundant" gave a warning when run, as the command has
144 outlived its usefulness long ago and is nominated for future
145 removal. Now we escalate to give an error.
113 -
114 - Will merge to 'master'.
146 source: <20230323204047.GA9290@coredump.intra.peff.net>
147
148
118 -* mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit
119 - (merged to 'next' on 2023-03-24 at d6c402a77b)
120 - + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
121 -
122 - A recent-ish change to allow unicode character classes to be used
123 - with "grep -P" triggered a JIT bug in older pcre2 libraries.
124 - The problematic change in Git built with these older libraries has
125 - been disabled to work around the bug.
126 -
127 - Will merge to 'master'.
128 - source: <20230323172539.25230-1-minipli@grsecurity.net>
129 -
130 -
131 -* sm/ssl-key-type-config (2023-03-23) 1 commit
132 - - http: add support for different sslcert and sslkey types.
149 +* js/split-index-fixes (2023-03-27) 4 commits
150 + (merged to 'next' on 2023-03-27 at 3a7b7da0d1)
151 + + unpack-trees: take care to propagate the split-index flag
152 + + fsmonitor: avoid overriding `cache_changed` bits
153 + + split-index; stop abusing the `base_oid` to strip the "link" extension
154 + + split-index & fsmonitor: demonstrate a bug
155
134 - Add a few configuration variables to tell the cURL library that
135 - different types of ssl-cert and ssl-key are in use.
156 + The index files can become corrupt under certain conditions when
157 + the split-index feature is in use, especially together with
158 + fsmonitor, which have been corrected.
159 + source: <pull.1497.v2.git.1679870743.gitgitgadget@gmail.com>
160
137 - Will merge to 'next'.
138 - source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com>
161
162 +* js/t5563-portability-fix (2023-03-31) 1 commit
163 + (merged to 'next' on 2023-03-31 at 12f95a9567)
164 + + t5563: prevent "ambiguous redirect"
165
141 -* jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit
142 - (merged to 'next' on 2023-03-27 at 74beb3baf9)
143 - + blame: allow --contents to work with non-HEAD commit
166 + Test portability fix.
167 + source: <pull.1507.git.1680245525637.gitgitgadget@gmail.com>
168
145 - "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
146 - but now it finds the origins of lines starting at <file> contents
147 - through the history that leads to <rev>.
169
149 - Will merge to 'master'.
150 - source: <20230324170800.331022-1-jacob.e.keller@intel.com>
170 +* kh/commentchar-config-error-message (2023-03-27) 1 commit
171 + (merged to 'next' on 2023-03-27 at 7fdda0a984)
172 + + config: tell the user that we expect an ASCII character
173
174 + Doc update.
175 + source: <20230327194344.12910-1-code@khaugsbakk.name>
176
153 -* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
154 - - fsmonitor: handle differences between Windows named pipe functions
177
156 - Fix fsmonitor on Windows when the filesystem path contains certain
157 - characters.
178 +* mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit
179 + (merged to 'next' on 2023-03-24 at d6c402a77b)
180 + + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
181
159 - Expecting a reroll.
160 - cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
161 - source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
182 + A recent-ish change to allow unicode character classes to be used
183 + with "grep -P" triggered a JIT bug in older pcre2 libraries.
184 + The problematic change in Git built with these older libraries has
185 + been disabled to work around the bug.
186 + source: <20230323172539.25230-1-minipli@grsecurity.net>
187
188
189 * ob/rollback-after-commit-lock-failure (2023-03-24) 1 commit
@@ -166,8 +191,6 @@ Release tarballs are available at:
191 + sequencer: remove pointless rollback_lock_file()
192
193 Code clean-up.
169 -
170 - Will merge to 'master'.
194 source: <20230323162235.995529-1-oswald.buddenhagen@gmx.de>
195
196
@@ -176,29 +199,20 @@ Release tarballs are available at:
199 + sequencer: rewrite save_head() in terms of write_message()
200
201 Code clean-up.
179 -
180 - Will merge to 'master'.
202 source: <20230323162235.995544-1-oswald.buddenhagen@gmx.de>
203
204
184 -* ab/retire-scripted-add-p (2023-03-27) 1 commit
185 - (merged to 'next' on 2023-03-27 at f8cbc0c604)
186 - + t3701: we don't need no Perl for `add -i` anymore
187 -
188 - Test fix.
189 -
190 - Will merge to 'master'.
191 - source: <pull.1504.git.1679898996492.gitgitgadget@gmail.com>
192 -
193 -
194 -* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
195 - - commit-graph: fix truncated generation numbers
196 - (this branch uses ds/ahead-behind.)
197 -
198 - Fix unnecessary truncation of generation numbers used in-core.
205 +* pw/wildmatch-fixes (2023-03-27) 4 commits
206 + (merged to 'next' on 2023-03-27 at 40f52ba243)
207 + + t3070: make chain lint tester happy
208 + (merged to 'next' on 2023-03-24 at d0d1f23565)
209 + + wildmatch: hide internal return values
210 + + wildmatch: avoid undefined behavior
211 + + wildmatch: fix exponential behavior
212
200 - Comments?
201 - source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
213 + The wildmatch library code unlearns exponential behaviour it
214 + acquired some time ago since it was borrowed from rsync.
215 + source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
216
217
218 * rs/archive-mtime (2023-03-27) 1 commit
@@ -206,120 +220,163 @@ Release tarballs are available at:
220 + t5000: use check_mtime()
221
222 Test update.
209 -
210 - Will merge to 'master'.
223 source: <233edbbe-35c1-9b5b-7578-4c70c6d24449@web.de>
224
225
214 -* ws/sparse-check-rules (2023-03-27) 2 commits
215 - - builtin/sparse-checkout: add check-rules command
216 - - builtin/sparse-checkout: remove NEED_WORK_TREE flag
226 +* sg/parse-options-h-initializers (2023-03-20) 3 commits
227 + (merged to 'next' on 2023-03-23 at f16b3ab6d7)
228 + + parse-options.h: use designated initializers in OPT_* macros
229 + + parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
230 + + parse-options.h: use consistent name for the callback parameters
231
218 - "git sparse-checkout" command learns a debugging aid for the sparse
219 - rule definitions.
232 + Code clean-up to use designated initializers in parse-options API.
233 + source: <20230319165648.656738-1-szeder.dev@gmail.com>
234
221 - Comments?
222 - source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
235
236 +* sg/parse-options-h-users (2023-03-20) 2 commits
237 + (merged to 'next' on 2023-03-23 at 2ca7d1e737)
238 + + treewide: remove unnecessary inclusions of parse-options.h from headers
239 + + treewide: include parse-options.h in source files
240
225 -* kh/commentchar-config-error-message (2023-03-27) 1 commit
226 - (merged to 'next' on 2023-03-27 at 7fdda0a984)
227 - + config: tell the user that we expect an ASCII character
241 + Code clean-up to include and/or uninclude parse-options.h file as
242 + needed.
243 + source: <20230319162712.654137-1-szeder.dev@gmail.com>
244
229 - Doc update.
245
231 - Will merge to 'master'.
232 - source: <20230327194344.12910-1-code@khaugsbakk.name>
246 +* ss/hashmap-typofix (2023-03-30) 1 commit
247 + (merged to 'next' on 2023-03-30 at ac1e443424)
248 + + hashmap.h: fix minor typo
249
250 + Typofix.
251 + source: <pull.1506.git.1680190083688.gitgitgadget@gmail.com>
252
235 -* mh/credential-password-expiry-wincred (2023-03-27) 1 commit
236 - - credential/wincred: store password_expiry_utc
253 +--------------------------------------------------
254 +[New Topics]
255
238 - Teach the recently invented "password expiry time" trait to the
239 - wincred credential helper.
256 +* ow/ref-filter-omit-empty (2023-03-30) 1 commit
257 + - branch, for-each-ref: add option to omit empty lines
258
241 - Area maintainer is fairly negative. Perhaps drop?
242 - cf. <35e1ebe6-e15b-1712-f030-70ab708740db@gmx.de>
243 - source: <pull.1477.git.git.1679729956620.gitgitgadget@gmail.com>
259 + "git branch --format=..." and "git format-patch --format=..."
260 + learns "--omit-empty-lines" to hide refs that whose formatting
261 + result becomes an empty string from the output.
262
263 + Expecting a reroll. "git tag" should learn the same.
264 + cf. <xmqqilei1bgk.fsf@gitster.g>
265 + source: <20230330112133.4437-3-oystwa@gmail.com>
266
246 -* mh/use-wincred-from-system (2023-03-27) 1 commit
247 - - credential/wincred: include wincred.h
267 +
268 +* ow/ref-format-remove-unused-member (2023-03-30) 1 commit
269 + (merged to 'next' on 2023-03-30 at 898a5df956)
270 + + ref-filter: remove unused ref_format member
271
272 Code clean-up.
273
251 - Area maintainer is fairly negative. Perhaps drop?
252 - cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
253 - source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
274 + Will merge to 'master'.
275 + source: <20230330112133.4437-2-oystwa@gmail.com>
276
277
256 -* ds/p2000-fix-grep-sparse (2023-03-28) 1 commit
257 - (merged to 'next' on 2023-03-29 at 6a59283aa3)
258 - + p2000: remove stray '--sparse' flag from test
278 +* rn/sparse-describe (2023-04-03) 1 commit
279 + - describe: enable sparse index for describe
280
260 - Fix perf test.
281 + "git describe --dirty" learns to work better with sparse-index.
282
262 - Will merge to 'master'.
263 - source: <pull.1505.git.1680034162144.gitgitgadget@gmail.com>
283 + Will merge to 'next'?
284 + source: <20230403164749.246001-1-nanth.raghul@gmail.com>
285
286
266 -* jk/chainlint-fixes (2023-03-28) 4 commits
267 - - tests: skip test_eval_ in internal chain-lint
268 - - tests: drop here-doc check from internal chain-linter
269 - - tests: replace chainlint subshell with a function
270 - - tests: run internal chain-linter under "make test"
287 +* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit
288 + (merged to 'next' on 2023-03-31 at a9f787341d)
289 + + fetch: download bundles once, even with --all
290
272 - Test framework fix.
291 + "git fetch --all" does not have to download and handle the same
292 + bundleURI over and over, which has been corrected.
293
274 - Comments?
275 - source: <20230328202043.GA1241391@coredump.intra.peff.net>
294 + Will merge to 'master'.
295 + source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com>
296
297
278 -* jk/document-pack-redundant-deprecation (2023-03-28) 1 commit
279 - (merged to 'next' on 2023-03-29 at cb64256b97)
280 - + pack-redundant: document deprecation
298 +* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
299 + (merged to 'next' on 2023-04-04 at 48861fc381)
300 + + t2107: fix mention of the_index.cache_changed
301 + + t3060: fix mention of function prune_index
302
282 - Document that we have marked "pack-redundant" as deprecated.
303 + Comment updates.
304
305 Will merge to 'master'.
285 - source: <20230328190641.GF18558@coredump.intra.peff.net>
306 + source: <20230331143604.82040-2-rybak.a.v@gmail.com>
307
308
288 -* jk/document-rev-list-object-name (2023-03-28) 1 commit
289 - (merged to 'next' on 2023-03-29 at e1cd79f572)
290 - + docs: document caveats of rev-list's object-name output
309 +* ah/format-patch-thread-doc (2023-04-03) 1 commit
310 + - format-patch: correct documentation of --thread without an argument
311
292 - Document what the pathname-looking strings in "rev-list --object"
293 - output are for and what they mean.
312 + Doc update.
313
295 - Will merge to 'master'.
296 - source: <20230328182650.GC18558@coredump.intra.peff.net>
314 + source: <20230403040724.642513-1-alexhenrie24@gmail.com>
315
316
299 -* ob/revert-of-revert (2023-03-28) 1 commit
300 - - sequencer: call a revert of a revert "reapply"
317 +* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits
318 + - t2019: don't create unused files
319 + - t1502: don't create unused files
320 + - t1450: don't create unused files
321 + - t1300: don't create unused files
322 + - t1300: fix config file syntax error descriptions
323 + - t0300: don't create unused file
324
302 - Instead of "Revert "Revert "original"", give "Replay "original""
303 - as the title for a revert of a revert.
325 + Test cleanup.
326
305 - Needs more polishing: docs, tests, transitions.
306 - source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
327 + Will merge to 'next'?
328 + source: <20230403223338.468025-1-rybak.a.v@gmail.com>
329 +
330 +
331 +* en/header-split-cache-h (2023-04-04) 25 commits
332 + - mailmap, quote: move declarations of global vars to correct unit
333 + - treewide: reduce includes of cache.h in other headers
334 + - treewide: remove double forward declaration of read_in_full
335 + - strbuf: move forward declarations to beginning of file
336 + - cache.h: remove unnecessary includes
337 + - treewide: remove cache.h inclusion due to pager.h changes
338 + - pager.h: move declarations for pager.c functions from cache.h
339 + - treewide: remove cache.h inclusion due to editor.h changes
340 + - editor: move editor-related functions and declarations into common file
341 + - treewide: remove cache.h inclusion due to object.h changes
342 + - object.h: move some inline functions and defines from cache.h
343 + - treewide: remove cache.h inclusion due to object-file.h changes
344 + - object-file.h: move declarations for object-file.c functions from cache.h
345 + - treewide: remove cache.h inclusion due to git-zlib changes
346 + - git-zlib: move declarations for git-zlib functions from cache.h
347 + - treewide: remove cache.h inclusion due to object-name.h changes
348 + - object-name.h: move declarations for object-name.c functions from cache.h
349 + - treewide: remove unnecessary cache.h inclusion
350 + - treewide: be explicit about dependence on mem-pool.h
351 + - treewide: be explicit about dependence on oid-array.h
352 + - treewide: be explicit about dependence on pack-revindex.h
353 + - treewide: be explicit about dependence on convert.h
354 + - treewide: be explicit about dependence on advice.h
355 + - treewide: be explicit about dependence on trace.h & trace2.h
356 + - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
357 + (this branch uses ab/remove-implicit-use-of-the-repository and en/header-split-cleanup.)
358 +
359 + Header clean-up.
360 +
361 + source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com>
362 +
363 +
364 +* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
365 + - object-info: init request_info before reading arg
366 +
367 + Correct use of an uninitialized structure member.
368
369 + Will merge to 'next'.
370 + source: <20230402130557.17662-1-worldhello.net@gmail.com>
371
309 -* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
310 - (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
311 - + parse-options: drop parse_opt_unknown_cb()
312 - + t/helper: mark unused argv/argc arguments
313 - + mark "argv" as unused when we check argc
314 - + builtins: mark unused prefix parameters
315 - + builtins: annotate always-empty prefix parameters
316 - + builtins: always pass prefix to parse_options()
317 - + fast-import: fix file access when run from subdir
372
319 - Code clean-up for "-Wunused-parameter" build.
373 +* sl/sparse-write-tree (2023-04-04) 1 commit
374 + - write-tree: integrate with sparse index
375
321 - Will merge to 'master'.
322 - source: <20230328205253.GA1753925@coredump.intra.peff.net>
376 + "git write-tree" learns to work better with sparse-index.
377 +
378 + Will merge to 'next'.
379 + source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
380
381 --------------------------------------------------
382 [Stalled]
@@ -361,7 +418,6 @@ Release tarballs are available at:
418 'git notes append' was taught '--separator' to specify string to insert
419 between paragraphs.
420
364 - Expecting further updates on -c/-C.
421 Seems to break CI.
422 cf. <xmqqy1nf8c0f.fsf@gitster.g>
423 source: <cover.1680012650.git.dyroneteng@gmail.com>
@@ -383,12 +439,13 @@ Release tarballs are available at:
439 source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
440
441
386 -* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit
387 - - e-mail workflow: Message-ID is spelled with ID in both capital letters
442 +* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit
443 + (merged to 'next' on 2023-04-04 at 4cfa5997eb)
444 + + e-mail workflow: Message-ID is spelled with ID in both capital letters
445
446 Consistently spell "Message-ID" as such, not "Message-Id".
447
391 - Needs review.
448 + Will merge to 'master'.
449 source: <xmqqsfhgnmqg.fsf@gitster.g>
450
451
@@ -398,7 +455,8 @@ Release tarballs are available at:
455 Allow summary results from tests to be written to t/test-results
456 directory even when a test harness like 'prove' is in use.
457
401 - Needs review.
458 + Expecting a reroll.
459 + cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
460 source: <20221224225200.1027806-1-adam@dinwoodie.org>
461
462
@@ -417,53 +475,129 @@ Release tarballs are available at:
475 --------------------------------------------------
476 [Cooking]
477
420 -* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
421 - - rebase -i: do not update "done" when rescheduling command
478 +* sm/ssl-key-type-config (2023-03-23) 1 commit
479 + (merged to 'next' on 2023-03-30 at 773716fc60)
480 + + http: add support for different sslcert and sslkey types.
481
423 - "rebase -i" moved a "rescheduled" insn in the todo file to the
424 - "done" list before it completed, which has been corrected.
482 + Add a few configuration variables to tell the cURL library that
483 + different types of ssl-cert and ssl-key are in use.
484
426 - Expecting clarification.
427 - source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
485 + Will merge to 'master'.
486 + source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com>
487
488
430 -* pw/wildmatch-fixes (2023-03-27) 4 commits
431 - (merged to 'next' on 2023-03-27 at 40f52ba243)
432 - + t3070: make chain lint tester happy
433 - (merged to 'next' on 2023-03-24 at d0d1f23565)
434 - + wildmatch: hide internal return values
435 - + wildmatch: avoid undefined behavior
436 - + wildmatch: fix exponential behavior
489 +* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
490 + - fsmonitor: handle differences between Windows named pipe functions
491
438 - The wildmatch library code unlearns exponential behaviour it
439 - acquired some time ago since it was borrowed from rsync.
492 + Fix fsmonitor on Windows when the filesystem path contains certain
493 + characters.
494 +
495 + Expecting a reroll.
496 + cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
497 + source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
498 +
499 +
500 +* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
501 + (merged to 'next' on 2023-03-31 at 60bc243011)
502 + + commit-graph: fix truncated generation numbers
503 + (this branch uses ds/ahead-behind.)
504 +
505 + Fix unnecessary truncation of generation numbers used in-core.
506
507 Will merge to 'master'.
442 - source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
508 + source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im>
509
510
445 -* sg/parse-options-h-initializers (2023-03-20) 3 commits
446 - (merged to 'next' on 2023-03-23 at f16b3ab6d7)
447 - + parse-options.h: use designated initializers in OPT_* macros
448 - + parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
449 - + parse-options.h: use consistent name for the callback parameters
511 +* ws/sparse-check-rules (2023-03-27) 2 commits
512 + (merged to 'next' on 2023-04-04 at 17a29244a6)
513 + + builtin/sparse-checkout: add check-rules command
514 + + builtin/sparse-checkout: remove NEED_WORK_TREE flag
515
451 - Code clean-up to use designated initializers in parse-options API.
516 + "git sparse-checkout" command learns a debugging aid for the sparse
517 + rule definitions.
518
519 Will merge to 'master'.
454 - source: <20230319165648.656738-1-szeder.dev@gmail.com>
520 + source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
521
522
457 -* sg/parse-options-h-users (2023-03-20) 2 commits
458 - (merged to 'next' on 2023-03-23 at 2ca7d1e737)
459 - + treewide: remove unnecessary inclusions of parse-options.h from headers
460 - + treewide: include parse-options.h in source files
523 +* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
524 + - credential/wincred: store password_expiry_utc
525
462 - Code clean-up to include and/or uninclude parse-options.h file as
463 - needed.
526 + Teach the recently invented "password expiry time" trait to the
527 + wincred credential helper.
528 +
529 + Will merge to 'next'?
530 + source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
531 +
532 +
533 +* mh/use-wincred-from-system (2023-03-27) 1 commit
534 + - credential/wincred: include wincred.h
535 +
536 + Code clean-up.
537 +
538 + Area maintainer is fairly negative. Perhaps drop?
539 + cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
540 + source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
541 +
542 +
543 +* jk/chainlint-fixes (2023-03-30) 5 commits
544 + (merged to 'next' on 2023-03-30 at 52f229b710)
545 + + tests: skip test_eval_ in internal chain-lint
546 + + tests: drop here-doc check from internal chain-linter
547 + + tests: diagnose unclosed here-doc in chainlint.pl
548 + + tests: replace chainlint subshell with a function
549 + + tests: run internal chain-linter under "make test"
550 +
551 + Test framework fix.
552
553 Will merge to 'master'.
466 - source: <20230319162712.654137-1-szeder.dev@gmail.com>
554 + source: <20230330192712.GA27719@coredump.intra.peff.net>
555 +
556 +
557 +* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit
558 + (merged to 'next' on 2023-03-30 at e9d10e27a4)
559 + + pack-redundant: document deprecation
560 +
561 + Document that we have marked "pack-redundant" as deprecated.
562 +
563 + Will merge to 'master'.
564 + source: <20230328190641.GF18558@coredump.intra.peff.net>
565 +
566 +
567 +* ob/revert-of-revert (2023-03-28) 1 commit
568 + - sequencer: call a revert of a revert "reapply"
569 +
570 + Instead of "Revert "Revert "original"", give "Replay "original""
571 + as the title for a revert of a revert.
572 +
573 + Needs more polishing: docs, tests, transitions.
574 + source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de>
575 +
576 +
577 +* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
578 + (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
579 + + parse-options: drop parse_opt_unknown_cb()
580 + + t/helper: mark unused argv/argc arguments
581 + + mark "argv" as unused when we check argc
582 + + builtins: mark unused prefix parameters
583 + + builtins: annotate always-empty prefix parameters
584 + + builtins: always pass prefix to parse_options()
585 + + fast-import: fix file access when run from subdir
586 +
587 + Code clean-up for "-Wunused-parameter" build.
588 +
589 + Will merge to 'master'.
590 + source: <20230328205253.GA1753925@coredump.intra.peff.net>
591 +
592 +
593 +* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
594 + - rebase -i: do not update "done" when rescheduling command
595 +
596 + "rebase -i" moved a "rescheduled" insn in the todo file to the
597 + "done" list before it completed, which has been corrected.
598 +
599 + Expecting clarification.
600 + source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
601
602
603 * rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
@@ -490,84 +624,30 @@ Release tarballs are available at:
624
625
626 * en/header-split-cleanup (2023-03-21) 16 commits
493 - - csum-file.h: remove unnecessary inclusion of cache.h
494 - - write-or-die.h: move declarations for write-or-die.c functions from cache.h
495 - - treewide: remove cache.h inclusion due to setup.h changes
496 - - setup.h: move declarations for setup.c functions from cache.h
497 - - treewide: remove cache.h inclusion due to environment.h changes
498 - - environment.h: move declarations for environment.c functions from cache.h
499 - - treewide: remove unnecessary includes of cache.h
500 - - wrapper.h: move declarations for wrapper.c functions from cache.h
501 - - path.h: move function declarations for path.c functions from cache.h
502 - - cache.h: remove expand_user_path()
503 - - abspath.h: move absolute path functions from cache.h
504 - - environment: move comment_line_char from cache.h
505 - - treewide: remove unnecessary cache.h inclusion from several sources
506 - - treewide: remove unnecessary inclusion of gettext.h
507 - - treewide: be explicit about dependence on gettext.h
508 - - treewide: remove unnecessary cache.h inclusion from a few headers
627 + (merged to 'next' on 2023-03-30 at b69ff46cad)
628 + + csum-file.h: remove unnecessary inclusion of cache.h
629 + + write-or-die.h: move declarations for write-or-die.c functions from cache.h
630 + + treewide: remove cache.h inclusion due to setup.h changes
631 + + setup.h: move declarations for setup.c functions from cache.h
632 + + treewide: remove cache.h inclusion due to environment.h changes
633 + + environment.h: move declarations for environment.c functions from cache.h
634 + + treewide: remove unnecessary includes of cache.h
635 + + wrapper.h: move declarations for wrapper.c functions from cache.h
636 + + path.h: move function declarations for path.c functions from cache.h
637 + + cache.h: remove expand_user_path()
638 + + abspath.h: move absolute path functions from cache.h
639 + + environment: move comment_line_char from cache.h
640 + + treewide: remove unnecessary cache.h inclusion from several sources
641 + + treewide: remove unnecessary inclusion of gettext.h
642 + + treewide: be explicit about dependence on gettext.h
643 + + treewide: remove unnecessary cache.h inclusion from a few headers
644 + (this branch is used by en/header-split-cache-h.)
645
646 Split key function and data structure definitions out of cache.h to
647 new header files and adjust the users.
648
513 - Needs review.
514 - source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
515 -
516 -
517 -* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
518 - (merged to 'next' on 2023-03-23 at 01b35c0581)
519 - + am: refer to format-patch in the documentation
520 -
521 - Doc update.
522 -
523 - Will merge to 'master'.
524 - source: <xmqq1qlij9qr.fsf@gitster.g>
525 -
526 -
527 -* jk/fast-export-cleanup (2023-03-22) 6 commits
528 - (merged to 'next' on 2023-03-27 at 12b9a9308e)
529 - + fast-export: drop unused parameter from anonymize_commit_message()
530 - + fast-export: drop data parameter from anonymous generators
531 - + fast-export: de-obfuscate --anonymize-map handling
532 - + fast-export: factor out anonymized_entry creation
533 - + fast-export: simplify initialization of anonymized hashmaps
534 - + fast-export: drop const when storing anonymized values
535 -
536 - Code clean-up.
537 -
649 Will merge to 'master'.
539 - source: <20230322173636.GA5643@coredump.intra.peff.net>
540 -
541 -
542 -* js/split-index-fixes (2023-03-27) 4 commits
543 - (merged to 'next' on 2023-03-27 at 3a7b7da0d1)
544 - + unpack-trees: take care to propagate the split-index flag
545 - + fsmonitor: avoid overriding `cache_changed` bits
546 - + split-index; stop abusing the `base_oid` to strip the "link" extension
547 - + split-index & fsmonitor: demonstrate a bug
548 -
549 - The index files can become corrupt under certain conditions when
550 - the split-index feature is in use, especially together with
551 - fsmonitor, which have been corrected.
552 -
553 - Will merge to 'master'.
554 - source: <pull.1497.v2.git.1679870743.gitgitgadget@gmail.com>
555 -
556 -
557 -* ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits
558 - (merged to 'next' on 2023-03-28 at ad035b41ea)
559 - + t1507: assert output of rev-parse
560 - + t1404: don't create unused file
561 - + t1400: assert output of update-ref
562 - + t1302: don't create unused file
563 - + t1010: don't create unused files
564 - + t1006: assert error output of cat-file
565 - + t1005: assert output of ls-files
566 -
567 - Test clean-up.
568 -
569 - Will merge to 'master'.
570 - source: <20230312201520.370234-1-rybak.a.v@gmail.com>
650 + source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
651
652
653 * nw/for-each-ref-signature (2023-03-13) 1 commit
@@ -601,17 +681,18 @@ Release tarballs are available at:
681
682
683 * ps/fetch-ref-update-reporting (2023-03-20) 6 commits
604 - - fetch: centralize printing of reference updates
605 - - fetch: centralize logic to print remote URL
606 - - fetch: centralize handling of per-reference format
607 - - fetch: pass the full local reference name to `format_display`
608 - - fetch: move output format into `display_state`
609 - - fetch: move reference width calculation into `display_state`
684 + (merged to 'next' on 2023-03-30 at e5df1cae0b)
685 + + fetch: centralize printing of reference updates
686 + + fetch: centralize logic to print remote URL
687 + + fetch: centralize handling of per-reference format
688 + + fetch: pass the full local reference name to `format_display`
689 + + fetch: move output format into `display_state`
690 + + fetch: move reference width calculation into `display_state`
691
692 Clean-up of the code path that reports what "git fetch" did to each
693 ref.
694
614 - Will merge to 'next'?
695 + Will merge to 'master'.
696 source: <cover.1679315383.git.ps@pks.im>
697
698
@@ -630,39 +711,42 @@ Release tarballs are available at:
711
712
713 * ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits
633 - - libs: use "struct repository *" argument, not "the_repository"
634 - - post-cocci: adjust comments for recent repo_* migration
635 - - cocci: apply the "revision.h" part of "the_repository.pending"
636 - - cocci: apply the "rerere.h" part of "the_repository.pending"
637 - - cocci: apply the "refs.h" part of "the_repository.pending"
638 - - cocci: apply the "promisor-remote.h" part of "the_repository.pending"
639 - - cocci: apply the "packfile.h" part of "the_repository.pending"
640 - - cocci: apply the "pretty.h" part of "the_repository.pending"
641 - - cocci: apply the "object-store.h" part of "the_repository.pending"
642 - - cocci: apply the "diff.h" part of "the_repository.pending"
643 - - cocci: apply the "commit.h" part of "the_repository.pending"
644 - - cocci: apply the "commit-reach.h" part of "the_repository.pending"
645 - - cocci: apply the "cache.h" part of "the_repository.pending"
646 - - cocci: add missing "the_repository" macros to "pending"
647 - - cocci: sort "the_repository" rules by header
648 - - cocci: fix incorrect & verbose "the_repository" rules
649 - - cocci: remove dead rule from "the_repository.pending.cocci"
714 + (merged to 'next' on 2023-03-30 at e0abe2d872)
715 + + libs: use "struct repository *" argument, not "the_repository"
716 + + post-cocci: adjust comments for recent repo_* migration
717 + + cocci: apply the "revision.h" part of "the_repository.pending"
718 + + cocci: apply the "rerere.h" part of "the_repository.pending"
719 + + cocci: apply the "refs.h" part of "the_repository.pending"
720 + + cocci: apply the "promisor-remote.h" part of "the_repository.pending"
721 + + cocci: apply the "packfile.h" part of "the_repository.pending"
722 + + cocci: apply the "pretty.h" part of "the_repository.pending"
723 + + cocci: apply the "object-store.h" part of "the_repository.pending"
724 + + cocci: apply the "diff.h" part of "the_repository.pending"
725 + + cocci: apply the "commit.h" part of "the_repository.pending"
726 + + cocci: apply the "commit-reach.h" part of "the_repository.pending"
727 + + cocci: apply the "cache.h" part of "the_repository.pending"
728 + + cocci: add missing "the_repository" macros to "pending"
729 + + cocci: sort "the_repository" rules by header
730 + + cocci: fix incorrect & verbose "the_repository" rules
731 + + cocci: remove dead rule from "the_repository.pending.cocci"
732 + (this branch is used by en/header-split-cache-h.)
733
734 Code clean-up around the use of the_repository.
735
653 - Will merge to 'next'.
736 + Will merge to 'master'.
737 source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com>
738
739
740 * jk/unused-post-2.40 (2023-03-17) 4 commits
658 - - transport: mark unused parameters in fetch_refs_from_bundle()
659 - - http: mark unused parameter in fill_active_slot() callbacks
660 - - http: drop unused parameter from start_object_request()
661 - - mailmap: drop debugging code
741 + (merged to 'next' on 2023-03-30 at 10aeb0d4ae)
742 + + transport: mark unused parameters in fetch_refs_from_bundle()
743 + + http: mark unused parameter in fill_active_slot() callbacks
744 + + http: drop unused parameter from start_object_request()
745 + + mailmap: drop debugging code
746
747 More "-Wunused-parameters" code clean-up.
748
665 - Will merge to 'next'.
749 + Will merge to 'master'.
750 source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
751
752
@@ -693,23 +777,24 @@ Release tarballs are available at:
777 distances from a single reference point in the history with bunch
778 of commits in bulk.
779
696 - Will merge to 'master' after ps/ahead-behind-truncation-fix is acked.
780 + Will merge to 'master' together with ps/ahead-behind-truncation-fix topic.
781 source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
782
783
784 * gc/config-parsing-cleanup (2023-03-28) 8 commits
701 - - config.c: rename "struct config_source cf"
702 - - config: report cached filenames in die_bad_number()
703 - - config.c: remove current_parsing_scope
704 - - config.c: remove current_config_kvi
705 - - config.c: plumb the_reader through callbacks
706 - - config.c: create config_reader and the_reader
707 - - config.c: don't assign to "cf_global" directly
708 - - config.c: plumb config_source through static fns
785 + (merged to 'next' on 2023-03-30 at e7ea626edf)
786 + + config.c: rename "struct config_source cf"
787 + + config: report cached filenames in die_bad_number()
788 + + config.c: remove current_parsing_scope
789 + + config.c: remove current_config_kvi
790 + + config.c: plumb the_reader through callbacks
791 + + config.c: create config_reader and the_reader
792 + + config.c: don't assign to "cf_global" directly
793 + + config.c: plumb config_source through static fns
794
795 Config API clean-up to reduce its dependence on static variables
796
712 - Will merge to 'next'.
797 + Will merge to 'master'.
798 source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com>
799
800
@@ -741,19 +826,6 @@ Release tarballs are available at:
826 source: <20230228185253.2356546-1-calvinwan@google.com>
827
828
744 -* ah/rebase-merges-config (2023-03-27) 3 commits
745 - (merged to 'next' on 2023-03-27 at c8a894ba4b)
746 - + rebase: add a config option for --rebase-merges
747 - + rebase: deprecate --rebase-merges=""
748 - + rebase: add documentation and test for --no-rebase-merges
749 -
750 - Streamline --rebase-merges command line option handling and
751 - introduce rebase.merges configuration variable.
752 -
753 - Will merge to 'master'.
754 - source: <20230326030636.2635642-1-alexhenrie24@gmail.com>
755 -
756 -
829 * tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
830 - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
831
@@ -800,19 +872,20 @@ Release tarballs are available at:
872
873
874 * ab/config-multi-and-nonbool (2023-03-28) 9 commits
803 - - for-each-repo: with bad config, don't conflate <path> and <cmd>
804 - - config API: add "string" version of *_value_multi(), fix segfaults
805 - - config API users: test for *_get_value_multi() segfaults
806 - - for-each-repo: error on bad --config
807 - - config API: have *_multi() return an "int" and take a "dest"
808 - - versioncmp.c: refactor config reading next commit
809 - - config API: add and use a "git_config_get()" family of functions
810 - - config tests: add "NULL" tests for *_get_value_multi()
811 - - config tests: cover blind spots in git_die_config() tests
875 + (merged to 'next' on 2023-03-30 at bcfe99b43d)
876 + + for-each-repo: with bad config, don't conflate <path> and <cmd>
877 + + config API: add "string" version of *_value_multi(), fix segfaults
878 + + config API users: test for *_get_value_multi() segfaults
879 + + for-each-repo: error on bad --config
880 + + config API: have *_multi() return an "int" and take a "dest"
881 + + versioncmp.c: refactor config reading next commit
882 + + config API: add and use a "git_config_get()" family of functions
883 + + config tests: add "NULL" tests for *_get_value_multi()
884 + + config tests: cover blind spots in git_die_config() tests
885
886 Assorted config API updates.
887
815 - Will merge to 'next'.
888 + Will merge to 'master'.
889 source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com>
890
891
@@ -864,5 +937,7 @@ Release tarballs are available at:
937 "git submodule status" learned to run the comparison in submodule
938 repositories in parallel.
939
867 - Comments?
940 + Expecting a reroll.
941 + cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
942 + cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
943 source: <20230302215237.1473444-1-calvinwan@google.com>