What's cooking (2024/04 #04)
Junio C Hamano committed
Apr 9, 2024 at 14:56 UTC
781df13f3bbdd8fca09ad7a734a4228e05c8fc59
1 file changed
+286
-223
whats-cooking.txt
+286
-223
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2024, #03; Fri, 5)
3
-X-master-at: 19981daefd7c147444462739375462b49412ce33
4
-X-next-at: 6705b92e7a998ba6c9ef97c43fa7dc2dcf631e7a
2
+Subject: What's cooking in git.git (Apr 2024, #04; Tue, 9)
3
+X-master-at: 91ec36f2cca02d33ab0ed6e87195c6fe801debae
4
+X-next-at: 1a5e3faff75d1d3622627d3820bc57b4c2728bc5
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2024, #03; Fri, 5)
7
+What's cooking in git.git (Apr 2024, #04; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,68 +48,265 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* jk/core-comment-string (2024-03-27) 17 commits
52
- (merged to 'next' on 2024-03-28 at fbf8eb9331)
53
- + config: add core.commentString
54
- + config: allow multi-byte core.commentChar
55
- + environment: drop comment_line_char compatibility macro
56
- + wt-status: drop custom comment-char stringification
57
- + sequencer: handle multi-byte comment characters when writing todo list
58
- + find multi-byte comment chars in unterminated buffers
59
- + find multi-byte comment chars in NUL-terminated strings
60
- + prefer comment_line_str to comment_line_char for printing
61
- + strbuf: accept a comment string for strbuf_add_commented_lines()
62
- + strbuf: accept a comment string for strbuf_commented_addf()
63
- + strbuf: accept a comment string for strbuf_stripspace()
64
- + environment: store comment_line_char as a string
65
- + strbuf: avoid shadowing global comment_line_char name
66
- + commit: refactor base-case of adjust_comment_line_char()
67
- + strbuf: avoid static variables in strbuf_add_commented_lines()
68
- + strbuf: simplify comment-handling in add_lines() helper
69
- + config: forbid newline as core.commentChar
70
-
71
- core.commentChar used to be limited to a single byte, but has been
72
- updated to allow an arbitrary multi-byte sequence.
73
- source: <20240312091013.GA95442@coredump.intra.peff.net>
74
- source: <20240327081922.GA830163@coredump.intra.peff.net>
75
-
76
-
77
-* rs/config-comment (2024-03-15) 3 commits
78
- (merged to 'next' on 2024-03-28 at 83eaadc2b6)
79
- + config: allow tweaking whitespace between value and comment
80
- + config: fix --comment formatting
81
- + config: add --comment option to add a comment
82
-
83
- "git config" learned "--comment=<message>" option to leave a
84
- comment immediately after the "variable = value" on the same line
85
- in the configuration file.
86
- source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>
87
-
88
-
89
-* rs/retire-mksnpath (2024-04-04) 1 commit
90
- - apply: replace mksnpath() with a mkpathdup() call
91
-
92
- Replace the only remaining caller of mksnpath() with mkpathdup() to
93
- lift the hardcoded path length limit, and retire the function.
94
-
95
- Expecting a retitle and reroll?
96
- cf. <xmqqo7aozuih.fsf@gitster.g>
97
- source: <df774306-f29b-4a75-a282-59db89812b9a@web.de>
51
+* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
52
+ (merged to 'next' on 2024-04-02 at effa6a98a6)
53
+ + MyFirstObjectWalk: add stderr to pipe processing
54
+ + MyFirstObjectWalk: fix description for counting omitted objects
55
+ + MyFirstObjectWalk: fix filtered object walk
56
+ + MyFirstObjectWalk: fix misspelled "builtins/"
57
+ + MyFirstObjectWalk: use additional arg in config_fn_t
58
+
59
+ Update a more recent tutorial doc.
60
+ source: <cover.1711537370.git.dirk@gouders.net>
61
+
62
+
63
+* es/test-cron-safety (2024-03-31) 1 commit
64
+ (merged to 'next' on 2024-04-02 at e383c8cfb2)
65
+ + test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback
66
+
67
+ The test script had an incomplete and ineffective attempt to avoid
68
+ clobbering the testing user's real crontab (and its equivalents),
69
+ which has been completed.
70
+ source: <20240329222703.9343-1-ericsunshine@charter.net>
71
+
72
+
73
+* ja/doc-markup-updates (2024-03-29) 5 commits
74
+ (merged to 'next' on 2024-04-02 at 69b015d7ce)
75
+ + doc: git-clone: do not autoreference the manpage in itself
76
+ + doc: git-clone: apply new documentation formatting guidelines
77
+ + doc: git-init: apply new documentation formatting guidelines
78
+ + doc: allow literal and emphasis format in doc vs help tests
79
+ + doc: rework CodingGuidelines with new formatting rules
80
+
81
+ Documentation rules has been explicitly described how to mark-up
82
+ literal parts and a few manual pages have been updated as examples.
83
+ source: <pull.1702.v2.git.1711711181.gitgitgadget@gmail.com>
84
+
85
+
86
+* jc/advice-sans-trailing-whitespace (2024-03-29) 1 commit
87
+ (merged to 'next' on 2024-04-02 at 3cb0fda1bf)
88
+ + advice: omit trailing whitespace
89
+
90
+ The "hint:" messages given by the advice mechanism, when given a
91
+ message with a blank line, left a line with trailing whitespace,
92
+ which has been cleansed.
93
+ source: <xmqq4jcooddp.fsf@gitster.g>
94
+
95
+
96
+* jc/apply-parse-diff-git-header-names-fix (2024-03-29) 3 commits
97
+ (merged to 'next' on 2024-04-02 at d1fa726c41)
98
+ + t4126: fix "funny directory name" test on Windows (again)
99
+ (merged to 'next' on 2024-03-28 at a35de15836)
100
+ + t4126: make sure a directory with SP at the end is usable
101
+ (merged to 'next' on 2024-03-27 at d586367985)
102
+ + apply: parse names out of "diff --git" more carefully
103
+
104
+ "git apply" failed to extract the filename the patch applied to,
105
+ when the change was about an empty file created in or deleted from
106
+ a directory whose name ends with a SP, which has been corrected.
107
+ source: <xmqqfrwlltjn.fsf@gitster.g>
108
+ source: <xmqqh6gqt674.fsf_-_@gitster.g>
109
+ source: <xmqq5xx50x8p.fsf_-_@gitster.g>
110
+
111
+
112
+* mg/editorconfig-makefile (2024-03-23) 1 commit
113
+ (merged to 'next' on 2024-04-02 at 907b55579e)
114
+ + editorconfig: add Makefiles to "text files"
115
+
116
+ The .editorconfig file has been taught that a Makefile uses HT
117
+ indentation.
118
+ source: <20240322221813.13019-1-mg@max.gautier.name>
119
+
120
+
121
+* ps/pack-refs-auto (2024-03-25) 16 commits
122
+ (merged to 'next' on 2024-04-02 at 1d76dc3648)
123
+ + builtin/gc: pack refs when using `git maintenance run --auto`
124
+ + builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
125
+ + t6500: extract objects with "17" prefix
126
+ + builtin/gc: move `struct maintenance_run_opts`
127
+ + builtin/pack-refs: introduce new "--auto" flag
128
+ + builtin/pack-refs: release allocated memory
129
+ + refs/reftable: expose auto compaction via new flag
130
+ + refs: remove `PACK_REFS_ALL` flag
131
+ + refs: move `struct pack_refs_opts` to where it's used
132
+ + t/helper: drop pack-refs wrapper
133
+ + refs/reftable: print errors on compaction failure
134
+ + reftable/stack: gracefully handle failed auto-compaction due to locks
135
+ + reftable/stack: use error codes when locking fails during compaction
136
+ + reftable/error: discern locked/outdated errors
137
+ + reftable/stack: fix error handling in `reftable_stack_init_addition()`
138
+ + Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
139
+ (this branch is used by jt/reftable-geometric-compaction.)
140
+
141
+ "git pack-refs" learned the "--auto" option, which is a useful
142
+ addition to be triggered from "git gc --auto".
143
+
144
+ Acked-by: Karthik Nayak <karthik.188@gmail.com>
145
+ cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
146
+ source: <cover.1711360631.git.ps@pks.im>
147
+
148
+
149
+* rj/add-p-explicit-reshow (2024-03-29) 2 commits
150
+ (merged to 'next' on 2024-04-02 at 05c7e930af)
151
+ + add-patch: do not print hunks repeatedly
152
+ + add-patch: introduce 'p' in interactive-patch
153
+
154
+ "git add -p" and other "interactive hunk selection" UI has learned to
155
+ skip showing the hunk immediately after it has already been shown, and
156
+ an additional action to explicitly ask to reshow the current hunk.
157
+ source: <a9c515fe-6664-4b5d-abca-d88fdd32a883@gmail.com>
158
+
159
+
160
+* rj/use-adv-if-enabled (2024-03-30) 3 commits
161
+ (merged to 'next' on 2024-04-02 at 31d4453035)
162
+ + add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO
163
+ + add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
164
+ + add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
165
+
166
+ Use advice_if_enabled() API to rewrite a simple pattern to
167
+ call advise() after checking advice_enabled().
168
+ source: <46fba030-d7aa-49d2-88fa-e506850f7b6a@gmail.com>
169
170
--------------------------------------------------
171
[New Topics]
172
173
+* rs/date-mode-pass-by-value (2024-04-05) 1 commit
174
+ - date: make DATE_MODE thread-safe
175
+
176
+ The codepaths that reach date_mode_from_type() have been updated to
177
+ pass "struct date_mode" by value to make them thread safe.
178
+
179
+ Will merge to 'next'.
180
+ source: <c6cb255a-72f0-4ac2-81a2-1d8e95570a81@web.de>
181
+
182
+
183
+* rs/usage-fallback-to-show-message-format (2024-04-05) 1 commit
184
+ - usage: report vsnprintf(3) failure
185
+
186
+ vreportf(), which is usede by error() and friends, has been taught
187
+ to give the error message printf-format string when its vsnprintf()
188
+ call fails, instead of showing nothing useful to identify the
189
+ nature of the error.
190
+
191
+ Will merge to 'next'.
192
+ source: <3da13298-b6a6-4391-b8e8-5dae9a28b860@web.de>
193
+
194
+
195
+* jc/local-extern-shell-rules (2024-04-05) 8 commits
196
+ - t1016: local VAR="VAL" fix
197
+ - t0610: local VAR="VAL" fix
198
+ - t: teach lint that RHS of 'local VAR=VAL' needs to be quoted
199
+ - t: local VAR="VAL" (quote ${magic-reference})
200
+ - t: local VAR="VAL" (quote command substitution)
201
+ - t: local VAR="VAL" (quote positional parameters)
202
+ - CodingGuidelines: quote assigned value in 'local var=$val'
203
+ - CodingGuidelines: describe "export VAR=VAL" rule
204
+
205
+ Document and apply workaround for a buggy version of dash that
206
+ mishandles "local var=val" construct.
207
+
208
+ Will merge to 'next'.
209
+ source: <20240406000902.3082301-1-gitster@pobox.com>
210
+
211
+
212
+* jc/unleak-core-excludesfile (2024-04-08) 1 commit
213
+ - config: do not leak excludes_file
214
+
215
+ The variable that holds the value read from the core.excludefile
216
+ configuration variable used to leak, which has been corrected.
217
+
218
+ Will merge to 'next'.
219
+ source: <xmqqttkeicov.fsf@gitster.g>
220
+
221
+
222
+* la/doc-use-of-contacts-when-contributing (2024-04-05) 8 commits
223
+ - SubmittingPatches: demonstrate using git-contacts with git-send-email
224
+ - SubmittingPatches: add heading for format-patch and send-email
225
+ - SubmittingPatches: dedupe discussion of security patches
226
+ - SubmittingPatches: discuss reviewers first
227
+ - SubmittingPatches: quote commands
228
+ - SubmittingPatches: mention GitGitGadget
229
+ - SubmittingPatches: make 'git contacts' grep-friendly
230
+ - MyFirstContribution: mention contrib/contacts/git-contacts
231
+
232
+ Advertise "git contacts", a tool for newcomers to find people to
233
+ ask review for their patches, a bit more in our developer
234
+ documentation.
235
+
236
+ Expecting a reroll.
237
+ cf. <owlypluzs5qa.fsf@fine.c.googlers.com>
238
+ source: <pull.1704.v2.git.1712366536.gitgitgadget@gmail.com>
239
+
240
+
241
+* ps/ci-test-with-jgit (2024-04-08) 12 commits
242
+ - t0612: add tests to exercise Git/JGit reftable compatibility
243
+ - t0610: fix non-portable variable assignment
244
+ - t06xx: always execute backend-specific tests
245
+ - ci: install JGit dependency
246
+ - ci: make Perforce binaries executable for all users
247
+ - ci: merge scripts which install dependencies
248
+ - ci: merge custom PATH directories
249
+ - ci: convert "install-dependencies.sh" to use "/bin/sh"
250
+ - ci: drop duplicate package installation for "linux-gcc-default"
251
+ - ci: allow skipping sudo on dockerized jobs
252
+ - ci: expose distro name in dockerized GitHub jobs
253
+ - ci: rename "runs_on_pool" to "distro"
254
+
255
+ Tests to ensure interoperability between reftable written by jgit
256
+ and our code have been added and enabled in CI.
257
+
258
+ Comments?
259
+ source: <cover.1712555682.git.ps@pks.im>
260
+
261
+
262
+* pw/rebase-i-error-message (2024-04-08) 2 commits
263
+ - rebase -i: improve error message when picking merge
264
+ - rebase -i: pass struct replay_opts to parse_insn_line()
265
+
266
+ When the user adds to "git rebase -i" instruction to "pick" a merge
267
+ commit, the error experience is not pleasant. Such an error is now
268
+ caught earlier in the process that parses the todo list.
269
+
270
+ Comments?
271
+ source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
272
+
273
+
274
+* tb/make-indent-conditional-with-non-spaces (2024-04-08) 2 commits
275
+ - Makefile(s): do not enforce "all indents must be done with tab"
276
+ - Makefile(s): avoid recipe prefix in conditional statements
277
+
278
+ Adjust to an upcoming changes to GNU make that breaks our Makefiles.
279
+
280
+ Will merge to 'next'.
281
+ source: <9d14c08ca6cc06cdf8fb4ba33d2470053dca3966.1712591504.git.me@ttaylorr.com>
282
+
283
+
284
+* ps/t0610-umask-fix (2024-04-09) 2 commits
285
+ - t0610: execute git-pack-refs(1) with specified umask
286
+ - t0610: make `--shared=` tests reusable
287
+
288
+ The "shared repository" test in the t0610 reftable test failed
289
+ under restrictive umask setting (e.g. 007), which has been
290
+ corrected.
291
+
292
+ Will merge to 'next'.
293
+ source: <cover.1712656576.git.ps@pks.im>
294
+
295
+--------------------------------------------------
296
+[Cooking]
297
+
298
* ma/win32-unix-domain-socket (2024-04-03) 1 commit
103
- - Win32: detect unix socket support at runtime
299
+ (merged to 'next' on 2024-04-09 at b98021a65c)
300
+ + Win32: detect unix socket support at runtime
301
302
Windows binary used to decide the use of unix-domain socket at
303
build time, but it learned to make the decision at runtime instead.
304
108
- Will merge to 'next'.
305
+ Will merge to 'master'.
306
source: <pull.1708.git.1712158923106.gitgitgadget@gmail.com>
307
308
112
-* ps/reftable-write-optim (2024-04-03) 11 commits
309
+* ps/reftable-write-optim (2024-04-08) 11 commits
310
- reftable/block: reuse compressed array
311
- reftable/block: reuse zstream when writing log blocks
312
- reftable/writer: reset `last_key` instead of releasing it
@@ -124,58 +321,56 @@ Release tarballs are available at:
321
322
Code to write out reftable has seen some optimization and
323
simplification.
127
-
128
- Expecting a reroll.
129
- cf. <Zg6SVcGC8kSGSYh-@tanuki>
130
- source: <cover.1712209149.git.ps@pks.im>
324
+ source: <cover.1712578837.git.ps@pks.im>
325
326
133
-* ds/send-email-per-message-block (2024-04-05) 2 commits
134
- - SQUASH??? switch to separator semantics
327
+* ds/send-email-per-message-block (2024-04-08) 3 commits
328
+ - send-email: separate the confirmation prompts from the messages
329
- send-email: make it easy to discern the messages for each patch
330
+ - send-email: move newline character out of a translatable string
331
332
"git send-email" learned to separate its reports on each message it
333
sends out with an extra blank line in between.
334
140
- Expecting a reroll.
141
- cf. <8d47bd687f2ad80bbc1e1c86ae337327@manjaro.org>
142
- source: <0e087ed992def0746f3d437253248904c2126464.1712262791.git.dsimic@manjaro.org>
335
+ Comments?
336
+ source: <cover.1712486910.git.dsimic@manjaro.org>
337
338
339
* ds/fetch-config-parse-microfix (2024-04-05) 1 commit
146
- - fetch: return when parsing submodule.recurse
340
+ (merged to 'next' on 2024-04-09 at 585dcadd63)
341
+ + fetch: return when parsing submodule.recurse
342
343
A config parser callback function fell through instead of returning
344
after recognising and processing a variable, wasting cycles, which
345
has been corrected.
346
152
- Will merge to 'next'.
347
+ Will merge to 'master'.
348
source: <pull.1709.git.1712285542303.gitgitgadget@gmail.com>
349
350
351
* rs/apply-lift-path-length-limit (2024-04-05) 2 commits
157
- - path: remove mksnpath()
158
- - apply: avoid fixed-size buffer in create_one_file()
352
+ (merged to 'next' on 2024-04-09 at 3270d194fd)
353
+ + path: remove mksnpath()
354
+ + apply: avoid fixed-size buffer in create_one_file()
355
356
"git apply" has been updated to lift the hardcoded pathname length
357
limit, which in turn allowed a mksnpath() function that is no
358
longer used.
359
164
- Will merge to 'next'.
360
+ Will merge to 'master'.
361
source: <df774306-f29b-4a75-a282-59db89812b9a@web.de>
362
363
364
* rs/apply-reject-fd-leakfix (2024-04-05) 1 commit
169
- - apply: don't leak fd on fdopen() error
365
+ (merged to 'next' on 2024-04-09 at 11efa0543c)
366
+ + apply: don't leak fd on fdopen() error
367
368
A file descriptor leak in an error codepath, used when "git apply
369
--reject" fails to create the *.rej file, has been corrected.
370
174
- Will merge to 'next'.
371
+ Will merge to 'master'.
372
source: <5ba55ee4-94c7-4094-a744-584fc623b391@web.de>
373
177
---------------------------------------------------
178
-[Cooking]
374
375
* kn/clarify-update-ref-doc (2024-04-02) 2 commits
376
(merged to 'next' on 2024-04-02 at d1b9c5aa67)
@@ -260,74 +455,53 @@ Release tarballs are available at:
455
source: <520da361-1b80-4ba3-87b2-86d6fdfc18b5@web.de>
456
457
263
-* jk/libcurl-8.7-regression-workaround (2024-04-02) 2 commits
458
+* jk/libcurl-8.7-regression-workaround (2024-04-05) 3 commits
459
+ - remote-curl: add Transfer-Encoding header only for older curl
460
- INSTALL: bump libcurl version to 7.21.3
461
- http: reset POSTFIELDSIZE when clearing curl handle
462
463
Fix was added to work around a regression in libcURL 8.7.0 (which has
464
already been fixed in their tip of the tree).
465
270
- Expecting a reroll.
271
- cf. <20240403032045.GA1559972@coredump.intra.peff.net>
466
+ Will merge to 'next'.
467
source: <20240402200254.GA874754@coredump.intra.peff.net>
468
469
470
* tb/t7700-fixup (2024-04-03) 1 commit
471
- t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
472
278
- source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
279
-
473
+ Test fix.
474
281
-* es/test-cron-safety (2024-03-31) 1 commit
282
- (merged to 'next' on 2024-04-02 at e383c8cfb2)
283
- + test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback
284
-
285
- The test script had an incomplete and ineffective attempt to avoid
286
- clobbering the testing user's real crontab (and its equivalents),
287
- which has been completed.
288
-
289
- Will merge to 'master'.
290
- source: <20240329222703.9343-1-ericsunshine@charter.net>
475
+ Will merge to 'next'.
476
+ source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
477
478
479
* gt/add-u-commit-i-pathspec-check (2024-04-03) 3 commits
294
- - builtin/add: error out when passing untracked path with -u
295
- - builtin/commit: error out when passing untracked path with -i
296
- - revision: optionally record matches with pathspec elements
480
+ (merged to 'next' on 2024-04-09 at 1a0c757907)
481
+ + builtin/add: error out when passing untracked path with -u
482
+ + builtin/commit: error out when passing untracked path with -i
483
+ + revision: optionally record matches with pathspec elements
484
485
"git add -u <pathspec>" and "git commit [-i] <pathspec>" did not
486
diagnose a pathspec element that did not match any files in certain
487
situations, unlike "git add <pathspec>" did.
488
302
- Will merge to 'next'.
303
- source: <20240402213640.139682-2-shyamthakkar001@gmail.com>
304
-
305
-
306
-* jc/advice-sans-trailing-whitespace (2024-03-29) 1 commit
307
- (merged to 'next' on 2024-04-02 at 3cb0fda1bf)
308
- + advice: omit trailing whitespace
309
-
310
- The "hint:" messages given by the advice mechanism, when given a
311
- message with a blank line, left a line with trailing whitespace,
312
- which has been cleansed.
313
-
489
Will merge to 'master'.
315
- source: <xmqq4jcooddp.fsf@gitster.g>
490
+ source: <20240402213640.139682-2-shyamthakkar001@gmail.com>
491
492
318
-* jt/reftable-geometric-compaction (2024-04-05) 4 commits
493
+* jt/reftable-geometric-compaction (2024-04-08) 4 commits
494
- reftable/stack: use geometric table compaction
495
- reftable/stack: add env to disable autocompaction
321
- - reftable/stack: allow disabling of auto-compaction
496
+ - reftable/stack: expose option to disable auto-compaction
497
- Merge branch 'ps/pack-refs-auto' into jt/reftable-geometric-compaction
323
- (this branch uses ps/pack-refs-auto.)
498
499
The strategy to compact multiple tables of reftables after many
500
operations accumulate many entries has been improved to avoid
501
accumulating too many tables uncollected.
502
503
Comments?
330
- source: <pull.1683.v5.git.1712255369.gitgitgadget@gmail.com>
504
+ source: <pull.1683.v6.git.1712593016.gitgitgadget@gmail.com>
505
506
507
* ds/typofix-core-config-doc (2024-03-31) 1 commit
@@ -355,19 +529,6 @@ Release tarballs are available at:
529
source: <xmqqa5mfl7ud.fsf@gitster.g>
530
531
358
-* rj/use-adv-if-enabled (2024-03-30) 3 commits
359
- (merged to 'next' on 2024-04-02 at 31d4453035)
360
- + add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO
361
- + add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
362
- + add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
363
-
364
- Use advice_if_enabled() API to rewrite a simple pattern to
365
- call advise() after checking advice_enabled().
366
-
367
- Will merge to 'master'.
368
- source: <46fba030-d7aa-49d2-88fa-e506850f7b6a@gmail.com>
369
-
370
-
532
* rs/mem-pool-size-t-safety (2024-03-31) 1 commit
533
(merged to 'next' on 2024-04-02 at 3517d48210)
534
+ mem-pool: use st_add() in mem_pool_strvfmt()
@@ -408,19 +569,6 @@ Release tarballs are available at:
569
source: <cover.1711519925.git.ps@pks.im>
570
571
411
-* rj/add-p-explicit-reshow (2024-03-29) 2 commits
412
- (merged to 'next' on 2024-04-02 at 05c7e930af)
413
- + add-patch: do not print hunks repeatedly
414
- + add-patch: introduce 'p' in interactive-patch
415
-
416
- "git add -p" and other "interactive hunk selection" UI has learned to
417
- skip showing the hunk immediately after it has already been shown, and
418
- an additional action to explicitly ask to reshow the current hunk.
419
-
420
- Will merge to 'master'.
421
- source: <a9c515fe-6664-4b5d-abca-d88fdd32a883@gmail.com>
422
-
423
-
572
* bc/credential-scheme-enhancement (2024-03-27) 12 commits
573
. credential: add support for multistage credential rounds
574
. t5563: refactor for multi-stage authentication
@@ -444,32 +592,6 @@ Release tarballs are available at:
592
source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
593
594
447
-* ja/doc-markup-updates (2024-03-29) 5 commits
448
- (merged to 'next' on 2024-04-02 at 69b015d7ce)
449
- + doc: git-clone: do not autoreference the manpage in itself
450
- + doc: git-clone: apply new documentation formatting guidelines
451
- + doc: git-init: apply new documentation formatting guidelines
452
- + doc: allow literal and emphasis format in doc vs help tests
453
- + doc: rework CodingGuidelines with new formatting rules
454
-
455
- Documentation rules has been explicitly described how to mark-up
456
- literal parts and a few manual pages have been updated as examples.
457
-
458
- Will merge to 'master'.
459
- source: <pull.1702.v2.git.1711711181.gitgitgadget@gmail.com>
460
-
461
-
462
-* mg/editorconfig-makefile (2024-03-23) 1 commit
463
- (merged to 'next' on 2024-04-02 at 907b55579e)
464
- + editorconfig: add Makefiles to "text files"
465
-
466
- The .editorconfig file has been taught that a Makefile uses HT
467
- indentation.
468
-
469
- Will merge to 'master'.
470
- source: <20240322221813.13019-1-mg@max.gautier.name>
471
-
472
-
595
* ps/reftable-binsearch-updates (2024-04-03) 7 commits
596
(merged to 'next' on 2024-04-04 at 40e6d5a36b)
597
+ reftable/block: avoid decoding keys when searching restart points
@@ -522,38 +644,6 @@ Release tarballs are available at:
644
source: <cover.1710972293.git.me@ttaylorr.com>
645
646
525
-* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
526
- (merged to 'next' on 2024-04-02 at effa6a98a6)
527
- + MyFirstObjectWalk: add stderr to pipe processing
528
- + MyFirstObjectWalk: fix description for counting omitted objects
529
- + MyFirstObjectWalk: fix filtered object walk
530
- + MyFirstObjectWalk: fix misspelled "builtins/"
531
- + MyFirstObjectWalk: use additional arg in config_fn_t
532
-
533
- Update a more recent tutorial doc.
534
-
535
- Will merge to 'master'.
536
- source: <cover.1711537370.git.dirk@gouders.net>
537
-
538
-
539
-* jc/apply-parse-diff-git-header-names-fix (2024-03-29) 3 commits
540
- (merged to 'next' on 2024-04-02 at d1fa726c41)
541
- + t4126: fix "funny directory name" test on Windows (again)
542
- (merged to 'next' on 2024-03-28 at a35de15836)
543
- + t4126: make sure a directory with SP at the end is usable
544
- (merged to 'next' on 2024-03-27 at d586367985)
545
- + apply: parse names out of "diff --git" more carefully
546
-
547
- "git apply" failed to extract the filename the patch applied to,
548
- when the change was about an empty file created in or deleted from
549
- a directory whose name ends with a SP, which has been corrected.
550
-
551
- Will merge to 'master'.
552
- source: <xmqqfrwlltjn.fsf@gitster.g>
553
- source: <xmqqh6gqt674.fsf_-_@gitster.g>
554
- source: <xmqq5xx50x8p.fsf_-_@gitster.g>
555
-
556
-
647
* la/hide-trailer-info (2024-03-16) 7 commits
648
- trailer: retire trailer_info_get() from API
649
- trailer: make trailer_info struct private
@@ -570,36 +660,6 @@ Release tarballs are available at:
660
source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>
661
662
573
-* ps/pack-refs-auto (2024-03-25) 16 commits
574
- (merged to 'next' on 2024-04-02 at 1d76dc3648)
575
- + builtin/gc: pack refs when using `git maintenance run --auto`
576
- + builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
577
- + t6500: extract objects with "17" prefix
578
- + builtin/gc: move `struct maintenance_run_opts`
579
- + builtin/pack-refs: introduce new "--auto" flag
580
- + builtin/pack-refs: release allocated memory
581
- + refs/reftable: expose auto compaction via new flag
582
- + refs: remove `PACK_REFS_ALL` flag
583
- + refs: move `struct pack_refs_opts` to where it's used
584
- + t/helper: drop pack-refs wrapper
585
- + refs/reftable: print errors on compaction failure
586
- + reftable/stack: gracefully handle failed auto-compaction due to locks
587
- + reftable/stack: use error codes when locking fails during compaction
588
- + reftable/error: discern locked/outdated errors
589
- + reftable/stack: fix error handling in `reftable_stack_init_addition()`
590
- + Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
591
- (this branch is used by jt/reftable-geometric-compaction.)
592
-
593
- "git pack-refs" learned the "--auto" option, which is a useful
594
- addition to be triggered from "git gc --auto".
595
-
596
- Acked-by: Karthik Nayak <karthik.188@gmail.com>
597
- cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
598
-
599
- Will merge to 'master'.
600
- source: <cover.1711360631.git.ps@pks.im>
601
-
602
-
663
* ds/doc-config-reflow (2024-03-14) 1 commit
664
- config.txt: perform some minor reformatting
665
@@ -651,12 +711,15 @@ Release tarballs are available at:
711
source: <cover.1709673020.git.steadmon@google.com>
712
713
654
-* sj/userdiff-c-sharp (2024-04-03) 1 commit
714
+* sj/userdiff-c-sharp (2024-04-05) 1 commit
715
- userdiff: better method/property matching for C#
716
717
The userdiff patterns for C# has been updated.
718
659
- Will merge to 'next'?
719
+ Acked-by: Johannes Sixt <j6t@kdbg.org>
720
+ cf. <c2154457-3f2f-496e-9b8b-c8ea7257027b@kdbg.org>
721
+
722
+ Will merge to 'next'.
723
source: <pull.1682.v5.git.git.1712180564927.gitgitgadget@gmail.com>
724
725