What's cooking (2024/04 #02)
Junio C Hamano committed
Apr 3, 2024 at 15:41 UTC
e973a9239fd9f6ff2cf3bed2315096ac878cb52d
1 file changed
+382
-306
whats-cooking.txt
+382
-306
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2024, #01; Mon, 1)
3
-X-master-at: d6fd04375f9196f8b203d442f235bd96a1a068cc
4
-X-next-at: 09a8706636d10c491176b8b1cd6519f7300911bf
2
+Subject: What's cooking in git.git (Apr 2024, #02; Wed, 3)
3
+X-master-at: 7774cfed6261ce2900c84e55906da708c711d601
4
+X-next-at: 4b32163adf4863c6df3bb6b43540fa2ca3494e28
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2024, #01; Mon, 1)
7
+What's cooking in git.git (Apr 2024, #02; Wed, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,64 +45,368 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* az/grep-group-error-message-update (2024-03-25) 1 commit
52
+ (merged to 'next' on 2024-03-27 at 567bf00ed4)
53
+ + grep: improve errors for unmatched ( and )
54
+
55
+ Error message clarification.
56
+ source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>
57
+
58
+
59
+* bl/cherry-pick-empty (2024-03-25) 7 commits
60
+ (merged to 'next' on 2024-03-28 at 22e8e4a68e)
61
+ + cherry-pick: add `--empty` for more robust redundant commit handling
62
+ + cherry-pick: enforce `--keep-redundant-commits` incompatibility
63
+ + sequencer: do not require `allow_empty` for redundant commit options
64
+ + sequencer: handle unborn branch with `--allow-empty`
65
+ + rebase: update `--empty=ask` to `--empty=stop`
66
+ + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
67
+ + docs: address inaccurate `--empty` default with `--exec`
68
+
69
+ Allow git-cherry-pick(1) to automatically drop redundant commits via
70
+ a new `--empty` option, similar to the `--empty` options for
71
+ git-rebase(1) and git-am(1). Includes a soft deprecation of
72
+ `--keep-redundant-commits` as well as some related docs changes and
73
+ sequencer code cleanup.
74
+ cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
75
+ source: <20240119060721.3734775-2-brianmlyles@gmail.com>
76
+
77
+
78
+* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
79
+ (merged to 'next' on 2024-03-28 at e2749914ab)
80
+ + pretty: find pretty formats case-insensitively
81
+ + pretty: update tests to use `test_config`
82
+
83
+ The "--pretty=<shortHand>" option of the commands in the "git log"
84
+ family, defined as "[pretty] shortHand = <expansion>" should have
85
+ been looked up case insensitively, but was not, which has been
86
+ corrected.
87
+ source: <20240324214316.917513-1-brianmlyles@gmail.com>
88
+
89
+
90
+* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
91
+ (merged to 'next' on 2024-03-25 at f3393cabe5)
92
+ + config.txt: describe handling of whitespace further
93
+ + t1300: add more tests for whitespace and inline comments
94
+ + config: really keep value-internal whitespace verbatim
95
+ + config: minor addition of whitespace
96
+
97
+ "git config" corrupted literal HT characters written in the
98
+ configuration file as part of a value, which has been corrected.
99
+ source: <cover.1711001016.git.dsimic@manjaro.org>
100
+
101
+
102
+* ds/grep-doc-updates (2024-03-25) 2 commits
103
+ (merged to 'next' on 2024-03-27 at 681f08cbc5)
104
+ + grep docs: describe --no-index further and improve formatting a bit
105
+ + grep docs: describe --recurse-submodules further and improve formatting a bit
106
+
107
+ Documentation updates.
108
+ source: <cover.1711398665.git.dsimic@manjaro.org>
109
+
110
+
111
+* jc/release-notes-entry-experiment (2024-03-26) 1 commit
112
+ (merged to 'next' on 2024-03-27 at 74ebe224e9)
113
+ + SubmittingPatches: release-notes entry experiment
114
+
115
+ Introduce an experimental protocol for contributors to propose the
116
+ topic description to be used in the "What's cooking" report, the
117
+ merge commit message for the topic, and in the release notes and
118
+ document it in the SubmittingPatches document.
119
+ source: <xmqq8r26eyva.fsf@gitster.g>
120
+
121
+
122
+* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
123
+ (merged to 'next' on 2024-03-25 at 7c3dd28ca5)
124
+ + doc/gitremote-helpers: fix more missing single-quotes
125
+
126
+ Documentation mark-up fix.
127
+ source: <20240320091748.GA2444639@coredump.intra.peff.net>
128
+
129
+
130
+* jk/pretty-subject-cleanup (2024-03-22) 7 commits
131
+ (merged to 'next' on 2024-03-22 at 2796f347ad)
132
+ + format-patch: fix leak of empty header string
133
+ + format-patch: simplify after-subject MIME header handling
134
+ + format-patch: return an allocated string from log_write_email_headers()
135
+ + log: do not set up extra_headers for non-email formats
136
+ + pretty: drop print_email_subject flag
137
+ + pretty: split oneline and email subject printing
138
+ + shortlog: stop setting pp.print_email_subject
139
+
140
+ Code clean-up in the "git log" machinery that implements custom log
141
+ message formatting.
142
+ source: <20240320002555.GB903718@coredump.intra.peff.net>
143
+
144
+
145
+* jk/rebase-apply-leakfix (2024-03-22) 1 commit
146
+ (merged to 'next' on 2024-03-25 at f9358272af)
147
+ + rebase: use child_process_clear() to clean
148
+
149
+ Leakfix.
150
+ source: <20240322103502.GA2045297@coredump.intra.peff.net>
151
+
152
+
153
+* jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits
154
+ (merged to 'next' on 2024-03-27 at 5c9d5be660)
155
+ + transport-helper: send "true" value for object-format option
156
+ + transport-helper: drop "object-format <algo>" option
157
+ + transport-helper: use write helpers more consistently
158
+
159
+ The implementation and documentation of "object-format" option
160
+ exchange between the Git itself and its remote helpers did not
161
+ quite match, which has been corrected.
162
+ source: <20240320093226.GA2445531@coredump.intra.peff.net>
163
+
164
+
165
+* pb/advice-merge-conflict (2024-03-18) 2 commits
166
+ (merged to 'next' on 2024-03-25 at 4414e31d81)
167
+ + builtin/am: allow disabling conflict advice
168
+ + sequencer: allow disabling conflict advice
169
+
170
+ Hints that suggest what to do after resolving conflicts can now be
171
+ squelched by disabling advice.mergeConflict.
172
+
173
+ Acked-by: Phillip Wood <phillip.wood123@gmail.com>
174
+ cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>
175
+ source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
176
+
177
+
178
+* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
179
+ (merged to 'next' on 2024-03-27 at 9ef22a39b6)
180
+ + t/README: mention test files are make targets
181
+
182
+ The t/README file now gives a hint on running individual tests in
183
+ the "t/" directory with "make t<num>-*.sh t<num>-*.sh".
184
+ source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>
185
+
186
+
187
+* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
188
+ (merged to 'next' on 2024-03-25 at 8d11bd8bd4)
189
+ + t5601: exercise clones with "includeIf.*.onbranch"
190
+
191
+ An additional test to demonstrate that clone would not choke on a
192
+ global configuration file that uses includeIf.onbranch:*.path.
193
+ source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
194
+
195
+
196
+* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
197
+ (merged to 'next' on 2024-03-25 at 4d3d391330)
198
+ + reftable: fix tests being broken by NFS' delete-after-close semantics
199
+
200
+ A unit test for reftable code tried to enumerate all files in a
201
+ directory after reftable operations and expected to see nothing but
202
+ the files it wanted to leave there, but was fooled by .nfs* cruft
203
+ files left, which has been corrected.
204
+ source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>
205
+
206
+
207
+* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
208
+ (merged to 'next' on 2024-03-25 at e7b1ec4df4)
209
+ + t/README: document how to loop around test cases
210
+ + t7800: use single quotes for test bodies
211
+ + t7800: improve test descriptions with empty arguments
212
+
213
+ Fix the way recently added tests interpolate variables defined
214
+ outside them, and document the best practice to help future
215
+ developers.
216
+ source: <cover.1711074118.git.ps@pks.im>
217
+
218
+
219
+* pw/checkout-conflict-errorfix (2024-03-14) 5 commits
220
+ (merged to 'next' on 2024-03-22 at 9977ac6c75)
221
+ + checkout: fix interaction between --conflict and --merge
222
+ + checkout: cleanup --conflict=<style> parsing
223
+ + merge options: add a conflict style member
224
+ + merge-ll: introduce LL_MERGE_OPTIONS_INIT
225
+ + xdiff-interface: refactor parsing of merge.conflictstyle
226
+
227
+ "git checkout --conflict=bad" reported a bad conflictStyle as if it
228
+ were given to a configuration variable; it has been corrected to
229
+ report that the command line option is bad.
230
+ source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>
231
+
232
+
233
+* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
234
+ (merged to 'next' on 2024-03-27 at 16969df3e8)
235
+ + midx: use strvec_pushf() for pack-objects base name
236
+ (this branch is used by tb/midx-write.)
237
+
238
+ Code clean-up.
239
+ source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>
240
+
241
+
242
+* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
243
+ (merged to 'next' on 2024-03-27 at 1f9dbf70a0)
244
+ + cat-file: use strbuf_expand_bad_format()
245
+ + factor out strbuf_expand_bad_format()
246
+
247
+ Code clean-up.
248
+ source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>
249
+
250
--------------------------------------------------
251
[New Topics]
252
253
+* kn/clarify-update-ref-doc (2024-04-02) 2 commits
254
+ (merged to 'next' on 2024-04-02 at d1b9c5aa67)
255
+ + githooks: use {old,new}-oid instead of {old,new}-value
256
+ + update-ref: use {old,new}-oid instead of {old,new}value
257
+
258
+ Doc update, as a preparation to enhance "git update-ref --stdin".
259
+
260
+ Will merge to 'master'.
261
+ source: <20240402064915.191104-1-knayak@gitlab.com>
262
+
263
+
264
+* vs/complete-with-set-u-fix (2024-04-01) 2 commits
265
+ (merged to 'next' on 2024-04-02 at d8f6a511e8)
266
+ + completion: protect prompt against unset SHOWUPSTREAM in nounset mode
267
+ + completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode
268
+
269
+ Another "set -u" fix for the bash prompt (in contrib/) script.
270
+
271
+ Will merge to 'master'.
272
+ source: <20240401190751.8676-1-ville.skytta@iki.fi>
273
+
274
+
275
+* ba/osxkeychain-updates (2024-04-01) 4 commits
276
+ - osxkeychain: store new attributes
277
+ - osxkeychain: erase matching passwords only
278
+ - osxkeychain: erase all matching credentials
279
+ - osxkeychain: replace deprecated SecKeychain API
280
+
281
+ Update osxkeychain backend with features required for the recent
282
+ credential subsystem.
283
+
284
+ Will merge to 'next'?
285
+ source: <pull.1667.git.1708212896.gitgitgadget@gmail.com>
286
+
287
+
288
+* rs/imap-send-use-xsnprintf (2024-04-02) 1 commit
289
+ - imap-send: use xsnprintf to format command
290
+
291
+ Code clean-up and duplicate reduction.
292
+
293
+ Will merge to 'next'.
294
+ source: <f9ad9f41-5b9b-474e-9818-f91fc937daae@web.de>
295
+
296
+
297
+* tb/midx-write (2024-04-01) 5 commits
298
+ - midx-write.c: use `--stdin-packs` when repacking
299
+ - midx-write.c: check count of packs to repack after grouping
300
+ - midx-write.c: factor out common want_included_pack() routine
301
+ - midx-write: move writing-related functions from midx.c
302
+ - Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-write
303
+
304
+ Code clean-up by splitting code responsible for writing midx files
305
+ into its own file.
306
+
307
+ Will merge to 'next'?
308
+ source: <cover.1712006190.git.me@ttaylorr.com>
309
+
310
+
311
+* jc/t2104-style-update (2024-04-02) 1 commit
312
+ (merged to 'next' on 2024-04-03 at 0449835479)
313
+ + t2104: style fixes
314
+
315
+ Coding style fixes.
316
+
317
+ Will merge to 'master'.
318
+ source: <xmqqmsqb4ngg.fsf@gitster.g>
319
+
320
+
321
+* rs/t-prio-queue-cleanup (2024-04-02) 1 commit
322
+ - t-prio-queue: simplify using compound literals
323
+
324
+ t-prio-queue test has been cleaned up by using C99 compound
325
+ literals; this is meant to also serve as a weather-balloon to smoke
326
+ out folks with compilers who have trouble compiling code that uses
327
+ the feature.
328
+
329
+ Will merge to 'next'?
330
+ source: <520da361-1b80-4ba3-87b2-86d6fdfc18b5@web.de>
331
+
332
+
333
+* jk/libcurl-8.7-regression-workaround (2024-04-02) 2 commits
334
+ - INSTALL: bump libcurl version to 7.21.3
335
+ - http: reset POSTFIELDSIZE when clearing curl handle
336
+
337
+ Fix was added to work around a regression in libcURL 8.7.0 (which has
338
+ already been fixed in their tip of the tree).
339
+
340
+ Expecting a reroll.
341
+ cf. <20240403032045.GA1559972@coredump.intra.peff.net>
342
+ source: <20240402200254.GA874754@coredump.intra.peff.net>
343
+
344
+
345
+* tb/t7700-fixup (2024-04-03) 1 commit
346
+ - t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1 `
347
+
348
+ source: <7e8d435d58eea19d2aae0be366720f5956d29a5d.1712075189.git.me@ttaylorr.com>
349
+
350
+--------------------------------------------------
351
+[Cooking]
352
+
353
* es/test-cron-safety (2024-03-31) 1 commit
52
- - test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback
354
+ (merged to 'next' on 2024-04-02 at e383c8cfb2)
355
+ + test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback
356
357
The test script had an incomplete and ineffective attempt to avoid
358
clobbering the testing user's real crontab (and its equivalents),
359
which has been completed.
360
58
- Will merge to 'next'.
361
+ Will merge to 'master'.
362
source: <20240329222703.9343-1-ericsunshine@charter.net>
363
364
62
-* gt/add-u-commit-i-pathspec-check (2024-03-29) 3 commits
365
+* gt/add-u-commit-i-pathspec-check (2024-04-03) 3 commits
366
- builtin/add: error out when passing untracked path with -u
367
- builtin/commit: error out when passing untracked path with -i
65
- - read-cache: optionally collect pathspec matching info
368
+ - revision: optionally record matches with pathspec elements
369
370
"git add -u <pathspec>" and "git commit [-i] <pathspec>" did not
371
diagnose a pathspec element that did not match any files in certain
372
situations, unlike "git add <pathspec>" did.
373
71
- Comments?
72
- source: <20240318155219.494206-2-shyamthakkar001@gmail.com>
374
+ Will merge to 'next'?
375
+ source: <20240402213640.139682-2-shyamthakkar001@gmail.com>
376
377
378
* jc/advice-sans-trailing-whitespace (2024-03-29) 1 commit
76
- - advice: omit trailing whitespace
379
+ (merged to 'next' on 2024-04-02 at 3cb0fda1bf)
380
+ + advice: omit trailing whitespace
381
382
The "hint:" messages given by the advice mechanism, when given a
383
message with a blank line, left a line with trailing whitespace,
384
which has been cleansed.
385
82
- Will merge to 'next'.
386
+ Will merge to 'master'.
387
source: <xmqq4jcooddp.fsf@gitster.g>
388
389
86
-* jt/reftable-geometric-compaction (2024-03-29) 3 commits
87
- - reftable/stack: make segment end inclusive
88
- - reftable/stack: use geometric table compaction
89
- - reftable/stack: add env to disable autocompaction
390
+* jt/reftable-geometric-compaction (2024-04-03) 2 commits
391
+ . reftable/stack: use geometric table compaction
392
+ . reftable/stack: add env to disable autocompaction
393
394
The strategy to compat multiple tables of reftables after many
395
operations accumulate many entries has been improved to avoid
396
accumulating too many tables uncollected.
397
95
- Will merge to 'next'?
96
- cf. <Zfzd_yxeXWWTJdyP@tanuki>
97
- source: <pull.1683.v3.git.1711685809.gitgitgadget@gmail.com>
398
+ Expecting a reroll.
399
+ cf. <b24jjzw72rlcpctteokr5yfbuwuy2cc3qvibzhuju4gbj63lfa@gbtsmvufyuhd>
400
+ source: <pull.1683.v4.git.1712103636.gitgitgadget@gmail.com>
401
402
403
* ds/typofix-core-config-doc (2024-03-31) 1 commit
101
- - config: fix some small capitalization issues, as spotted
404
+ (merged to 'next' on 2024-04-02 at 79496fcfc4)
405
+ + config: fix some small capitalization issues, as spotted
406
407
Typofix.
408
105
- Will merge to 'next'.
409
+ Will merge to 'master'.
410
source: <26135b06c48565ee8ac6dcfc1ef5431511e6202c.1711918168.git.dsimic@manjaro.org>
411
412
@@ -113,32 +417,32 @@ Release tarballs are available at:
417
HEAD state, gave the tracking information for the 'foo' branch,
418
which was pointless.
419
116
- Comments?
420
+ Will merge to 'next'?
421
source: <xmqqa5mfl7ud.fsf@gitster.g>
422
423
424
* rj/use-adv-if-enabled (2024-03-30) 3 commits
121
- - add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO
122
- - add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
123
- - add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
425
+ (merged to 'next' on 2024-04-02 at 31d4453035)
426
+ + add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO
427
+ + add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
428
+ + add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE
429
430
Use advice_if_enabled() API to rewrite a simple pattern to
431
call advise() after checking advice_enabled().
432
128
- Will merge to 'next'?
433
+ Will merge to 'master'.
434
source: <46fba030-d7aa-49d2-88fa-e506850f7b6a@gmail.com>
435
436
437
* rs/mem-pool-size-t-safety (2024-03-31) 1 commit
133
- - mem-pool: use st_add() in mem_pool_strvfmt()
438
+ (merged to 'next' on 2024-04-02 at 3517d48210)
439
+ + mem-pool: use st_add() in mem_pool_strvfmt()
440
441
size_t arithmetic safety.
442
137
- Will merge to 'next'.
443
+ Will merge to 'master'.
444
source: <bbe00b9e-64d8-4ec8-a2b9-2c6917c72dbd@web.de>
445
140
---------------------------------------------------
141
-[Cooking]
446
447
* ew/khash-to-khashl (2024-03-28) 3 commits
448
- khashl: fix ensemble lookups on empty table
@@ -171,25 +475,16 @@ Release tarballs are available at:
475
476
477
* rj/add-p-explicit-reshow (2024-03-29) 2 commits
174
- - add-patch: do not print hunks repeatedly
175
- - add-patch: introduce 'p' in interactive-patch
478
+ (merged to 'next' on 2024-04-02 at 05c7e930af)
479
+ + add-patch: do not print hunks repeatedly
480
+ + add-patch: introduce 'p' in interactive-patch
481
482
"git add -p" and other "interactive hunk selection" UI has learned to
483
skip showing the hunk immediately after it has already been shown, and
484
an additional action to explicitly ask to reshow the current hunk.
485
181
- Will merge to 'next'?
182
- source: <a9c515fe-6664-4b5d-abca-d88fdd32a883@gmail.com>
183
-
184
-
185
-* az/grep-group-error-message-update (2024-03-25) 1 commit
186
- (merged to 'next' on 2024-03-27 at 567bf00ed4)
187
- + grep: improve errors for unmatched ( and )
188
-
189
- Error message clarification.
190
-
486
Will merge to 'master'.
192
- source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>
487
+ source: <a9c515fe-6664-4b5d-abca-d88fdd32a883@gmail.com>
488
489
490
* bc/credential-scheme-enhancement (2024-03-27) 12 commits
@@ -215,67 +510,33 @@ Release tarballs are available at:
510
source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
511
512
218
-* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
219
- (merged to 'next' on 2024-03-28 at e2749914ab)
220
- + pretty: find pretty formats case-insensitively
221
- + pretty: update tests to use `test_config`
222
-
223
- The "--pretty=<shortHand>" option of the commands in the "git log"
224
- family, defined as "[pretty] shortHand = <expansion>" should have
225
- been looked up case insensitively, but was not, which has been
226
- corrected.
227
-
228
- Will merge to 'master'.
229
- source: <20240324214316.917513-1-brianmlyles@gmail.com>
230
-
231
-
232
-* ds/grep-doc-updates (2024-03-25) 2 commits
233
- (merged to 'next' on 2024-03-27 at 681f08cbc5)
234
- + grep docs: describe --no-index further and improve formatting a bit
235
- + grep docs: describe --recurse-submodules further and improve formatting a bit
236
-
237
- Documentation updates.
238
-
239
- Will merge to 'master'.
240
- source: <cover.1711398665.git.dsimic@manjaro.org>
241
-
242
-
513
* ja/doc-markup-updates (2024-03-29) 5 commits
244
- - doc: git-clone: do not autoreference the manpage in itself
245
- - doc: git-clone: apply new documentation formatting guidelines
246
- - doc: git-init: apply new documentation formatting guidelines
247
- - doc: allow literal and emphasis format in doc vs help tests
248
- - doc: rework CodingGuidelines with new formatting rules
514
+ (merged to 'next' on 2024-04-02 at 69b015d7ce)
515
+ + doc: git-clone: do not autoreference the manpage in itself
516
+ + doc: git-clone: apply new documentation formatting guidelines
517
+ + doc: git-init: apply new documentation formatting guidelines
518
+ + doc: allow literal and emphasis format in doc vs help tests
519
+ + doc: rework CodingGuidelines with new formatting rules
520
521
Documentation rules has been explicitly described how to mark-up
522
literal parts and a few manual pages have been updated as examples.
523
253
- Will merge to 'next'?
524
+ Will merge to 'master'.
525
source: <pull.1702.v2.git.1711711181.gitgitgadget@gmail.com>
526
527
528
* mg/editorconfig-makefile (2024-03-23) 1 commit
258
- - editorconfig: add Makefiles to "text files"
529
+ (merged to 'next' on 2024-04-02 at 907b55579e)
530
+ + editorconfig: add Makefiles to "text files"
531
532
The .editorconfig file has been taught that a Makefile uses HT
533
indentation.
534
263
- Will merge to 'next'?
264
- source: <20240322221813.13019-1-mg@max.gautier.name>
265
-
266
-
267
-* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
268
- (merged to 'next' on 2024-03-27 at 9ef22a39b6)
269
- + t/README: mention test files are make targets
270
-
271
- The README now gives a hint on running individual tests in the "t/"
272
- directory with "make t<num>-*.sh t<num>-*.sh".
273
-
535
Will merge to 'master'.
275
- source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>
536
+ source: <20240322221813.13019-1-mg@max.gautier.name>
537
538
278
-* ps/reftable-binsearch-updates (2024-03-25) 7 commits
539
+* ps/reftable-binsearch-updates (2024-04-03) 7 commits
540
- reftable/block: avoid decoding keys when searching restart points
541
- reftable/record: extract function to decode key lengths
542
- reftable/block: fix error handling when searching restart points
@@ -286,66 +547,8 @@ Release tarballs are available at:
547
548
Reftable code clean-up and some bugfixes.
549
289
- Needs review.
290
- source: <cover.1711361340.git.ps@pks.im>
291
-
292
-
293
-* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
294
- (merged to 'next' on 2024-03-27 at 16969df3e8)
295
- + midx: use strvec_pushf() for pack-objects base name
296
-
297
- Code clean-up.
298
-
299
- Will merge to 'master'.
300
- source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>
301
-
302
-
303
-* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
304
- (merged to 'next' on 2024-03-27 at 1f9dbf70a0)
305
- + cat-file: use strbuf_expand_bad_format()
306
- + factor out strbuf_expand_bad_format()
307
-
308
- Code clean-up.
309
-
310
- Will merge to 'master'.
311
- source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>
312
-
313
-
314
-* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
315
- (merged to 'next' on 2024-03-25 at 7c3dd28ca5)
316
- + doc/gitremote-helpers: fix more missing single-quotes
317
-
318
- Documentation mark-up fix.
319
-
320
- Will merge to 'master'.
321
- source: <20240320091748.GA2444639@coredump.intra.peff.net>
322
-
323
-
324
-* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
325
- (merged to 'next' on 2024-03-25 at 4d3d391330)
326
- + reftable: fix tests being broken by NFS' delete-after-close semantics
327
-
328
- A unit test for reftable code tried to enumerate all files in a
329
- directory after reftable operations and expected to see nothing but
330
- the files it wanted to leave there, but was fooled by .nfs* cruft
331
- files left, which has been corrected.
332
-
333
- Will merge to 'master'.
334
- source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>
335
-
336
-
337
-* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
338
- (merged to 'next' on 2024-03-25 at e7b1ec4df4)
339
- + t/README: document how to loop around test cases
340
- + t7800: use single quotes for test bodies
341
- + t7800: improve test descriptions with empty arguments
342
-
343
- Fix the way recently added tests interpolate variables defined
344
- outside them, and document the best practice to help future
345
- developers.
346
-
347
- Will merge to 'master'.
348
- source: <cover.1711074118.git.ps@pks.im>
550
+ Will merge to 'next'?
551
+ source: <cover.1712123093.git.ps@pks.im>
552
553
554
* tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits
@@ -384,58 +587,23 @@ Release tarballs are available at:
587
source: <cover.1710972293.git.me@ttaylorr.com>
588
589
387
-* jc/release-notes-entry-experiment (2024-03-26) 1 commit
388
- (merged to 'next' on 2024-03-27 at 74ebe224e9)
389
- + SubmittingPatches: release-notes entry experiment
390
-
391
- Introduce an experimental protocol for contributors to propose the
392
- topic description to be used in the "What's cooking" report, the
393
- merge commit message for the topic, and in the release notes and
394
- document it in the SubmittingPatches document.
395
-
396
- Will merge to 'master'.
397
- source: <xmqq8r26eyva.fsf@gitster.g>
398
-
399
-
400
-* jk/rebase-apply-leakfix (2024-03-22) 1 commit
401
- (merged to 'next' on 2024-03-25 at f9358272af)
402
- + rebase: use child_process_clear() to clean
403
-
404
- Leakfix.
405
-
406
- Will merge to 'master'.
407
- source: <20240322103502.GA2045297@coredump.intra.peff.net>
408
-
409
-
590
* dg/myfirstobjectwalk-updates (2024-03-27) 5 commits
411
- - MyFirstObjectWalk: add stderr to pipe processing
412
- - MyFirstObjectWalk: fix description for counting omitted objects
413
- - MyFirstObjectWalk: fix filtered object walk
414
- - MyFirstObjectWalk: fix misspelled "builtins/"
415
- - MyFirstObjectWalk: use additional arg in config_fn_t
591
+ (merged to 'next' on 2024-04-02 at effa6a98a6)
592
+ + MyFirstObjectWalk: add stderr to pipe processing
593
+ + MyFirstObjectWalk: fix description for counting omitted objects
594
+ + MyFirstObjectWalk: fix filtered object walk
595
+ + MyFirstObjectWalk: fix misspelled "builtins/"
596
+ + MyFirstObjectWalk: use additional arg in config_fn_t
597
598
Update a more recent tutorial doc.
599
419
- Will merge to 'next'?
420
- source: <cover.1711537370.git.dirk@gouders.net>
421
-
422
-
423
-* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
424
- (merged to 'next' on 2024-03-25 at f3393cabe5)
425
- + config.txt: describe handling of whitespace further
426
- + t1300: add more tests for whitespace and inline comments
427
- + config: really keep value-internal whitespace verbatim
428
- + config: minor addition of whitespace
429
-
430
- "git config" corrupted literal HT characters written in the
431
- configuration file as part of a value, which has been corrected.
432
-
600
Will merge to 'master'.
434
- source: <cover.1711001016.git.dsimic@manjaro.org>
601
+ source: <cover.1711537370.git.dirk@gouders.net>
602
603
604
* jc/apply-parse-diff-git-header-names-fix (2024-03-29) 3 commits
438
- - t4126: fix "funny directory name" test on Windows (again)
605
+ (merged to 'next' on 2024-04-02 at d1fa726c41)
606
+ + t4126: fix "funny directory name" test on Windows (again)
607
(merged to 'next' on 2024-03-28 at a35de15836)
608
+ t4126: make sure a directory with SP at the end is usable
609
(merged to 'next' on 2024-03-27 at d586367985)
@@ -445,29 +613,12 @@ Release tarballs are available at:
613
when the change was about an empty file created in or deleted from
614
a directory whose name ends with a SP, which has been corrected.
615
448
- Will merge to 'next'?
616
+ Will merge to 'master'.
617
source: <xmqqfrwlltjn.fsf@gitster.g>
618
source: <xmqqh6gqt674.fsf_-_@gitster.g>
619
source: <xmqq5xx50x8p.fsf_-_@gitster.g>
620
621
454
-* jk/pretty-subject-cleanup (2024-03-22) 7 commits
455
- (merged to 'next' on 2024-03-22 at 2796f347ad)
456
- + format-patch: fix leak of empty header string
457
- + format-patch: simplify after-subject MIME header handling
458
- + format-patch: return an allocated string from log_write_email_headers()
459
- + log: do not set up extra_headers for non-email formats
460
- + pretty: drop print_email_subject flag
461
- + pretty: split oneline and email subject printing
462
- + shortlog: stop setting pp.print_email_subject
463
-
464
- Code clean-up in the "git log" machinery that implements custom log
465
- message formatting.
466
-
467
- Will merge to 'master'.
468
- source: <20240320002555.GB903718@coredump.intra.peff.net>
469
-
470
-
622
* la/hide-trailer-info (2024-03-16) 7 commits
623
- trailer: retire trailer_info_get() from API
624
- trailer: make trailer_info struct private
@@ -484,38 +635,24 @@ Release tarballs are available at:
635
source: <pull.1696.git.1710570428.gitgitgadget@gmail.com>
636
637
487
-* pb/advice-merge-conflict (2024-03-18) 2 commits
488
- (merged to 'next' on 2024-03-25 at 4414e31d81)
489
- + builtin/am: allow disabling conflict advice
490
- + sequencer: allow disabling conflict advice
491
-
492
- Hints that suggest what to do after resolving conflicts can now be
493
- squelched by disabling advice.mergeConflict.
494
-
495
- Acked-by: Phillip Wood <phillip.wood123@gmail.com>
496
- cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>
497
-
498
- Will merge to 'master'.
499
- source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
500
-
501
-
638
* ps/pack-refs-auto (2024-03-25) 16 commits
503
- - builtin/gc: pack refs when using `git maintenance run --auto`
504
- - builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
505
- - t6500: extract objects with "17" prefix
506
- - builtin/gc: move `struct maintenance_run_opts`
507
- - builtin/pack-refs: introduce new "--auto" flag
508
- - builtin/pack-refs: release allocated memory
509
- - refs/reftable: expose auto compaction via new flag
510
- - refs: remove `PACK_REFS_ALL` flag
511
- - refs: move `struct pack_refs_opts` to where it's used
512
- - t/helper: drop pack-refs wrapper
513
- - refs/reftable: print errors on compaction failure
514
- - reftable/stack: gracefully handle failed auto-compaction due to locks
515
- - reftable/stack: use error codes when locking fails during compaction
516
- - reftable/error: discern locked/outdated errors
517
- - reftable/stack: fix error handling in `reftable_stack_init_addition()`
518
- - Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
639
+ (merged to 'next' on 2024-04-02 at 1d76dc3648)
640
+ + builtin/gc: pack refs when using `git maintenance run --auto`
641
+ + builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
642
+ + t6500: extract objects with "17" prefix
643
+ + builtin/gc: move `struct maintenance_run_opts`
644
+ + builtin/pack-refs: introduce new "--auto" flag
645
+ + builtin/pack-refs: release allocated memory
646
+ + refs/reftable: expose auto compaction via new flag
647
+ + refs: remove `PACK_REFS_ALL` flag
648
+ + refs: move `struct pack_refs_opts` to where it's used
649
+ + t/helper: drop pack-refs wrapper
650
+ + refs/reftable: print errors on compaction failure
651
+ + reftable/stack: gracefully handle failed auto-compaction due to locks
652
+ + reftable/stack: use error codes when locking fails during compaction
653
+ + reftable/error: discern locked/outdated errors
654
+ + reftable/stack: fix error handling in `reftable_stack_init_addition()`
655
+ + Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto
656
657
"git pack-refs" learned the "--auto" option, which is a useful
658
addition to be triggered from "git gc --auto".
@@ -523,18 +660,8 @@ Release tarballs are available at:
660
Acked-by: Karthik Nayak <karthik.188@gmail.com>
661
cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
662
526
- Will merge to 'next'.
527
- source: <cover.1711360631.git.ps@pks.im>
528
-
529
-
530
-* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
531
- (merged to 'next' on 2024-03-25 at 8d11bd8bd4)
532
- + t5601: exercise clones with "includeIf.*.onbranch"
533
-
534
- An additional test to demonstrate something I am not sure what.
535
-
663
Will merge to 'master'.
537
- source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
664
+ source: <cover.1711360631.git.ps@pks.im>
665
666
667
* ds/doc-config-reflow (2024-03-14) 1 commit
@@ -575,43 +702,6 @@ Release tarballs are available at:
702
source: <pull.1681.v2.git.1709824540636.gitgitgadget@gmail.com>
703
704
578
-* pw/checkout-conflict-errorfix (2024-03-14) 5 commits
579
- (merged to 'next' on 2024-03-22 at 9977ac6c75)
580
- + checkout: fix interaction between --conflict and --merge
581
- + checkout: cleanup --conflict=<style> parsing
582
- + merge options: add a conflict style member
583
- + merge-ll: introduce LL_MERGE_OPTIONS_INIT
584
- + xdiff-interface: refactor parsing of merge.conflictstyle
585
-
586
- "git checkout --conflict=bad" reported a bad conflictStyle as if it
587
- were given to a configuration variable; it has been corrected to
588
- report that the command line option is bad.
589
-
590
- Will merge to 'master'.
591
- source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>
592
-
593
-
594
-* bl/cherry-pick-empty (2024-03-25) 7 commits
595
- (merged to 'next' on 2024-03-28 at 22e8e4a68e)
596
- + cherry-pick: add `--empty` for more robust redundant commit handling
597
- + cherry-pick: enforce `--keep-redundant-commits` incompatibility
598
- + sequencer: do not require `allow_empty` for redundant commit options
599
- + sequencer: handle unborn branch with `--allow-empty`
600
- + rebase: update `--empty=ask` to `--empty=stop`
601
- + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
602
- + docs: address inaccurate `--empty` default with `--exec`
603
-
604
- Allow git-cherry-pick(1) to automatically drop redundant commits via
605
- a new `--empty` option, similar to the `--empty` options for
606
- git-rebase(1) and git-am(1). Includes a soft deprecation of
607
- `--keep-redundant-commits` as well as some related docs changes and
608
- sequencer code cleanup.
609
-
610
- Will merge to 'master'.
611
- cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
612
- source: <20240119060721.3734775-2-brianmlyles@gmail.com>
613
-
614
-
705
* ie/config-includeif-hostname (2024-03-19) 2 commits
706
- config: learn the "hostname:" includeIf condition
707
- t: add a test helper for getting hostname
@@ -625,20 +715,6 @@ Release tarballs are available at:
715
source: <20240319183722.211300-1-ignacio@iencinas.com>
716
717
628
-* jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits
629
- (merged to 'next' on 2024-03-27 at 5c9d5be660)
630
- + transport-helper: send "true" value for object-format option
631
- + transport-helper: drop "object-format <algo>" option
632
- + transport-helper: use write helpers more consistently
633
-
634
- The implementation and documentation of "object-format" option
635
- exchange between the Git itself and its remote helpers did not
636
- quite match.
637
-
638
- Will merge to 'master'.
639
- source: <20240320093226.GA2445531@coredump.intra.peff.net>
640
-
641
-
718
* jk/core-comment-string (2024-03-27) 17 commits
719
(merged to 'next' on 2024-03-28 at fbf8eb9331)
720
+ config: add core.commentString
@@ -681,13 +757,13 @@ Release tarballs are available at:
757
source: <cover.1709673020.git.steadmon@google.com>
758
759
684
-* sj/userdiff-c-sharp (2024-03-28) 1 commit
760
+* sj/userdiff-c-sharp (2024-04-03) 1 commit
761
- userdiff: better method/property matching for C#
762
763
The userdiff patterns for C# has been updated.
764
689
- Needs review.
690
- source: <pull.1682.v4.git.git.1711653257043.gitgitgadget@gmail.com>
765
+ Will merge to 'next'?
766
+ source: <pull.1682.v5.git.git.1712180564927.gitgitgadget@gmail.com>
767
768
769
* cw/git-std-lib (2024-02-28) 4 commits