What's cooking (2024/04 #06)

Junio C Hamano committed Apr 17, 2024 at 15:18 UTC e6a0fc2e0e42fbd62a5f55db9178940c19c4efac
1 file changed +343 -353
whats-cooking.txt
+343 -353
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Apr 2024, #05; Fri, 12)
3 -X-master-at: 8f7582d995682f785e80e344197cc715e6bc7d8e
4 -X-next-at: 346d391aac0a243ed73bad8a0e30123f5381affe
2 +Subject: What's cooking in git.git (Apr 2024, #06; Wed, 17)
3 +X-master-at: 21306a098c3f174ad4c2a5cddb9069ee27a548b0
4 +X-next-at: 701ccded8beffcdb6ef223edea31263683e5129b
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Apr 2024, #05; Fri, 12)
7 +What's cooking in git.git (Apr 2024, #06; Wed, 17)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -48,257 +48,393 @@ Release tarballs are available at:
48 --------------------------------------------------
49 [Graduated to 'master']
50
51 -* ds/typofix-core-config-doc (2024-03-31) 1 commit
52 - (merged to 'next' on 2024-04-02 at 79496fcfc4)
53 - + config: fix some small capitalization issues, as spotted
51 +* ba/osxkeychain-updates (2024-04-01) 4 commits
52 + (merged to 'next' on 2024-04-10 at 1e7d925a43)
53 + + osxkeychain: store new attributes
54 + + osxkeychain: erase matching passwords only
55 + + osxkeychain: erase all matching credentials
56 + + osxkeychain: replace deprecated SecKeychain API
57 +
58 + Update osxkeychain backend with features required for the recent
59 + credential subsystem.
60 + source: <pull.1667.git.1708212896.gitgitgadget@gmail.com>
61 +
62
55 - Typofix.
56 - source: <26135b06c48565ee8ac6dcfc1ef5431511e6202c.1711918168.git.dsimic@manjaro.org>
63 +* ds/fetch-config-parse-microfix (2024-04-05) 1 commit
64 + (merged to 'next' on 2024-04-09 at 585dcadd63)
65 + + fetch: return when parsing submodule.recurse
66
67 + A config parser callback function fell through instead of returning
68 + after recognising and processing a variable, wasting cycles, which
69 + has been corrected.
70 + source: <pull.1709.git.1712285542303.gitgitgadget@gmail.com>
71
59 -* jc/checkout-detach-wo-tracking-report (2024-03-30) 1 commit
60 - (merged to 'next' on 2024-04-04 at 161eca247d)
61 - + checkout: omit "tracking" information on a detached HEAD
72
63 - "git checkout/switch --detach foo", after switching to the detached
64 - HEAD state, gave the tracking information for the 'foo' branch,
65 - which was pointless.
73 +* gt/add-u-commit-i-pathspec-check (2024-04-03) 3 commits
74 + (merged to 'next' on 2024-04-09 at 1a0c757907)
75 + + builtin/add: error out when passing untracked path with -u
76 + + builtin/commit: error out when passing untracked path with -i
77 + + revision: optionally record matches with pathspec elements
78
67 - Tested-by: M Hickford <mirth.hickford@gmail.com>
68 - cf. <CAGJzqsmE9FDEBn=u3ge4LA3ha4fDbm4OWiuUbMaztwjELBd7ug@mail.gmail.com>
69 - source: <xmqqa5mfl7ud.fsf@gitster.g>
79 + "git add -u <pathspec>" and "git commit [-i] <pathspec>" did not
80 + diagnose a pathspec element that did not match any files in certain
81 + situations, unlike "git add <pathspec>" did.
82 + source: <20240402213640.139682-2-shyamthakkar001@gmail.com>
83
84
72 -* jc/t2104-style-update (2024-04-02) 1 commit
73 - (merged to 'next' on 2024-04-03 at 0449835479)
85 +* jc/local-extern-shell-rules (2024-04-05) 8 commits
86 + (merged to 'next' on 2024-04-10 at d3a13273e7)
87 + + t1016: local VAR="VAL" fix
88 + + t0610: local VAR="VAL" fix
89 + + t: teach lint that RHS of 'local VAR=VAL' needs to be quoted
90 + + t: local VAR="VAL" (quote ${magic-reference})
91 + + t: local VAR="VAL" (quote command substitution)
92 + + t: local VAR="VAL" (quote positional parameters)
93 + + CodingGuidelines: quote assigned value in 'local var=$val'
94 + + CodingGuidelines: describe "export VAR=VAL" rule
95 +
96 + Document and apply workaround for a buggy version of dash that
97 + mishandles "local var=val" construct.
98 + source: <20240406000902.3082301-1-gitster@pobox.com>
99 +
100 +
101 +* jc/t2104-style-fixes (2024-04-09) 1 commit
102 + (merged to 'next' on 2024-04-11 at 7678ec509b)
103 + t2104: style fixes
104
76 - Coding style fixes.
105 + Test style fixes.
106 source: <xmqqmsqb4ngg.fsf@gitster.g>
107
108
80 -* js/merge-tree-3-trees (2024-04-12) 1 commit
81 - (merged to 'next' on 2024-04-12 at d4235d1f47)
82 - + merge-tree: fix argument type of the `--merge-base` option
109 +* jc/unleak-core-excludesfile (2024-04-08) 1 commit
110 + (merged to 'next' on 2024-04-10 at ffb0c01871)
111 + + config: do not leak excludes_file
112
84 - Match the option argument type in the help text to the correct type
85 - updated by a recent series.
86 - source: <pull.1717.git.1712923841235.gitgitgadget@gmail.com>
113 + The variable that holds the value read from the core.excludefile
114 + configuration variable used to leak, which has been corrected.
115 + source: <xmqqttkeicov.fsf@gitster.g>
116
117
89 -* kn/clarify-update-ref-doc (2024-04-02) 2 commits
90 - (merged to 'next' on 2024-04-02 at d1b9c5aa67)
91 - + githooks: use {old,new}-oid instead of {old,new}-value
92 - + update-ref: use {old,new}-oid instead of {old,new}value
118 +* jk/libcurl-8.7-regression-workaround (2024-04-05) 3 commits
119 + (merged to 'next' on 2024-04-10 at 3b76577bfc)
120 + + remote-curl: add Transfer-Encoding header only for older curl
121 + + INSTALL: bump libcurl version to 7.21.3
122 + + http: reset POSTFIELDSIZE when clearing curl handle
123 +
124 + Fix was added to work around a regression in libcURL 8.7.0 (which has
125 + already been fixed in their tip of the tree).
126 + source: <20240402200254.GA874754@coredump.intra.peff.net>
127 +
128 +
129 +* jt/reftable-geometric-compaction (2024-04-08) 4 commits
130 + (merged to 'next' on 2024-04-10 at 7e868a831c)
131 + + reftable/stack: use geometric table compaction
132 + + reftable/stack: add env to disable autocompaction
133 + + reftable/stack: expose option to disable auto-compaction
134 + + Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction
135 +
136 + The strategy to compact multiple tables of reftables after many
137 + operations accumulate many entries has been improved to avoid
138 + accumulating too many tables uncollected.
139 + source: <pull.1683.v6.git.1712593016.gitgitgadget@gmail.com>
140 +
141 +
142 +* ma/win32-unix-domain-socket (2024-04-03) 1 commit
143 + (merged to 'next' on 2024-04-09 at b98021a65c)
144 + + Win32: detect unix socket support at runtime
145 +
146 + Windows binary used to decide the use of unix-domain socket at
147 + build time, but it learned to make the decision at runtime instead.
148 + source: <pull.1708.git.1712158923106.gitgitgadget@gmail.com>
149 +
150 +
151 +* ps/t0610-umask-fix (2024-04-09) 2 commits
152 + (merged to 'next' on 2024-04-10 at 659a29b138)
153 + + t0610: execute git-pack-refs(1) with specified umask
154 + + t0610: make `--shared=` tests reusable
155 +
156 + The "shared repository" test in the t0610 reftable test failed
157 + under restrictive umask setting (e.g. 007), which has been
158 + corrected.
159 + source: <cover.1712656576.git.ps@pks.im>
160 +
161 +
162 +* pw/t3428-cleanup (2024-04-09) 3 commits
163 + (merged to 'next' on 2024-04-11 at 3c40516874)
164 + + t3428: restore coverage for "apply" backend
165 + + t3428: use test_commit_message
166 + + t3428: modernize test setup
167 +
168 + Test cleanup.
169 + source: <pull.1713.git.1712676444.gitgitgadget@gmail.com>
170 +
171 +
172 +* rs/apply-lift-path-length-limit (2024-04-05) 2 commits
173 + (merged to 'next' on 2024-04-09 at 3270d194fd)
174 + + path: remove mksnpath()
175 + + apply: avoid fixed-size buffer in create_one_file()
176 +
177 + "git apply" has been updated to lift the hardcoded pathname length
178 + limit, which in turn allowed a mksnpath() function that is no
179 + longer used.
180 + source: <df774306-f29b-4a75-a282-59db89812b9a@web.de>
181
94 - Doc update, as a preparation to enhance "git update-ref --stdin".
95 - source: <20240402064915.191104-1-knayak@gitlab.com>
182
183 +* rs/apply-reject-fd-leakfix (2024-04-05) 1 commit
184 + (merged to 'next' on 2024-04-09 at 11efa0543c)
185 + + apply: don't leak fd on fdopen() error
186
98 -* ps/reftable-binsearch-updates (2024-04-03) 7 commits
99 - (merged to 'next' on 2024-04-04 at 40e6d5a36b)
100 - + reftable/block: avoid decoding keys when searching restart points
101 - + reftable/record: extract function to decode key lengths
102 - + reftable/block: fix error handling when searching restart points
103 - + reftable/block: refactor binary search over restart points
104 - + reftable/refname: refactor binary search over refnames
105 - + reftable/basics: improve `binsearch()` test
106 - + reftable/basics: fix return type of `binsearch()` to be `size_t`
187 + A file descriptor leak in an error codepath, used when "git apply
188 + --reject" fails to create the *.rej file, has been corrected.
189 + source: <5ba55ee4-94c7-4094-a744-584fc623b391@web.de>
190
108 - Reftable code clean-up and some bugfixes.
109 - source: <cover.1712123093.git.ps@pks.im>
191
192 +* rs/date-mode-pass-by-value (2024-04-05) 1 commit
193 + (merged to 'next' on 2024-04-10 at cc3c17d31c)
194 + + date: make DATE_MODE thread-safe
195
112 -* rs/imap-send-use-xsnprintf (2024-04-02) 1 commit
113 - (merged to 'next' on 2024-04-04 at 789ad853e1)
114 - + imap-send: use xsnprintf to format command
196 + The codepaths that reach date_mode_from_type() have been updated to
197 + pass "struct date_mode" by value to make them thread safe.
198 + source: <c6cb255a-72f0-4ac2-81a2-1d8e95570a81@web.de>
199
116 - Code clean-up and duplicate reduction.
117 - source: <f9ad9f41-5b9b-474e-9818-f91fc937daae@web.de>
200
201 +* rs/usage-fallback-to-show-message-format (2024-04-05) 1 commit
202 + (merged to 'next' on 2024-04-10 at 9a34aed4d5)
203 + + usage: report vsnprintf(3) failure
204
120 -* rs/mem-pool-size-t-safety (2024-03-31) 1 commit
121 - (merged to 'next' on 2024-04-02 at 3517d48210)
122 - + mem-pool: use st_add() in mem_pool_strvfmt()
205 + vreportf(), which is usede by error() and friends, has been taught
206 + to give the error message printf-format string when its vsnprintf()
207 + call fails, instead of showing nothing useful to identify the
208 + nature of the error.
209 + source: <3da13298-b6a6-4391-b8e8-5dae9a28b860@web.de>
210
124 - size_t arithmetic safety.
125 - source: <bbe00b9e-64d8-4ec8-a2b9-2c6917c72dbd@web.de>
211
212 +* sj/userdiff-c-sharp (2024-04-05) 1 commit
213 + (merged to 'next' on 2024-04-10 at 56aaf254a7)
214 + + userdiff: better method/property matching for C#
215
128 -* rs/t-prio-queue-cleanup (2024-04-02) 1 commit
129 - (merged to 'next' on 2024-04-04 at 7961c838ac)
130 - + t-prio-queue: simplify using compound literals
216 + The userdiff patterns for C# has been updated.
217
132 - t-prio-queue test has been cleaned up by using C99 compound
133 - literals; this is meant to also serve as a weather-balloon to smoke
134 - out folks with compilers who have trouble compiling code that uses
135 - the feature.
136 - source: <520da361-1b80-4ba3-87b2-86d6fdfc18b5@web.de>
218 + Acked-by: Johannes Sixt <j6t@kdbg.org>
219 + cf. <c2154457-3f2f-496e-9b8b-c8ea7257027b@kdbg.org>
220 + source: <pull.1682.v5.git.git.1712180564927.gitgitgadget@gmail.com>
221
222
139 -* tb/midx-write (2024-04-01) 5 commits
140 - (merged to 'next' on 2024-04-05 at b4870116f7)
141 - + midx-write.c: use `--stdin-packs` when repacking
142 - + midx-write.c: check count of packs to repack after grouping
143 - + midx-write.c: factor out common want_included_pack() routine
144 - + midx-write: move writing-related functions from midx.c
145 - + Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-write
223 +* tb/make-indent-conditional-with-non-spaces (2024-04-08) 2 commits
224 + (merged to 'next' on 2024-04-10 at 98aa239dc3)
225 + + Makefile(s): do not enforce "all indents must be done with tab"
226 + + Makefile(s): avoid recipe prefix in conditional statements
227
147 - Code clean-up by splitting code responsible for writing midx files
148 - into its own file.
149 - source: <cover.1712006190.git.me@ttaylorr.com>
228 + Adjust to an upcoming changes to GNU make that breaks our Makefiles.
229 + source: <9d14c08ca6cc06cdf8fb4ba33d2470053dca3966.1712591504.git.me@ttaylorr.com>
230
231
152 -* vs/complete-with-set-u-fix (2024-04-01) 2 commits
153 - (merged to 'next' on 2024-04-02 at d8f6a511e8)
154 - + completion: protect prompt against unset SHOWUPSTREAM in nounset mode
155 - + completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode
232 +* tb/t7700-fixup (2024-04-03) 1 commit
233 + (merged to 'next' on 2024-04-10 at ff1f877ef7)
234 + + t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
235
157 - Another "set -u" fix for the bash prompt (in contrib/) script.
158 - source: <20240401190751.8676-1-ville.skytta@iki.fi>
236 + Test fix.
237 + source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
238
239 --------------------------------------------------
240 [New Topics]
241
163 -* dd/t9604-use-posix-timezones (2024-04-10) 1 commit
164 - - t9604: Fix test for musl libc and new Debian
242 +* mr/rerere-crash-fix (2024-04-16) 1 commit
243 + (merged to 'next' on 2024-04-17 at 60be8e2d74)
244 + + rerere: fix crashes due to unmatched opening conflict markers
245
166 - The cvsimport tests required that the platform understands
167 - traditional timezone notations like CST6CDT, which has been
168 - updated to work on those systems as long as they understand
169 - POSIX notation with explicit tz transition dates.
246 + When .git/rr-cache/ rerere database gets corrupted or rerere is fed to
247 + work on a file with conflicted hunks resolved incompletely, the rerere
248 + machinery got confused and segfaulted, which has been corrected.
249 +
250 + Will merge to 'master'.
251 + source: <20240416105320.1113401-1-marcel@roethke.info>
252 +
253 +
254 +* pk/bisect-use-show (2024-04-15) 1 commit
255 + - bisect: report the found commit with "show"
256 +
257 + When "git bisect" reports the commit it determined to be the
258 + culprit, we used to show it in a format that does not honor common
259 + UI tweaks, like log.date and log.decorate. The code has been
260 + taught to use "git show" to follow more customizations.
261
262 Will merge to 'next'.
172 - source: <20240410032812.30476-1-congdanhqx@gmail.com>
263 + source: <965ae345-fd58-c46c-5a7a-de181e901f21@softwolves.pp.se>
264
265
175 -* jc/t2104-style-fixes (2024-04-09) 1 commit
176 - (merged to 'next' on 2024-04-11 at 7678ec509b)
177 - + t2104: style fixes
266 +* ps/missing-btmp-fix (2024-04-15) 1 commit
267 + (merged to 'next' on 2024-04-16 at c70779ba4b)
268 + + pack-bitmap: gracefully handle missing BTMP chunks
269
179 - Test style fixes.
270 + GIt 2.44 introduced a regression that makes the updated code to
271 + barf in repositories with multi-pack index written by older
272 + versions of Git, which has been corrected.
273
274 Will merge to 'master'.
182 - source: <xmqqmsqb4ngg.fsf@gitster.g>
275 + source: <a8251f8278ba9a3b41a8e299cb4918a62df6d1c7.1713163238.git.ps@pks.im>
276
277
185 -* kn/update-ref-symrefs (2024-04-12) 8 commits
186 - - SQUASH???
187 - - refs: support symrefs in 'reference-transaction' hook
188 - - update-ref: add support for symref-update
189 - - update-ref: add support for symref-create
190 - - files-backend: extract out `create_symref_lock`
191 - - update-ref: add support for symref-delete
192 - - update-ref: add support for symref-verify
193 - - refs: accept symref values in `ref_transaction[_add]_update`
278 +* rj/launch-editor-error-message (2024-04-15) 1 commit
279 + (merged to 'next' on 2024-04-16 at 3d0dd46fc2)
280 + + launch_editor: waiting message on error
281
195 - source: <20240412095908.1134387-1-knayak@gitlab.com>
282 + Git writes a "waiting for your editor" message on an incomplete
283 + line after launching an editor, and then append another error
284 + message on the same line if the editor errors out. It now clears
285 + the "waiting for..." line before giving the error message.
286
287 + Will merge to 'master'.
288 + source: <e208da74-8f16-44ae-912e-ae968da82057@gmail.com>
289
198 -* pf/commitish-committish (2024-04-11) 1 commit
199 - (merged to 'next' on 2024-04-12 at 7ef816cb64)
200 - + typo: replace 'commitish' with 'committish'
290
202 - Spellfix.
291 +* rs/imap-send-simplify-cmd-issuing-codepath (2024-04-15) 1 commit
292 + (merged to 'next' on 2024-04-17 at 0255e49f8b)
293 + + imap-send: increase command size limit
294 +
295 + Code simplification.
296
297 Will merge to 'master'.
205 - source: <20240407212111.55362-1-Pi.L.D.Fisher@gmail.com>
298 + source: <7026075c-db4e-4d43-bbd1-d2edb52da9b7@web.de>
299
300
208 -* pw/t3428-cleanup (2024-04-09) 3 commits
209 - (merged to 'next' on 2024-04-11 at 3c40516874)
210 - + t3428: restore coverage for "apply" backend
211 - + t3428: use test_commit_message
212 - + t3428: modernize test setup
301 +* rs/no-openssl-compilation-fix-on-macos (2024-04-15) 1 commit
302 + (merged to 'next' on 2024-04-15 at 48cab93d0a)
303 + + git-compat-util: fix NO_OPENSSL on current macOS
304
214 - Test cleanup.
305 + Build fix.
306
307 Will merge to 'master'.
217 - source: <pull.1713.git.1712676444.gitgitgadget@gmail.com>
308 + source: <3188f4e2-9744-40b1-8f05-0896b8679d25@web.de>
309
310
220 -* ta/fast-import-parse-path-fix (2024-04-12) 8 commits
221 - - fast-import: make comments more precise
222 - - fast-import: forbid escaped NUL in paths
223 - - fast-import: document C-style escapes for paths
224 - - fast-import: improve documentation for path quoting
225 - - fast-import: remove dead strbuf
226 - - fast-import: allow unquoted empty path for root
227 - - fast-import: directly use strbufs for paths
228 - - fast-import: tighten path unquoting
311 +* yb/replay-doc-linkfix (2024-04-15) 1 commit
312 + (merged to 'next' on 2024-04-15 at e8cf9cd9a8)
313 + + Documentation: fix linkgit reference
314
230 - The way "git fast-import" handles paths described in its input has
231 - been tightened up and more clearly documented.
315 + Docfix.
316
233 - Will merge to 'next'?
234 - source: <cover.1712907684.git.thalia@archibald.dev>
317 + Will merge to 'master'.
318 + source: <pull.1706.git.git.1713132482976.gitgitgadget@gmail.com>
319
320
237 -* xx/rfc2822-date-format-in-doc (2024-04-12) 1 commit
238 - - Documentation: fix typos describing date format
321 +* rs/apply-reject-long-name (2024-04-16) 1 commit
322 + (merged to 'next' on 2024-04-17 at 701ccded8b)
323 + + apply: avoid using fixed-size buffer in write_out_one_reject()
324
240 - Docfix.
325 + The filename used for rejected hunks "git apply --reject" creates
326 + was limited to PATH_MAX, which has been lifted.
327
242 - Will merge to 'next'?
243 - source: <pull.1716.git.1712911876943.gitgitgadget@gmail.com>
328 + Will merge to 'master'.
329 + source: <a93cd243-cb17-4ad5-8d23-30768dc5213b@web.de>
330 +
331 +
332 +* js/for-each-repo-keep-going (2024-04-17) 2 commits
333 + - maintenance: running maintenance should not stop on errors
334 + - for-each-repo: optionally keep going on an error
335 +
336 + A scheduled "git maintenance" job is expected to work on all
337 + repositories it knows about, but it stopped at the first one that
338 + errored out. Now it keeps going.
339 +
340 + Expecting a (hopefully minor and final) reroll.
341 + cf. <CAPig+cSjoGe7Eeynz=jGSaNYWXQ-VkvWv7mv1NDeCXPFEtdqOA@mail.gmail.com>
342 + source: <pull.1719.git.1713342535.gitgitgadget@gmail.com>
343 +
344 +
345 +* ps/run-auto-maintenance-in-receive-pack (2024-04-17) 2 commits
346 + - builtin/receive-pack: convert to use git-maintenance(1)
347 + - run-command: introduce function to prepare auto-maintenance process
348 +
349 + The "receive-pack" program (which responds to "git push") was not
350 + converted to run "git maintenance --auto" when other codepaths that
351 + used to run "git gc --auto" were updated, which has been corrected.
352 +
353 + Will merge to 'next'.
354 + source: <cover.1713334241.git.ps@pks.im>
355 +
356 +
357 +* la/mailmap-entry (2024-04-16) 1 commit
358 + (merged to 'next' on 2024-04-17 at 440b18b8be)
359 + + mailmap: change primary address for Linus Arver
360 +
361 + source: <pull.1720.git.1713309711217.gitgitgadget@gmail.com>
362 +
363 +
364 +* xx/disable-replace-when-building-midx (2024-04-17) 1 commit
365 + - midx: disable replace objects
366 +
367 + source: <pull.1711.v2.git.1712554017808.gitgitgadget@gmail.com>
368
369 --------------------------------------------------
370 [Cooking]
371
248 -* rs/date-mode-pass-by-value (2024-04-05) 1 commit
249 - (merged to 'next' on 2024-04-10 at cc3c17d31c)
250 - + date: make DATE_MODE thread-safe
372 +* dd/t9604-use-posix-timezones (2024-04-10) 1 commit
373 + (merged to 'next' on 2024-04-16 at 46ab81737f)
374 + + t9604: Fix test for musl libc and new Debian
375
252 - The codepaths that reach date_mode_from_type() have been updated to
253 - pass "struct date_mode" by value to make them thread safe.
376 + The cvsimport tests required that the platform understands
377 + traditional timezone notations like CST6CDT, which has been
378 + updated to work on those systems as long as they understand
379 + POSIX notation with explicit tz transition dates.
380
381 Will merge to 'master'.
256 - source: <c6cb255a-72f0-4ac2-81a2-1d8e95570a81@web.de>
382 + source: <20240410032812.30476-1-congdanhqx@gmail.com>
383
384
259 -* rs/usage-fallback-to-show-message-format (2024-04-05) 1 commit
260 - (merged to 'next' on 2024-04-10 at 9a34aed4d5)
261 - + usage: report vsnprintf(3) failure
385 +* kn/update-ref-symrefs (2024-04-12) 8 commits
386 + - SQUASH???
387 + - refs: support symrefs in 'reference-transaction' hook
388 + - update-ref: add support for symref-update
389 + - update-ref: add support for symref-create
390 + - files-backend: extract out `create_symref_lock`
391 + - update-ref: add support for symref-delete
392 + - update-ref: add support for symref-verify
393 + - refs: accept symref values in `ref_transaction[_add]_update`
394 +
395 + source: <20240412095908.1134387-1-knayak@gitlab.com>
396
263 - vreportf(), which is usede by error() and friends, has been taught
264 - to give the error message printf-format string when its vsnprintf()
265 - call fails, instead of showing nothing useful to identify the
266 - nature of the error.
397 +
398 +* pf/commitish-committish (2024-04-11) 1 commit
399 + (merged to 'next' on 2024-04-12 at 7ef816cb64)
400 + + typo: replace 'commitish' with 'committish'
401 +
402 + Spellfix.
403
404 Will merge to 'master'.
269 - source: <3da13298-b6a6-4391-b8e8-5dae9a28b860@web.de>
405 + source: <20240407212111.55362-1-Pi.L.D.Fisher@gmail.com>
406
407
272 -* jc/local-extern-shell-rules (2024-04-05) 8 commits
273 - (merged to 'next' on 2024-04-10 at d3a13273e7)
274 - + t1016: local VAR="VAL" fix
275 - + t0610: local VAR="VAL" fix
276 - + t: teach lint that RHS of 'local VAR=VAL' needs to be quoted
277 - + t: local VAR="VAL" (quote ${magic-reference})
278 - + t: local VAR="VAL" (quote command substitution)
279 - + t: local VAR="VAL" (quote positional parameters)
280 - + CodingGuidelines: quote assigned value in 'local var=$val'
281 - + CodingGuidelines: describe "export VAR=VAL" rule
408 +* ta/fast-import-parse-path-fix (2024-04-15) 8 commits
409 + (merged to 'next' on 2024-04-15 at 00cc71a679)
410 + + fast-import: make comments more precise
411 + + fast-import: forbid escaped NUL in paths
412 + + fast-import: document C-style escapes for paths
413 + + fast-import: improve documentation for path quoting
414 + + fast-import: remove dead strbuf
415 + + fast-import: allow unquoted empty path for root
416 + + fast-import: directly use strbufs for paths
417 + + fast-import: tighten path unquoting
418
283 - Document and apply workaround for a buggy version of dash that
284 - mishandles "local var=val" construct.
419 + The way "git fast-import" handles paths described in its input has
420 + been tightened up and more clearly documented.
421
422 Will merge to 'master'.
287 - source: <20240406000902.3082301-1-gitster@pobox.com>
423 + source: <cover.1713056559.git.thalia@archibald.dev>
424
425
290 -* jc/unleak-core-excludesfile (2024-04-08) 1 commit
291 - (merged to 'next' on 2024-04-10 at ffb0c01871)
292 - + config: do not leak excludes_file
426 +* xx/rfc2822-date-format-in-doc (2024-04-12) 1 commit
427 + (merged to 'next' on 2024-04-17 at f2186bd6e8)
428 + + Documentation: fix typos describing date format
429
294 - The variable that holds the value read from the core.excludefile
295 - configuration variable used to leak, which has been corrected.
430 + Docfix.
431
432 Will merge to 'master'.
298 - source: <xmqqttkeicov.fsf@gitster.g>
433 + source: <pull.1716.git.1712911876943.gitgitgadget@gmail.com>
434
435
301 -* la/doc-use-of-contacts-when-contributing (2024-04-12) 8 commits
436 +* la/doc-use-of-contacts-when-contributing (2024-04-17) 9 commits
437 + - SQUASH???
438 - SubmittingPatches: demonstrate using git-contacts with git-send-email
439 - SubmittingPatches: add heading for format-patch and send-email
440 - SubmittingPatches: dedupe discussion of security patches
@@ -312,7 +448,8 @@ Release tarballs are available at:
448 ask review for their patches, a bit more in our developer
449 documentation.
450
315 - source: <pull.1704.v4.git.1712878339.gitgitgadget@gmail.com>
451 + Almost there?
452 + source: <pull.1704.v5.git.1713308518.gitgitgadget@gmail.com>
453
454
455 * ps/ci-test-with-jgit (2024-04-12) 13 commits
@@ -332,7 +469,6 @@ Release tarballs are available at:
469
470 Tests to ensure interoperability between reftable written by jgit
471 and our code have been added and enabled in CI.
335 -
472 source: <cover.1712896868.git.ps@pks.im>
473
474
@@ -348,41 +484,6 @@ Release tarballs are available at:
484 source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
485
486
351 -* tb/make-indent-conditional-with-non-spaces (2024-04-08) 2 commits
352 - (merged to 'next' on 2024-04-10 at 98aa239dc3)
353 - + Makefile(s): do not enforce "all indents must be done with tab"
354 - + Makefile(s): avoid recipe prefix in conditional statements
355 -
356 - Adjust to an upcoming changes to GNU make that breaks our Makefiles.
357 -
358 - Will merge to 'master'.
359 - source: <9d14c08ca6cc06cdf8fb4ba33d2470053dca3966.1712591504.git.me@ttaylorr.com>
360 -
361 -
362 -* ps/t0610-umask-fix (2024-04-09) 2 commits
363 - (merged to 'next' on 2024-04-10 at 659a29b138)
364 - + t0610: execute git-pack-refs(1) with specified umask
365 - + t0610: make `--shared=` tests reusable
366 -
367 - The "shared repository" test in the t0610 reftable test failed
368 - under restrictive umask setting (e.g. 007), which has been
369 - corrected.
370 -
371 - Will merge to 'master'.
372 - source: <cover.1712656576.git.ps@pks.im>
373 -
374 -
375 -* ma/win32-unix-domain-socket (2024-04-03) 1 commit
376 - (merged to 'next' on 2024-04-09 at b98021a65c)
377 - + Win32: detect unix socket support at runtime
378 -
379 - Windows binary used to decide the use of unix-domain socket at
380 - build time, but it learned to make the decision at runtime instead.
381 -
382 - Will merge to 'master'.
383 - source: <pull.1708.git.1712158923106.gitgitgadget@gmail.com>
384 -
385 -
487 * ps/reftable-write-optim (2024-04-08) 11 commits
488 - reftable/block: reuse compressed array
489 - reftable/block: reuse zstream when writing log blocks
@@ -412,108 +513,6 @@ Release tarballs are available at:
513 source: <cover.1712732383.git.dsimic@manjaro.org>
514
515
415 -* ds/fetch-config-parse-microfix (2024-04-05) 1 commit
416 - (merged to 'next' on 2024-04-09 at 585dcadd63)
417 - + fetch: return when parsing submodule.recurse
418 -
419 - A config parser callback function fell through instead of returning
420 - after recognising and processing a variable, wasting cycles, which
421 - has been corrected.
422 -
423 - Will merge to 'master'.
424 - source: <pull.1709.git.1712285542303.gitgitgadget@gmail.com>
425 -
426 -
427 -* rs/apply-lift-path-length-limit (2024-04-05) 2 commits
428 - (merged to 'next' on 2024-04-09 at 3270d194fd)
429 - + path: remove mksnpath()
430 - + apply: avoid fixed-size buffer in create_one_file()
431 -
432 - "git apply" has been updated to lift the hardcoded pathname length
433 - limit, which in turn allowed a mksnpath() function that is no
434 - longer used.
435 -
436 - Will merge to 'master'.
437 - source: <df774306-f29b-4a75-a282-59db89812b9a@web.de>
438 -
439 -
440 -* rs/apply-reject-fd-leakfix (2024-04-05) 1 commit
441 - (merged to 'next' on 2024-04-09 at 11efa0543c)
442 - + apply: don't leak fd on fdopen() error
443 -
444 - A file descriptor leak in an error codepath, used when "git apply
445 - --reject" fails to create the *.rej file, has been corrected.
446 -
447 - Will merge to 'master'.
448 - source: <5ba55ee4-94c7-4094-a744-584fc623b391@web.de>
449 -
450 -
451 -* ba/osxkeychain-updates (2024-04-01) 4 commits
452 - (merged to 'next' on 2024-04-10 at 1e7d925a43)
453 - + osxkeychain: store new attributes
454 - + osxkeychain: erase matching passwords only
455 - + osxkeychain: erase all matching credentials
456 - + osxkeychain: replace deprecated SecKeychain API
457 -
458 - Update osxkeychain backend with features required for the recent
459 - credential subsystem.
460 -
461 - Will merge to 'master'.
462 - source: <pull.1667.git.1708212896.gitgitgadget@gmail.com>
463 -
464 -
465 -* jk/libcurl-8.7-regression-workaround (2024-04-05) 3 commits
466 - (merged to 'next' on 2024-04-10 at 3b76577bfc)
467 - + remote-curl: add Transfer-Encoding header only for older curl
468 - + INSTALL: bump libcurl version to 7.21.3
469 - + http: reset POSTFIELDSIZE when clearing curl handle
470 -
471 - Fix was added to work around a regression in libcURL 8.7.0 (which has
472 - already been fixed in their tip of the tree).
473 -
474 - Will merge to 'master'.
475 - source: <20240402200254.GA874754@coredump.intra.peff.net>
476 -
477 -
478 -* tb/t7700-fixup (2024-04-03) 1 commit
479 - (merged to 'next' on 2024-04-10 at ff1f877ef7)
480 - + t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
481 -
482 - Test fix.
483 -
484 - Will merge to 'master'.
485 - source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
486 -
487 -
488 -* gt/add-u-commit-i-pathspec-check (2024-04-03) 3 commits
489 - (merged to 'next' on 2024-04-09 at 1a0c757907)
490 - + builtin/add: error out when passing untracked path with -u
491 - + builtin/commit: error out when passing untracked path with -i
492 - + revision: optionally record matches with pathspec elements
493 -
494 - "git add -u <pathspec>" and "git commit [-i] <pathspec>" did not
495 - diagnose a pathspec element that did not match any files in certain
496 - situations, unlike "git add <pathspec>" did.
497 -
498 - Will merge to 'master'.
499 - source: <20240402213640.139682-2-shyamthakkar001@gmail.com>
500 -
501 -
502 -* jt/reftable-geometric-compaction (2024-04-08) 4 commits
503 - (merged to 'next' on 2024-04-10 at 7e868a831c)
504 - + reftable/stack: use geometric table compaction
505 - + reftable/stack: add env to disable autocompaction
506 - + reftable/stack: expose option to disable auto-compaction
507 - + Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction
508 -
509 - The strategy to compact multiple tables of reftables after many
510 - operations accumulate many entries has been improved to avoid
511 - accumulating too many tables uncollected.
512 -
513 - Will merge to 'master'.
514 - source: <pull.1683.v6.git.1712593016.gitgitgadget@gmail.com>
515 -
516 -
516 * ew/khash-to-khashl (2024-03-28) 3 commits
517 - khashl: fix ensemble lookups on empty table
518 - treewide: switch to khashl for memory savings
@@ -526,45 +525,48 @@ Release tarballs are available at:
525 source: <20240328101356.300374-1-e@80x24.org>
526
527
529 -* ps/reftable-block-iteration-optim (2024-03-27) 9 commits
530 - - reftable/block: reuse `zstream` state on inflation
531 - - reftable/block: open-code call to `uncompress2()`
532 - - reftable/block: reuse uncompressed blocks
533 - - reftable/reader: iterate to next block in place
534 - - reftable/block: move ownership of block reader into `struct table_iter`
535 - - reftable/block: introduce `block_reader_release()`
536 - - reftable/block: better grouping of functions
537 - - reftable/block: merge `block_iter_seek()` and `block_reader_seek()`
538 - - reftable/block: rename `block_reader_start()`
528 +* ps/reftable-block-iteration-optim (2024-04-15) 10 commits
529 + (merged to 'next' on 2024-04-15 at 3a2353c7f2)
530 + + reftable/block: avoid copying block iterators on seek
531 + + reftable/block: reuse `zstream` state on inflation
532 + + reftable/block: open-code call to `uncompress2()`
533 + + reftable/block: reuse uncompressed blocks
534 + + reftable/reader: iterate to next block in place
535 + + reftable/block: move ownership of block reader into `struct table_iter`
536 + + reftable/block: introduce `block_reader_release()`
537 + + reftable/block: better grouping of functions
538 + + reftable/block: merge `block_iter_seek()` and `block_reader_seek()`
539 + + reftable/block: rename `block_reader_start()`
540
541 The code to iterate over reftable blocks has seen some optimization
542 to reduce memory allocation and deallocation.
543
543 - Needs review.
544 - source: <cover.1711519925.git.ps@pks.im>
545 -
546 -
547 -* bc/credential-scheme-enhancement (2024-03-27) 12 commits
548 - . credential: add support for multistage credential rounds
549 - . t5563: refactor for multi-stage authentication
550 - . docs: set a limit on credential line length
551 - . credential: enable state capability
552 - . credential: add an argument to keep state
553 - . http: add support for authtype and credential
554 - . docs: indicate new credential protocol fields
555 - . credential: gate new fields on capability
556 - . credential: add a field for pre-encoded credentials
557 - . http: use new headers for each object request
558 - . remote-curl: reset headers on new request
559 - . credential: add an authtype field
544 + Will merge to 'master'.
545 + source: <cover.1712578376.git.ps@pks.im>
546 +
547 +
548 +* bc/credential-scheme-enhancement (2024-04-16) 16 commits
549 + - credential: add method for querying capabilities
550 + - credential-cache: implement authtype capability
551 + - t: add credential tests for authtype
552 + - credential: add support for multistage credential rounds
553 + - t5563: refactor for multi-stage authentication
554 + - docs: set a limit on credential line length
555 + - credential: enable state capability
556 + - credential: add an argument to keep state
557 + - http: add support for authtype and credential
558 + - docs: indicate new credential protocol fields
559 + - credential: add a field called "ephemeral"
560 + - credential: gate new fields on capability
561 + - credential: add a field for pre-encoded credentials
562 + - http: use new headers for each object request
563 + - remote-curl: reset headers on new request
564 + - credential: add an authtype field
565
566 The credential helper protocol, together with the HTTP layer, have
567 been enhanced to support authentication schemes different from
568 username & password pair, like Bearer and NTLM.
564 -
565 - Expecting a reroll.
566 - cf. <ZgSQ5o_KyqDaxz1m@tapette.crustytoothpaste.net>
567 - source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
569 + source: <20240417000240.3611948-1-sandals@crustytoothpaste.net>
570
571
572 * tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
@@ -630,16 +632,17 @@ Release tarballs are available at:
632
633
634 * la/format-trailer-info (2024-03-15) 5 commits
633 - - trailer: finish formatting unification
634 - - trailer: begin formatting unification
635 - - format_trailer_info(): append newline for non-trailer lines
636 - - format_trailer_info(): drop redundant unfold_value()
637 - - format_trailer_info(): use trailer_item objects
635 + (merged to 'next' on 2024-04-16 at dca4784407)
636 + + trailer: finish formatting unification
637 + + trailer: begin formatting unification
638 + + format_trailer_info(): append newline for non-trailer lines
639 + + format_trailer_info(): drop redundant unfold_value()
640 + + format_trailer_info(): use trailer_item objects
641 (this branch is used by la/hide-trailer-info.)
642
643 The code to format trailers have been cleaned up.
644
642 - Comments?
645 + Will merge to 'master'.
646 source: <pull.1694.git.1710485706.gitgitgadget@gmail.com>
647
648
@@ -669,19 +672,6 @@ Release tarballs are available at:
672 source: <cover.1712858920.git.steadmon@google.com>
673
674
672 -* sj/userdiff-c-sharp (2024-04-05) 1 commit
673 - (merged to 'next' on 2024-04-10 at 56aaf254a7)
674 - + userdiff: better method/property matching for C#
675 -
676 - The userdiff patterns for C# has been updated.
677 -
678 - Acked-by: Johannes Sixt <j6t@kdbg.org>
679 - cf. <c2154457-3f2f-496e-9b8b-c8ea7257027b@kdbg.org>
680 -
681 - Will merge to 'master'.
682 - source: <pull.1682.v5.git.git.1712180564927.gitgitgadget@gmail.com>
683 -
684 -
675 * cw/git-std-lib (2024-02-28) 4 commits
676 - SQUASH??? get rid of apparent debugging crufts
677 - test-stdlib: show that git-std-lib is independent