What's cooking (2024/03 #08)
Junio C Hamano committed
Mar 26, 2024 at 11:29 UTC
567bbef5cfe16f4807ddd4f61c92c355326a23ca
1 file changed
+230
-246
whats-cooking.txt
+230
-246
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2024, #07; Fri, 22)
3
-X-master-at: 11c821f2f2a31e70fb5cc449f9a29401c333aad2
4
-X-next-at: 2796f347adbd255e43ba5d93f092851042834c28
2
+Subject: What's cooking in git.git (Mar 2024, #08; Tue, 26)
3
+X-master-at: c75fd8d8150afdf836b63a8e0534d9b9e3e111ba
4
+X-next-at: e103d9ffe4204bcd16a16bb8522827b4e6855422
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2024, #07; Fri, 22)
7
+What's cooking in git.git (Mar 2024, #08; Tue, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,153 +48,222 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* bb/iso-strict-utc (2024-03-13) 1 commit
52
- (merged to 'next' on 2024-03-14 at d2ac616873)
53
- + date: make "iso-strict" conforming for the UTC timezone
51
+* bb/sh-scripts-cleanup (2024-03-16) 22 commits
52
+ (merged to 'next' on 2024-03-18 at 4501a04796)
53
+ + git-quiltimport: avoid an unnecessary subshell
54
+ + contrib/coverage-diff: avoid redundant pipelines
55
+ + t/t9*: merge "grep | sed" pipelines
56
+ + t/t8*: merge "grep | sed" pipelines
57
+ + t/t5*: merge a "grep | sed" pipeline
58
+ + t/t4*: merge a "grep | sed" pipeline
59
+ + t/t3*: merge a "grep | awk" pipeline
60
+ + t/t1*: merge a "grep | sed" pipeline
61
+ + t/t9*: avoid redundant uses of cat
62
+ + t/t8*: avoid redundant use of cat
63
+ + t/t7*: avoid redundant use of cat
64
+ + t/t6*: avoid redundant uses of cat
65
+ + t/t5*: avoid redundant uses of cat
66
+ + t/t4*: avoid redundant uses of cat
67
+ + t/t3*: avoid redundant uses of cat
68
+ + t/t1*: avoid redundant uses of cat
69
+ + t/t0*: avoid redundant uses of cat
70
+ + t/perf: avoid redundant use of cat
71
+ + t/annotate-tests.sh: avoid redundant use of cat
72
+ + t/lib-cvs.sh: avoid redundant use of cat
73
+ + contrib/subtree/t: avoid redundant use of cat
74
+ + doc: avoid redundant use of cat
75
55
- The output format for dates "iso-strict" has been tweaked to show
56
- a time in the Zulu timezone with "Z" suffix, instead of "+00:00".
57
- source: <20240313225423.11373-1-dev+git@drbeat.li>
76
+ Shell scripts clean-up.
77
+ source: <20240315194620.10713-1-dev+git@drbeat.li>
78
79
60
-* bb/t0006-negative-tz-offset (2024-03-14) 1 commit
61
- (merged to 'next' on 2024-03-14 at 3f4751b6b2)
62
- + t0006: add more tests with a negative TZ offset
80
+* bl/doc-config-fixes (2024-03-16) 2 commits
81
+ (merged to 'next' on 2024-03-18 at a9038d5a9e)
82
+ + docs: fix typo in git-config `--default`
83
+ + docs: clarify file options in git-config `--edit`
84
64
- More tests on showing time with negative TZ offset.
65
- source: <20240314085512.1827031-1-dev+git@drbeat.li>
85
+ A few typoes in "git config --help" have been corrected.
86
+ source: <20240316050149.1182867-2-brianmlyles@gmail.com>
87
88
68
-* dg/user-manual-hash-example (2024-03-12) 1 commit
69
- (merged to 'next' on 2024-03-14 at 767800d3a7)
70
- + Documentation/user-manual.txt: example for generating object hashes
89
+* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
90
+ (merged to 'next' on 2024-03-18 at b2e1babb85)
91
+ + docs: adjust trailer `separator` and `key_value_separator` language
92
+ + docs: correct trailer `key_value_separator` description
93
72
- User manual (the original one) update.
73
- source: <20240312104238.4920-2-dirk@gouders.net>
94
+ The documentation for "%(trailers[:options])" placeholder in the
95
+ "--pretty" option of commands in the "git log" family has been
96
+ updated.
97
+ source: <20240316035612.752910-1-brianmlyles@gmail.com>
98
99
76
-* fs/find-end-of-log-message-fix (2024-03-07) 1 commit
77
- (merged to 'next' on 2024-03-13 at 2bed63caaf)
78
- + wt-status: don't find scissors line beyond buf len
100
+* ja/doc-formatting-fix (2024-03-16) 2 commits
101
+ (merged to 'next' on 2024-03-18 at edde7a576d)
102
+ + doc: fix some placeholders formating
103
+ + doc: format alternatives in synopsis
104
80
- The code to find the effective end of log message can fall into an
81
- endless loop, which has been corrected.
82
- cf. <08b9b37d-f0f8-4c1a-b72e-194202ff3d9f@nutanix.com>
83
- source: <20240307183743.219951-1-flosch@nutanix.com>
105
+ Documentation mark-up fix.
106
+ source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
107
108
86
-* ja/doc-markup-fixes (2024-03-11) 6 commits
87
- (merged to 'next' on 2024-03-14 at 4d1c26143f)
88
- + doc: git-clone: format placeholders
89
- + doc: git-clone: format verbatim words
90
- + doc: git-init: rework config item init.templateDir
91
- + doc: git-init: rework definition lists
92
- + doc: git-init: format placeholders
93
- + doc: git-init: format verbatim parts
109
+* jc/index-pack-fsck-levels (2024-03-15) 1 commit
110
+ (merged to 'next' on 2024-03-18 at 243c5f4125)
111
+ + t5300: fix test_with_bad_commit()
112
95
- Mark-ups used in the documentation has been improved for
96
- consistency.
97
- source: <pull.1687.git.1710097830.gitgitgadget@gmail.com>
113
+ Test fix.
114
+ source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
115
116
100
-* jc/safe-implicit-bare (2024-03-11) 1 commit
101
- (merged to 'next' on 2024-03-14 at e8bdbed1a4)
102
- + setup: notice more types of implicit bare repositories
117
+* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
118
+ (merged to 'next' on 2024-03-18 at 180db8ec38)
119
+ + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
120
104
- Users with safe.bareRepository=explicit can still work from within
105
- $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/)
106
- of the primary worktree without explicitly specifying the $GIT_DIR
107
- environment variable or the --git-dir=<path> option.
108
- source: <xmqq5xxv0ywi.fsf_-_@gitster.g>
121
+ "git bugreport --no-suffix" was not supported and instead
122
+ segfaulted, which has been corrected.
123
+ source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
124
125
111
-* jw/doc-show-untracked-files-fix (2024-03-13) 1 commit
112
- (merged to 'next' on 2024-03-14 at 091f64ad6c)
113
- + doc: status.showUntrackedFiles does not take "false"
126
+* rj/restore-plug-leaks (2024-03-14) 1 commit
127
+ (merged to 'next' on 2024-03-15 at ac10ae7892)
128
+ + checkout: plug some leaks in git-restore
129
+
130
+ Leaks from "git restore" have been plugged.
131
+ source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com>
132
+
133
+--------------------------------------------------
134
+[New Topics]
135
115
- The status.showUntrackedFiles configuration variable was
116
- incorrectly documented to accept "false", which has been corrected.
117
- source: <pull.1686.git.git.1710279251901.gitgitgadget@gmail.com>
136
+* az/grep-group-error-message-update (2024-03-25) 1 commit
137
+ - grep: improve errors for unmatched ( and )
138
139
+ Error message clarification.
140
120
-* pb/ci-win-artifact-names-fix (2024-03-11) 1 commit
121
- (merged to 'next' on 2024-03-14 at 5076389536)
122
- + ci(github): make Windows test artifacts name unique
141
+ Will merge to 'next'.
142
+ source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>
143
+
144
+
145
+* bc/credential-scheme-enhancement (2024-03-25) 13 commits
146
+ - credential: add support for multistage credential rounds
147
+ - strvec: implement swapping two strvecs
148
+ - t5563: refactor for multi-stage authentication
149
+ - docs: set a limit on credential line length
150
+ - credential: enable state capability
151
+ - credential: add an argument to keep state
152
+ - http: add support for authtype and credential
153
+ - docs: indicate new credential protocol fields
154
+ - credential: gate new fields on capability
155
+ - credential: add a field for pre-encoded credentials
156
+ - http: use new headers for each object request
157
+ - remote-curl: reset headers on new request
158
+ - credential: add an authtype field
159
+
160
+ The credential helper protocol, together with the HTTP layer, have
161
+ been enhanced to support authentication schemes different from
162
+ username & password pair, like Bearer and NTLM.
163
124
- CI update.
125
- source: <pull.1688.git.1710101097072.gitgitgadget@gmail.com>
164
+ Needs review.
165
+ source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
166
167
128
-* ps/reftable-block-search-fix (2024-03-07) 2 commits
129
- (merged to 'next' on 2024-03-13 at 34938e24ab)
130
- + reftable/block: fix binary search over restart counter
131
- + reftable/record: fix memory leak when decoding object records
168
+* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
169
+ - pretty: find pretty formats case-insensitively
170
+ - pretty: update tests to use `test_config`
171
133
- The reftable code has its own custom binary search function whose
134
- comparison callback has an unusual interface, which caused the
135
- binary search to degenerate into a linear search, which has been
172
+ The "--pretty=<shortHand>" option of the commands in the "git log"
173
+ family, defined as "[pretty] shortHand = <expansion>" should have
174
+ been looked up case insensitively, but was not, which has been
175
corrected.
137
- source: <cover.1709843663.git.ps@pks.im>
138
-
139
-
140
-* ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits
141
- (merged to 'next' on 2024-03-14 at 72465c29be)
142
- + refs/reftable: track last log record name via strbuf
143
- + reftable/record: use scratch buffer when decoding records
144
- + reftable/record: reuse message when decoding log records
145
- + reftable/record: reuse refnames when decoding log records
146
- + reftable/record: avoid copying author info
147
- + reftable/record: convert old and new object IDs to arrays
148
- + refs/reftable: reload correct stack when creating reflog iter
149
- + Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf
150
-
151
- The code to iterate over reflogs in the reftable has been optimized
152
- to reduce memory allocation and deallocation.
153
-
154
- Reviewed-by: Josh Steadmon <steadmon@google.com>
155
- cf. <Ze9eX-aaWoVaqsPP@google.com>
156
- source: <cover.1709640322.git.ps@pks.im>
157
-
158
-
159
-* ps/reftable-stack-tempfile (2024-03-07) 4 commits
160
- (merged to 'next' on 2024-03-13 at dcfb0cde8c)
161
- + reftable/stack: register compacted tables as tempfiles
162
- + reftable/stack: register lockfiles during compaction
163
- + reftable/stack: register new tables as tempfiles
164
- + lockfile: report when rollback fails
165
- (this branch is used by ps/pack-refs-auto.)
166
-
167
- The code in reftable backend that creates new table files works
168
- better with the tempfile framework to avoid leaving cruft after a
169
- failure.
170
- source: <cover.1709816483.git.ps@pks.im>
171
-
172
-
173
-* rs/opt-parse-long-fixups (2024-03-03) 6 commits
174
- (merged to 'next' on 2024-03-13 at 3755b50794)
175
- + parse-options: rearrange long_name matching code
176
- + parse-options: normalize arg and long_name before comparison
177
- + parse-options: detect ambiguous self-negation
178
- + parse-options: factor out register_abbrev() and struct parsed_option
179
- + parse-options: set arg of abbreviated option lazily
180
- + parse-options: recognize abbreviated negated option with arg
181
-
182
- The parse-options code that deals with abbreviated long option
183
- names have been cleaned up.
184
-
185
- Reviewed-by: Josh Steadmon <steadmon@google.com>
186
- cf. <ZfDM5Or3EKw7Q9SA@google.com>
187
- source: <20240303121944.20627-1-l.s.r@web.de>
176
+
177
+ Will merge to 'next'.
178
+ source: <20240324214316.917513-1-brianmlyles@gmail.com>
179
+
180
+
181
+* ds/grep-doc-updates (2024-03-25) 2 commits
182
+ - grep docs: describe --no-index further and improve formatting a bit
183
+ - grep docs: describe --recurse-submodules further and improve formatting a bit
184
+
185
+ Documentation updates.
186
+
187
+ Will merge to 'next'.
188
+ source: <cover.1711398665.git.dsimic@manjaro.org>
189
+
190
+
191
+* ja/doc-markup-updates (2024-03-25) 4 commits
192
+ - doc: git-clone: apply new documentation guidelines
193
+ - doc: git-init: apply new documentation formatting guidelines
194
+ - doc: allow literal and emphasis format in doc vs help tests
195
+ - doc: rework CodingGuidelines with new formatting rules
196
+
197
+ Documentation rules has been explicitly described how to mark-up
198
+ literal parts and a few manual pages have been updated as examples.
199
+
200
+ Will merge to 'next'?
201
+ source: <pull.1702.git.1711318739.gitgitgadget@gmail.com>
202
+
203
+
204
+* mg/editorconfig-makefile (2024-03-23) 1 commit
205
+ - editorconfig: add Makefiles to "text files"
206
+
207
+ The .editorconfig file has been taught that a Makefile uses HT
208
+ indentation.
209
+
210
+ Will merge to 'next'?
211
+ source: <20240322221813.13019-1-mg@max.gautier.name>
212
+
213
+
214
+* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
215
+ - t/README: mention test files are make targets
216
+
217
+ The README now gives a hint on running individual tests in the "t/"
218
+ directory with "make t<num>-*.sh t<num>-*.sh".
219
+
220
+ Will merge to 'next'.
221
+ source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>
222
+
223
+
224
+* ps/reftable-binsearch-updates (2024-03-25) 7 commits
225
+ - reftable/block: avoid decoding keys when searching restart points
226
+ - reftable/record: extract function to decode key lengths
227
+ - reftable/block: fix error handling when searching restart points
228
+ - reftable/block: refactor binary search over restart points
229
+ - reftable/refname: refactor binary search over refnames
230
+ - reftable/basics: improve `binsearch()` test
231
+ - reftable/basics: fix return type of `binsearch()` to be `size_t`
232
+
233
+ Reftable code clean-up and some bugfixes.
234
+
235
+ Needs review.
236
+ source: <cover.1711361340.git.ps@pks.im>
237
+
238
+
239
+* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
240
+ - midx: use strvec_pushf() for pack-objects base name
241
+
242
+ Code clean-up.
243
+
244
+ Will merge to 'next'.
245
+ source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>
246
+
247
+
248
+* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
249
+ - cat-file: use strbuf_expand_bad_format()
250
+ - factor out strbuf_expand_bad_format()
251
+
252
+ Code clean-up.
253
+
254
+ Will merge to 'next'.
255
+ source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>
256
257
--------------------------------------------------
190
-[New Topics]
258
+[Cooking]
259
260
* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
193
- - doc/gitremote-helpers: fix more missing single-quotes
261
+ (merged to 'next' on 2024-03-25 at 7c3dd28ca5)
262
+ + doc/gitremote-helpers: fix more missing single-quotes
263
264
Documentation mark-up fix.
265
197
- Will merge to 'next'.
266
+ Will merge to 'master'.
267
source: <20240320091748.GA2444639@coredump.intra.peff.net>
268
269
@@ -213,27 +282,29 @@ Release tarballs are available at:
282
283
284
* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
216
- - reftable: fix tests being broken by NFS' delete-after-close semantics
285
+ (merged to 'next' on 2024-03-25 at 4d3d391330)
286
+ + reftable: fix tests being broken by NFS' delete-after-close semantics
287
288
A unit test for reftable code tried to enumerate all files in a
289
directory after reftable operations and expected to see nothing but
290
the files it wanted to leave there, but was fooled by .nfs* cruft
291
files left, which has been corrected.
292
223
- Will merge to 'next'.
293
+ Will merge to 'master'.
294
source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>
295
296
297
* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
228
- - t/README: document how to loop around test cases
229
- - t7800: use single quotes for test bodies
230
- - t7800: improve test descriptions with empty arguments
298
+ (merged to 'next' on 2024-03-25 at e7b1ec4df4)
299
+ + t/README: document how to loop around test cases
300
+ + t7800: use single quotes for test bodies
301
+ + t7800: improve test descriptions with empty arguments
302
303
Fix the way recently added tests interpolate variables defined
304
outside them, and document the best practice to help future
305
developers.
306
236
- Will merge to 'next'.
307
+ Will merge to 'master'.
308
source: <cover.1711074118.git.ps@pks.im>
309
310
@@ -273,7 +344,7 @@ Release tarballs are available at:
344
source: <cover.1710972293.git.me@ttaylorr.com>
345
346
276
-* jc/release-notes-entry-experiment (2024-03-22) 1 commit
347
+* jc/release-notes-entry-experiment (2024-03-26) 1 commit
348
- SubmittingPatches: release-notes entry experiment
349
350
Introduce an experimental protocol for contributors to propose the
@@ -281,21 +352,21 @@ Release tarballs are available at:
352
merge commit message for the topic, and in the release notes and
353
document it in the SubmittingPatches document.
354
284
- source: <xmqqcyrn58mf.fsf@gitster.g>
355
+ Will merge to 'next'.
356
+ source: <xmqq8r26eyva.fsf@gitster.g>
357
358
359
* jk/rebase-apply-leakfix (2024-03-22) 1 commit
288
- - rebase: use child_process_clear() to clean
360
+ (merged to 'next' on 2024-03-25 at f9358272af)
361
+ + rebase: use child_process_clear() to clean
362
363
Leakfix.
364
292
- Will merge to 'next'.
365
+ Will merge to 'master'.
366
source: <20240322103502.GA2045297@coredump.intra.peff.net>
367
295
---------------------------------------------------
296
-[Cooking]
368
298
-* dg/myfirstobjectwalk-updates (2024-03-19) 5 commits
369
+* dg/myfirstobjectwalk-updates (2024-03-26) 5 commits
370
- MyFirstObjectWalk: add stderr to pipe processing
371
- MyFirstObjectWalk: fix description for counting omitted objects
372
- MyFirstObjectWalk: fix filtered object walk
@@ -304,20 +375,22 @@ Release tarballs are available at:
375
376
Update a more recent tutorial doc.
377
307
- Needs review.
308
- source: <cover.1710840596.git.dirk@gouders.net>
378
+ Waiting for the final Ack.
379
+ cf. <xmqqo7b1apx3.fsf@gitster.g>
380
+ source: <cover.1711368498.git.dirk@gouders.net>
381
382
383
* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
312
- - config.txt: describe handling of whitespace further
313
- - t1300: add more tests for whitespace and inline comments
314
- - config: really keep value-internal whitespace verbatim
315
- - config: minor addition of whitespace
384
+ (merged to 'next' on 2024-03-25 at f3393cabe5)
385
+ + config.txt: describe handling of whitespace further
386
+ + t1300: add more tests for whitespace and inline comments
387
+ + config: really keep value-internal whitespace verbatim
388
+ + config: minor addition of whitespace
389
390
"git config" corrupted literal HT characters written in the
391
configuration file as part of a value, which has been corrected.
392
320
- Will merge to 'next'.
393
+ Will merge to 'master'.
394
source: <cover.1711001016.git.dsimic@manjaro.org>
395
396
@@ -349,72 +422,6 @@ Release tarballs are available at:
422
source: <20240320002555.GB903718@coredump.intra.peff.net>
423
424
352
-* bb/sh-scripts-cleanup (2024-03-16) 22 commits
353
- (merged to 'next' on 2024-03-18 at 4501a04796)
354
- + git-quiltimport: avoid an unnecessary subshell
355
- + contrib/coverage-diff: avoid redundant pipelines
356
- + t/t9*: merge "grep | sed" pipelines
357
- + t/t8*: merge "grep | sed" pipelines
358
- + t/t5*: merge a "grep | sed" pipeline
359
- + t/t4*: merge a "grep | sed" pipeline
360
- + t/t3*: merge a "grep | awk" pipeline
361
- + t/t1*: merge a "grep | sed" pipeline
362
- + t/t9*: avoid redundant uses of cat
363
- + t/t8*: avoid redundant use of cat
364
- + t/t7*: avoid redundant use of cat
365
- + t/t6*: avoid redundant uses of cat
366
- + t/t5*: avoid redundant uses of cat
367
- + t/t4*: avoid redundant uses of cat
368
- + t/t3*: avoid redundant uses of cat
369
- + t/t1*: avoid redundant uses of cat
370
- + t/t0*: avoid redundant uses of cat
371
- + t/perf: avoid redundant use of cat
372
- + t/annotate-tests.sh: avoid redundant use of cat
373
- + t/lib-cvs.sh: avoid redundant use of cat
374
- + contrib/subtree/t: avoid redundant use of cat
375
- + doc: avoid redundant use of cat
376
-
377
- Shell scripts clean-up.
378
-
379
- Will merge to 'master'.
380
- source: <20240315194620.10713-1-dev+git@drbeat.li>
381
-
382
-
383
-* bl/doc-config-fixes (2024-03-16) 2 commits
384
- (merged to 'next' on 2024-03-18 at a9038d5a9e)
385
- + docs: fix typo in git-config `--default`
386
- + docs: clarify file options in git-config `--edit`
387
-
388
- A few typoes in "git config --help" have been corrected.
389
-
390
- Will merge to 'master'.
391
- source: <20240316050149.1182867-2-brianmlyles@gmail.com>
392
-
393
-
394
-* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
395
- (merged to 'next' on 2024-03-18 at b2e1babb85)
396
- + docs: adjust trailer `separator` and `key_value_separator` language
397
- + docs: correct trailer `key_value_separator` description
398
-
399
- The documentation for "%(trailers[:options])" placeholder in the
400
- "--pretty" option of commands in the "git log" family has been
401
- updated.
402
-
403
- Will merge to 'master'.
404
- source: <20240316035612.752910-1-brianmlyles@gmail.com>
405
-
406
-
407
-* ja/doc-formatting-fix (2024-03-16) 2 commits
408
- (merged to 'next' on 2024-03-18 at edde7a576d)
409
- + doc: fix some placeholders formating
410
- + doc: format alternatives in synopsis
411
-
412
- Documentation mark-up fix.
413
-
414
- Will merge to 'master'.
415
- source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
416
-
417
-
425
* la/hide-trailer-info (2024-03-16) 7 commits
426
- trailer: retire trailer_info_get() from API
427
- trailer: make trailer_info struct private
@@ -430,13 +437,17 @@ Release tarballs are available at:
437
438
439
* pb/advice-merge-conflict (2024-03-18) 2 commits
433
- - builtin/am: allow disabling conflict advice
434
- - sequencer: allow disabling conflict advice
440
+ (merged to 'next' on 2024-03-25 at 4414e31d81)
441
+ + builtin/am: allow disabling conflict advice
442
+ + sequencer: allow disabling conflict advice
443
444
Hints that suggest what to do after resolving conflicts can now be
445
squelched by disabling advice.mergeConflict.
446
439
- Will merge to 'next'?
447
+ Acked-by: Phillip Wood <phillip.wood123@gmail.com>
448
+ cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>
449
+
450
+ Will merge to 'master'.
451
source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
452
453
@@ -451,7 +462,7 @@ Release tarballs are available at:
462
source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
463
464
454
-* ps/pack-refs-auto (2024-03-18) 16 commits
465
+* ps/pack-refs-auto (2024-03-25) 16 commits
466
- builtin/gc: pack refs when using `git maintenance run --auto`
467
- builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
468
- t6500: extract objects with "17" prefix
@@ -472,8 +483,11 @@ Release tarballs are available at:
483
"git pack-refs" learned the "--auto" option, which is a useful
484
addition to be triggered from "git gc --auto".
485
475
- Being reviewed (Karthik e.g. <CAOLa=ZS6uF3fuor3V2F_GM__JNRpUAyLcrVDbCHsJ6JStL96cA@mail.gmail.com>)
476
- source: <cover.1710706118.git.ps@pks.im>
486
+ Acked-by: Karthik Nayak <karthik.188@gmail.com>
487
+ cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
488
+
489
+ Will merge to 'next'.
490
+ source: <cover.1711360631.git.ps@pks.im>
491
492
493
* jc/show-untracked-false (2024-03-13) 2 commits
@@ -491,17 +505,6 @@ Release tarballs are available at:
505
source: <20240313173214.962532-1-gitster@pobox.com>
506
507
494
-* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
495
- (merged to 'next' on 2024-03-18 at 180db8ec38)
496
- + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
497
-
498
- "git bugreport --no-suffix" was not supported and instead
499
- segfaulted, which has been corrected.
500
-
501
- Will merge to 'master'.
502
- source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
503
-
504
-
508
* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
509
(merged to 'next' on 2024-03-21 at 96801520db)
510
+ diff.*Prefix: use camelCase in the doc and test titles
@@ -515,23 +518,13 @@ Release tarballs are available at:
518
519
520
* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
518
- - t5601: exercise clones with "includeIf.*.onbranch"
521
+ (merged to 'next' on 2024-03-25 at 8d11bd8bd4)
522
+ + t5601: exercise clones with "includeIf.*.onbranch"
523
524
An additional test to demonstrate something I am not sure what.
525
522
- Waiting for a review response.
523
- cf. <xmqqo7bjjid9.fsf@gitster.g>
524
- source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
525
-
526
-
527
-* rj/restore-plug-leaks (2024-03-14) 1 commit
528
- (merged to 'next' on 2024-03-15 at ac10ae7892)
529
- + checkout: plug some leaks in git-restore
530
-
531
- Leaks from "git restore" have been plugged.
532
-
526
Will merge to 'master'.
534
- source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com>
527
+ source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
528
529
530
* bt/fuzz-config-parse (2024-03-15) 1 commit
@@ -554,16 +547,6 @@ Release tarballs are available at:
547
source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>
548
549
557
-* jc/index-pack-fsck-levels (2024-03-15) 1 commit
558
- (merged to 'next' on 2024-03-18 at 243c5f4125)
559
- + t5300: fix test_with_bad_commit()
560
-
561
- Test fix.
562
-
563
- Will merge to 'master'.
564
- source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
565
-
566
-
550
* la/format-trailer-info (2024-03-15) 5 commits
551
- trailer: finish formatting unification
552
- trailer: begin formatting unification
@@ -608,13 +591,13 @@ Release tarballs are available at:
591
source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>
592
593
611
-* bl/cherry-pick-empty (2024-03-20) 7 commits
594
+* bl/cherry-pick-empty (2024-03-25) 7 commits
595
- cherry-pick: add `--empty` for more robust redundant commit handling
596
- cherry-pick: enforce `--keep-redundant-commits` incompatibility
597
- sequencer: do not require `allow_empty` for redundant commit options
598
- sequencer: handle unborn branch with `--allow-empty`
599
- rebase: update `--empty=ask` to `--empty=stop`
617
- - docs: clean up `--empty` formatting in git-rebase(1) and git-am (1)
600
+ - docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
601
- docs: address inaccurate `--empty` default with `--exec`
602
603
Allow git-cherry-pick(1) to automatically drop redundant commits via
@@ -624,6 +607,7 @@ Release tarballs are available at:
607
sequencer code cleanup.
608
609
Will merge to 'next'?
610
+ cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
611
source: <20240119060721.3734775-2-brianmlyles@gmail.com>
612
613