What's cooking (2024/05 #04)
Junio C Hamano committed
May 9, 2024 at 14:31 UTC
404c882b88b944ef59e6851689abafc711f96175
1 file changed
+361
-262
whats-cooking.txt
+361
-262
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #03; Mon, 6)
3
-X-master-at: d4cc1ec35f3bcce816b69986ca41943f6ce21377
4
-X-next-at: b98150cc7190226eafa47b017c34392aadf638ea
2
+Subject: What's cooking in git.git (May 2024, #04; Thu, 9)
3
+X-master-at: 0f3415f1f8478b05e64db11eb8aaa2915e48fef6
4
+X-next-at: 3402c0e53fb798cb471dd6562eb5c938885b7295
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #03; Mon, 6)
7
+What's cooking in git.git (May 2024, #04; Thu, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,9 +45,265 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* bb/rgb-12-bit-colors (2024-05-02) 3 commits
52
+ (merged to 'next' on 2024-05-02 at 7fe29c98d7)
53
+ + color: add support for 12-bit RGB colors
54
+ + t/t4026-color: add test coverage for invalid RGB colors
55
+ + t/t4026-color: remove an extra double quote character
56
+
57
+ The color parsing code learned to handle 12-bit RGB colors, spelled
58
+ as "#RGB" (in addition to "#RRGGBB" that is already supported).
59
+ source: <20240502110331.6347-1-dev+git@drbeat.li>
60
+
61
+
62
+* bc/credential-scheme-enhancement (2024-04-16) 16 commits
63
+ (merged to 'next' on 2024-05-01 at 789ec5bd35)
64
+ + credential: add method for querying capabilities
65
+ + credential-cache: implement authtype capability
66
+ + t: add credential tests for authtype
67
+ + credential: add support for multistage credential rounds
68
+ + t5563: refactor for multi-stage authentication
69
+ + docs: set a limit on credential line length
70
+ + credential: enable state capability
71
+ + credential: add an argument to keep state
72
+ + http: add support for authtype and credential
73
+ + docs: indicate new credential protocol fields
74
+ + credential: add a field called "ephemeral"
75
+ + credential: gate new fields on capability
76
+ + credential: add a field for pre-encoded credentials
77
+ + http: use new headers for each object request
78
+ + remote-curl: reset headers on new request
79
+ + credential: add an authtype field
80
+
81
+ The credential helper protocol, together with the HTTP layer, have
82
+ been enhanced to support authentication schemes different from
83
+ username & password pair, like Bearer and NTLM.
84
+ source: <20240417000240.3611948-1-sandals@crustytoothpaste.net>
85
+
86
+
87
+* bc/zsh-compatibility (2024-04-26) 2 commits
88
+ (merged to 'next' on 2024-05-02 at 10222b2472)
89
+ + vimdiff: make script and tests work with zsh
90
+ + t4046: avoid continue in &&-chain for zsh
91
+
92
+ zsh can pretend to be a normal shell pretty well except for some
93
+ glitches that we tickle in some of our scripts. Work them around
94
+ so that "vimdiff" and our test suite works well enough with it.
95
+ source: <20240426221154.2194139-1-sandals@crustytoothpaste.net>
96
+
97
+
98
+* dk/zsh-git-repo-path-fix (2024-04-30) 1 commit
99
+ (merged to 'next' on 2024-05-02 at 0446d8e63a)
100
+ + completion: zsh: stop leaking local cache variable
101
+
102
+ Command line completion support for zsh (in contrib/) has been
103
+ updated to stop exposing internal state to end-user shell
104
+ interaction.
105
+ source: <pull.1725.git.1714513995564.gitgitgadget@gmail.com>
106
+
107
+
108
+* jt/doc-submitting-rerolled-series (2024-04-25) 1 commit
109
+ (merged to 'next' on 2024-05-01 at 1c5865f11c)
110
+ + doc: clarify practices for submitting updated patch versions
111
+
112
+ Developer doc update.
113
+ source: <20240425213404.133660-1-jltobler@gmail.com>
114
+
115
+
116
+* ps/ci-test-with-jgit (2024-04-12) 13 commits
117
+ (merged to 'next' on 2024-05-01 at 35e293e618)
118
+ + t0612: add tests to exercise Git/JGit reftable compatibility
119
+ + t0610: fix non-portable variable assignment
120
+ + t06xx: always execute backend-specific tests
121
+ + ci: install JGit dependency
122
+ + ci: make Perforce binaries executable for all users
123
+ + ci: merge scripts which install dependencies
124
+ + ci: fix setup of custom path for GitLab CI
125
+ + ci: merge custom PATH directories
126
+ + ci: convert "install-dependencies.sh" to use "/bin/sh"
127
+ + ci: drop duplicate package installation for "linux-gcc-default"
128
+ + ci: skip sudo when we are already root
129
+ + ci: expose distro name in dockerized GitHub jobs
130
+ + ci: rename "runs_on_pool" to "distro"
131
+
132
+ Tests to ensure interoperability between reftable written by jgit
133
+ and our code have been added and enabled in CI.
134
+ source: <cover.1712896868.git.ps@pks.im>
135
+
136
+
137
+* ps/reftable-write-optim (2024-04-08) 11 commits
138
+ (merged to 'next' on 2024-04-30 at 0667e3c05b)
139
+ + reftable/block: reuse compressed array
140
+ + reftable/block: reuse zstream when writing log blocks
141
+ + reftable/writer: reset `last_key` instead of releasing it
142
+ + reftable/writer: unify releasing memory
143
+ + reftable/writer: refactorings for `writer_flush_nonempty_block()`
144
+ + reftable/writer: refactorings for `writer_add_record()`
145
+ + refs/reftable: don't recompute committer ident
146
+ + reftable: remove name checks
147
+ + refs/reftable: skip duplicate name checks
148
+ + refs/reftable: perform explicit D/F check when writing symrefs
149
+ + refs/reftable: fix D/F conflict error message on ref copy
150
+
151
+ Code to write out reftable has seen some optimization and
152
+ simplification.
153
+ source: <cover.1712578837.git.ps@pks.im>
154
+
155
+
156
+* ps/the-index-is-no-more (2024-04-18) 6 commits
157
+ (merged to 'next' on 2024-05-01 at 7b9a0ab760)
158
+ + repository: drop `initialize_the_repository()`
159
+ + repository: drop `the_index` variable
160
+ + builtin/clone: stop using `the_index`
161
+ + repository: initialize index in `repo_init()`
162
+ + builtin: stop using `the_index`
163
+ + t/helper: stop using `the_index`
164
+ (this branch is used by ps/undecided-is-not-necessarily-sha1.)
165
+
166
+ The singleton index_state instance "the_index" has been eliminated
167
+ by always instantiating "the_repository" and replacing references
168
+ to "the_index" with references to its .index member.
169
+ source: <cover.1713442061.git.ps@pks.im>
170
+
171
+
172
+* rh/complete-symbolic-ref (2024-04-25) 3 commits
173
+ (merged to 'next' on 2024-05-01 at 7020ecebe7)
174
+ + completion: add docs on how to add subcommand completions
175
+ + completion: improve docs for using __git_complete
176
+ + completion: add 'symbolic-ref'
177
+
178
+ Command line completion script (in contrib/) learned to complete
179
+ "git symbolic-ref" a bit better (you need to enable plumbing
180
+ commands to be completed with GIT_COMPLETION_SHOW_ALL_COMMANDS).
181
+ source: <20240425101845.708554-3-rhi@pengutronix.de>
182
+
183
+
184
+* rj/add-p-typo-reaction (2024-04-30) 2 commits
185
+ (merged to 'next' on 2024-05-01 at 3016062ebf)
186
+ + add-patch: response to unknown command
187
+ + add-patch: do not show UI messages on stderr
188
+
189
+ When the user responds to a prompt given by "git add -p" with an
190
+ unsupported command, list of available commands were given, which
191
+ was too much if the user knew what they wanted to type but merely
192
+ made a typo. Now the user gets a much shorter error message.
193
+ source: <952a9514-3cf1-4601-8f0d-db57adc750c3@gmail.com>
194
+
195
+
196
+* rs/diff-parseopts-cleanup (2024-05-01) 1 commit
197
+ (merged to 'next' on 2024-05-02 at cd9779c175)
198
+ + diff-lib: stop calling diff_setup_done() in do_diff_cache()
199
+
200
+ Code clean-up to remove code that is now a noop.
201
+ source: <0e96c5a3-7b4d-4c6b-875e-d80e3eb07a00@web.de>
202
+
203
--------------------------------------------------
204
[New Topics]
205
206
+* vd/doc-merge-tree-x-option (2024-05-07) 1 commit
207
+ (merged to 'next' on 2024-05-08 at 42637b8bdf)
208
+ + Documentation/git-merge-tree.txt: document -X
209
+
210
+ Doc update.
211
+
212
+ Will merge to 'master'.
213
+ source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>
214
+
215
+
216
+* fa/p4-error (2024-05-08) 1 commit
217
+ - git-p4: show Perforce error to the user
218
+
219
+ P4 update.
220
+
221
+ Will merge to 'next'.
222
+ source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com>
223
+
224
+
225
+* jc/doc-manpages-l10n (2024-05-09) 1 commit
226
+ - SubmittingPatches: advertise git-manpages-l10n project a bit
227
+
228
+ The SubmittingPatches document now refers folks to manpages
229
+ translation project.
230
+
231
+ Comments?
232
+ source: <xmqqv83muc12.fsf@gitster.g>
233
+
234
+
235
+* jk/ci-macos-gcc13-fix (2024-05-09) 3 commits
236
+ - ci: stop installing "gcc-13" for osx-gcc
237
+ - ci: avoid bare "gcc" for osx-gcc job
238
+ - ci: drop mention of BREW_INSTALL_PACKAGES variable
239
+
240
+ CI fix.
241
+
242
+ Will merge to 'next'.
243
+ source: <20240509162219.GA1707955@coredump.intra.peff.net>
244
+
245
+
246
+* ps/ci-fuzzers-at-gitlab-fix (2024-05-09) 3 commits
247
+ - gitlab-ci: fix installing dependencies for fuzz smoke tests
248
+ - Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix
249
+ - Merge branch 'ps/ci-enable-minimal-fuzzers-at-gitlab' into ps/ci-fuzzers-at-gitlab-fix
250
+ (this branch uses ps/ci-enable-minimal-fuzzers-at-gitlab and ps/ci-python-2-deprecation.)
251
+
252
+ CI fix.
253
+
254
+ Will merge to 'next'.
255
+ source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im>
256
+
257
+
258
+* ps/reftable-reusable-iterator (2024-05-08) 13 commits
259
+ - reftable/merged: adapt interface to allow reuse of iterators
260
+ - reftable/stack: provide convenience functions to create iterators
261
+ - reftable/reader: adapt interface to allow reuse of iterators
262
+ - reftable/generic: adapt interface to allow reuse of iterators
263
+ - reftable/generic: move seeking of records into the iterator
264
+ - reftable/merged: simplify indices for subiterators
265
+ - reftable/merged: split up initialization and seeking of records
266
+ - reftable/reader: set up the reader when initializing table iterator
267
+ - reftable/reader: inline `reader_seek_internal()`
268
+ - reftable/reader: separate concerns of table iter and reftable reader
269
+ - reftable/reader: unify indexed and linear seeking
270
+ - reftable/reader: avoid copying index iterator
271
+ - reftable/block: use `size_t` to track restart point index
272
+
273
+ source: <cover.1715166175.git.ps@pks.im>
274
+
275
+
276
+* tb/precompose-getcwd (2024-05-09) 1 commit
277
+ - macOS: ls-files path fails if path of workdir is NFD
278
+
279
+ We forgot to normalize the result of getcwd() to NFC on macOS where
280
+ all other paths are normalized, which has been corrected.
281
+
282
+ Will merge to 'next'.
283
+ source: <20240509161110.12121-1-tboegi@web.de>
284
+
285
+
286
+* jk/ci-test-with-jgit-fix (2024-05-09) 1 commit
287
+ - ci: update coverity runs_on_pool reference
288
+
289
+ CI fix.
290
+
291
+ Will merge to 'next'.
292
+ source: <20240509161506.GA1707588@coredump.intra.peff.net>
293
+
294
+
295
+* jc/patch-flow-updates (2024-05-09) 2 commits
296
+ - SubmittingPatches: extend the "flow" section
297
+ - SubmittingPatches: move the patch-flow section earlier
298
+
299
+ Doc updates.
300
+
301
+ Comments?
302
+ source: <20240509211318.641896-1-gitster@pobox.com>
303
+
304
+--------------------------------------------------
305
+[Cooking]
306
+
307
* it/refs-name-conflict (2024-05-06) 1 commit
308
- refs: return conflict error when checking packed refs
309
@@ -66,58 +322,63 @@ Release tarballs are available at:
322
source: <xmqqbk5i3ncw.fsf_-_@gitster.g>
323
324
69
-* jp/tag-trailer (2024-05-06) 3 commits
70
- - builtin/tag: add --trailer option
71
- - builtin/commit: refactor --trailer logic
72
- - builtin/commit: use ARGV macro to collect trailers
325
+* jp/tag-trailer (2024-05-07) 3 commits
326
+ (merged to 'next' on 2024-05-07 at 646013793d)
327
+ + builtin/tag: add --trailer option
328
+ + builtin/commit: refactor --trailer logic
329
+ + builtin/commit: use ARGV macro to collect trailers
330
331
"git tag" learned the "--trailer" option to futz with the trailers
332
in the same way as "git commit" does.
333
77
- Will merge to 'next'.
334
+ Will merge to 'master'.
335
source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com>
336
337
338
* ow/refspec-glossary-update (2024-05-06) 1 commit
82
- - Documentation: Mention that refspecs are explained elsewhere
339
+ (merged to 'next' on 2024-05-07 at 7d55ebb0c8)
340
+ + Documentation: Mention that refspecs are explained elsewhere
341
342
Doc update.
343
86
- Will merge to 'next'.
344
+ Will merge to 'master'.
345
source: <20240506182317.13477-1-oystwa@gmail.com>
346
347
348
* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit
91
- - gitlab-ci: add smoke test for fuzzers
349
+ (merged to 'next' on 2024-05-07 at a76024bd9f)
350
+ + gitlab-ci: add smoke test for fuzzers
351
+ (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
352
353
CI update.
354
95
- Will merge to 'next'.
355
+ Will merge to 'master'.
356
source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
357
358
359
* ps/ci-python-2-deprecation (2024-05-06) 1 commit
100
- - ci: fix Python dependency on Ubuntu 24.04
360
+ (merged to 'next' on 2024-05-07 at 0e11e94f99)
361
+ + ci: fix Python dependency on Ubuntu 24.04
362
+ (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
363
364
Unbreak CI jobs so that we do not attempt to use Python 2 that has
365
been removed from the platform.
366
105
- Will merge to 'next'.
367
+ Will merge to 'master'.
368
source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im>
369
370
371
* rs/external-diff-with-exit-code (2024-05-06) 2 commits
110
- - diff: fix --exit-code with external diff
111
- - diff: report unmerged paths as changes in run_diff_cmd()
372
+ (merged to 'next' on 2024-05-08 at ad5fee3cbf)
373
+ + diff: fix --exit-code with external diff
374
+ + diff: report unmerged paths as changes in run_diff_cmd()
375
376
The "--exit-code" option of "git diff" command learned to work with
377
the "--ext-diff" option.
378
116
- Will merge to 'next'?
379
+ Will merge to 'master'.
380
source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
381
119
---------------------------------------------------
120
-[Cooking]
382
383
* jc/test-workaround-broken-mv (2024-05-02) 1 commit
384
(merged to 'next' on 2024-05-06 at 7e009c6827)
@@ -132,32 +393,37 @@ Release tarballs are available at:
393
394
395
* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits
135
- - gitlab-ci: add whitespace error check
136
- - ci: make the whitespace report optional
137
- - ci: separate whitespace check script
138
- - github-ci: fix link to whitespace error
139
- - ci: pre-collapse GitLab CI sections
396
+ (merged to 'next' on 2024-05-08 at 774a29dde4)
397
+ + gitlab-ci: add whitespace error check
398
+ + ci: make the whitespace report optional
399
+ + ci: separate whitespace check script
400
+ + github-ci: fix link to whitespace error
401
+ + ci: pre-collapse GitLab CI sections
402
403
The "whitespace check" task that was enabled for GitHub Actions CI
404
has been ported to GitLab CI.
405
144
- Will merge to 'next'?
406
+ Will merge to 'master'.
407
source: <20240503172110.181326-1-jltobler@gmail.com>
408
409
410
* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit
149
- - stop using HEAD for attributes in bare repository by default
411
+ (merged to 'next' on 2024-05-08 at a34819b16d)
412
+ + stop using HEAD for attributes in bare repository by default
413
+ (this branch is used by ps/undecided-is-not-necessarily-sha1.)
414
415
Git 2.43 started using the tree of HEAD as the source of attributes
416
in a bare repository, which has severe performance implications.
417
For now, revert the change, without ripping out a more explicit
418
support for the attr.tree configuration variable.
419
156
- Will merge to 'next'?
420
+ Will merge to 'master'.
421
source: <xmqqzft6aozg.fsf_-_@gitster.g>
422
423
160
-* jl/git-no-advice (2024-05-03) 3 commits
424
+* jl/git-no-advice (2024-05-07) 4 commits
425
+ (merged to 'next' on 2024-05-08 at c9e7e0866e)
426
+ + t0018: two small fixes
427
(merged to 'next' on 2024-05-06 at 95cc03ef96)
428
+ advice: add --no-advice global option
429
+ doc: add spacing around paginate options
@@ -170,11 +436,12 @@ Release tarballs are available at:
436
source: <20240503071706.78109-1-james@jamesliu.io>
437
438
173
-* kn/ref-transaction-symref (2024-05-03) 7 commits
439
+* kn/ref-transaction-symref (2024-05-07) 8 commits
440
- refs: remove `create_symref` and associated dead code
441
- refs: rename `refs_create_symref()` to `refs_update_symref()`
442
- refs: use transaction in `refs_create_symref()`
443
- refs: add support for transactional symref updates
444
+ - refs: move `original_update_refname` to 'refs.c'
445
- refs: support symrefs in 'reference-transaction' hook
446
- files-backend: extract out `create_symref_lock()`
447
- refs: accept symref values in `ref_transaction_update()`
@@ -182,8 +449,8 @@ Release tarballs are available at:
449
Updates to symbolic refs can now be made as a part of ref
450
transaction.
451
185
- Will merge to 'next'?
186
- source: <20240503124115.252413-1-knayak@gitlab.com>
452
+ Will merge to 'next'.
453
+ source: <20240507125859.132116-1-knayak@gitlab.com>
454
455
456
* ma/win32-unix-domain-socket (2024-05-03) 1 commit
@@ -197,42 +464,44 @@ Release tarballs are available at:
464
465
466
* ps/config-subcommands (2024-05-06) 14 commits
200
- - builtin/config: display subcommand help
201
- - builtin/config: introduce "edit" subcommand
202
- - builtin/config: introduce "remove-section" subcommand
203
- - builtin/config: introduce "rename-section" subcommand
204
- - builtin/config: introduce "unset" subcommand
205
- - builtin/config: introduce "set" subcommand
206
- - builtin/config: introduce "get" subcommand
207
- - builtin/config: introduce "list" subcommand
208
- - builtin/config: pull out function to handle `--null`
209
- - builtin/config: pull out function to handle config location
210
- - builtin/config: use `OPT_CMDMODE()` to specify modes
211
- - builtin/config: move "fixed-value" option to correct group
212
- - builtin/config: move option array around
213
- - config: clarify memory ownership when preparing comment strings
467
+ (merged to 'next' on 2024-05-07 at f10c689a30)
468
+ + builtin/config: display subcommand help
469
+ + builtin/config: introduce "edit" subcommand
470
+ + builtin/config: introduce "remove-section" subcommand
471
+ + builtin/config: introduce "rename-section" subcommand
472
+ + builtin/config: introduce "unset" subcommand
473
+ + builtin/config: introduce "set" subcommand
474
+ + builtin/config: introduce "get" subcommand
475
+ + builtin/config: introduce "list" subcommand
476
+ + builtin/config: pull out function to handle `--null`
477
+ + builtin/config: pull out function to handle config location
478
+ + builtin/config: use `OPT_CMDMODE()` to specify modes
479
+ + builtin/config: move "fixed-value" option to correct group
480
+ + builtin/config: move option array around
481
+ + config: clarify memory ownership when preparing comment strings
482
483
The operation mode options (like "--get") the "git config" command
484
uses have been deprecated and replaced with subcommands (like "git
485
config get").
486
219
- Will merge to 'next'.
487
+ Will merge to 'master'.
488
source: <cover.1714982328.git.ps@pks.im>
489
490
223
-* ps/refs-without-the-repository (2024-05-03) 5 commits
224
- - refs: remove functions without ref store
225
- - cocci: apply rules to rewrite callers of "refs" interfaces
226
- - cocci: introduce rules to transform "refs" to pass ref store
227
- - refs: add `exclude_patterns` parameter to `for_each_fullref_in()`
228
- - refs: introduce missing functions that accept a `struct ref_store`
491
+* ps/refs-without-the-repository (2024-05-07) 5 commits
492
+ (merged to 'next' on 2024-05-08 at 2479b9de46)
493
+ + refs: remove functions without ref store
494
+ + cocci: apply rules to rewrite callers of "refs" interfaces
495
+ + cocci: introduce rules to transform "refs" to pass ref store
496
+ + refs: add `exclude_patterns` parameter to `for_each_fullref_in()`
497
+ + refs: introduce missing functions that accept a `struct ref_store`
498
499
The refs API lost functions that implicitly assumes to work on the
500
primary ref_store by forcing the callers to pass a ref_store as an
501
argument.
502
234
- Will merge to 'next'?
235
- source: <cover.1714717057.git.ps@pks.im>
503
+ Will merge to 'master'.
504
+ source: <cover.1715065736.git.ps@pks.im>
505
506
507
* ps/reftable-write-options (2024-05-03) 11 commits
@@ -265,27 +534,14 @@ Release tarballs are available at:
534
source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>
535
536
268
-* bb/rgb-12-bit-colors (2024-05-02) 3 commits
269
- (merged to 'next' on 2024-05-02 at 7fe29c98d7)
270
- + color: add support for 12-bit RGB colors
271
- + t/t4026-color: add test coverage for invalid RGB colors
272
- + t/t4026-color: remove an extra double quote character
273
-
274
- The color parsing code learned to handle 12-bit RGB colors, spelled
275
- as "#RGB" (in addition to "#RRGGBB" that is already supported).
276
-
277
- Will merge to 'master'.
278
- source: <20240502110331.6347-1-dev+git@drbeat.li>
279
-
280
-
281
-* ds/scalar-reconfigure-all-fix (2024-05-06) 1 commit
282
- - scalar: avoid segfault in reconfigure --all
537
+* ds/scalar-reconfigure-all-fix (2024-05-07) 1 commit
538
+ (merged to 'next' on 2024-05-08 at eca398f4a5)
539
+ + scalar: avoid segfault in reconfigure --all
540
541
Scalar fix.
542
286
- Expecting a final (and hopefully small) reroll.
287
- cf. <Zjhufiq2DmBlVpIx@tanuki>
288
- source: <pull.1724.v2.git.1714874298859.gitgitgadget@gmail.com>
543
+ Will merge to 'master'.
544
+ source: <pull.1724.v3.git.1715126749391.gitgitgadget@gmail.com>
545
546
547
* ps/pseudo-ref-terminology (2024-05-02) 10 commits
@@ -307,65 +563,6 @@ Release tarballs are available at:
563
source: <cover.1714637671.git.ps@pks.im>
564
565
310
-* dk/zsh-git-repo-path-fix (2024-04-30) 1 commit
311
- (merged to 'next' on 2024-05-02 at 0446d8e63a)
312
- + completion: zsh: stop leaking local cache variable
313
-
314
- Command line completion support for zsh (in contrib/) has been
315
- updated to stop exposing internal state to end-user shell
316
- interaction.
317
-
318
- Will merge to 'master'.
319
- source: <pull.1725.git.1714513995564.gitgitgadget@gmail.com>
320
-
321
-
322
-* rs/diff-parseopts-cleanup (2024-05-01) 1 commit
323
- (merged to 'next' on 2024-05-02 at cd9779c175)
324
- + diff-lib: stop calling diff_setup_done() in do_diff_cache()
325
-
326
- Code clean-up to remove code that is now a noop.
327
-
328
- Will merge to 'master'.
329
- source: <0e96c5a3-7b4d-4c6b-875e-d80e3eb07a00@web.de>
330
-
331
-
332
-* rh/complete-symbolic-ref (2024-04-25) 3 commits
333
- (merged to 'next' on 2024-05-01 at 7020ecebe7)
334
- + completion: add docs on how to add subcommand completions
335
- + completion: improve docs for using __git_complete
336
- + completion: add 'symbolic-ref'
337
-
338
- Command line completion script (in contrib/) learned to complete
339
- "git symbolic-ref" a bit better (you need to enable plumbing
340
- commands to be completed with GIT_COMPLETION_SHOW_ALL_COMMANDS).
341
-
342
- Will merge to 'master'.
343
- source: <20240425101845.708554-3-rhi@pengutronix.de>
344
-
345
-
346
-* jt/doc-submitting-rerolled-series (2024-04-25) 1 commit
347
- (merged to 'next' on 2024-05-01 at 1c5865f11c)
348
- + doc: clarify practices for submitting updated patch versions
349
-
350
- Developer doc update.
351
-
352
- Will merge to 'master'.
353
- source: <20240425213404.133660-1-jltobler@gmail.com>
354
-
355
-
356
-* bc/zsh-compatibility (2024-04-26) 2 commits
357
- (merged to 'next' on 2024-05-02 at 10222b2472)
358
- + vimdiff: make script and tests work with zsh
359
- + t4046: avoid continue in &&-chain for zsh
360
-
361
- zsh can pretend to be a normal shell pretty well except for some
362
- glitches that we tickle in some of our scripts. Work them around
363
- so that "vimdiff" and our test suite works well enough with it.
364
-
365
- Will merge to 'master'.
366
- source: <20240426221154.2194139-1-sandals@crustytoothpaste.net>
367
-
368
-
566
* jc/rev-parse-fatal-doc (2024-05-01) 1 commit
567
- rev-parse: document how --is-* options work outside a repository
568
@@ -375,84 +572,32 @@ Release tarballs are available at:
572
source: <xmqqplu54fbg.fsf@gitster.g>
573
574
378
-* ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits
379
- . repository: stop setting SHA1 as the default object hash
380
- . oss-fuzz/commit-graph: set up hash algorithm
381
- . builtin/shortlog: don't set up revisions without repo
382
- . builtin/diff: explicitly set hash algo when there is no repo
383
- . builtin/bundle: abort "verify" early when there is no repository
384
- . builtin/blame: don't access potentially unitialized `the_hash_algo`
385
- . builtin/rev-parse: allow shortening to more than 40 hex characters
386
- . remote-curl: fix parsing of detached SHA256 heads
387
- . attr: fix BUG() when parsing attrs outside of repo
388
- . attr: don't recompute default attribute source
389
- . parse-options-cb: only abbreviate hashes when hash algo is known
390
- . path: move `validate_headref()` to its only user
391
- . path: harden validation of HEAD with non-standard hashes
575
+* ps/undecided-is-not-necessarily-sha1 (2024-05-06) 15 commits
576
+ (merged to 'next' on 2024-05-08 at 9f8e894685)
577
+ + repository: stop setting SHA1 as the default object hash
578
+ + oss-fuzz/commit-graph: set up hash algorithm
579
+ + builtin/shortlog: don't set up revisions without repo
580
+ + builtin/diff: explicitly set hash algo when there is no repo
581
+ + builtin/bundle: abort "verify" early when there is no repository
582
+ + builtin/blame: don't access potentially unitialized `the_hash_algo`
583
+ + builtin/rev-parse: allow shortening to more than 40 hex characters
584
+ + remote-curl: fix parsing of detached SHA256 heads
585
+ + attr: fix BUG() when parsing attrs outside of repo
586
+ + attr: don't recompute default attribute source
587
+ + parse-options-cb: only abbreviate hashes when hash algo is known
588
+ + path: move `validate_headref()` to its only user
589
+ + path: harden validation of HEAD with non-standard hashes
590
+ + Merge branch 'ps/the-index-is-no-more' into ps/undecided-is-not-necessarily-sha1
591
+ + Merge branch 'jc/no-default-attr-tree-in-bare' into ps/undecided-is-not-necessarily-sha1
592
+ (this branch uses jc/no-default-attr-tree-in-bare.)
593
594
Before discovering the repository details, We used to assume SHA-1
595
as the "default" hash function, which has been corrected. Hopefully
596
this will smoke out codepaths that rely on such an unwarranted
597
assumptions.
598
398
- Seems to break t0003 with a NULL the_repository.
399
-
400
- Ejected out of 'seen' for now.
401
- source: <cover.1714371422.git.ps@pks.im>
402
-
403
-
404
-* rj/add-p-typo-reaction (2024-04-30) 2 commits
405
- (merged to 'next' on 2024-05-01 at 3016062ebf)
406
- + add-patch: response to unknown command
407
- + add-patch: do not show UI messages on stderr
408
-
409
- When the user responds to a prompt given by "git add -p" with an
410
- unsupported command, list of available commands were given, which
411
- was too much if the user knew what they wanted to type but merely
412
- made a typo. Now the user gets a much shorter error message.
413
-
599
Will merge to 'master'.
415
- source: <952a9514-3cf1-4601-8f0d-db57adc750c3@gmail.com>
416
-
417
-
418
-* ps/the-index-is-no-more (2024-04-18) 6 commits
419
- (merged to 'next' on 2024-05-01 at 7b9a0ab760)
420
- + repository: drop `initialize_the_repository()`
421
- + repository: drop `the_index` variable
422
- + builtin/clone: stop using `the_index`
423
- + repository: initialize index in `repo_init()`
424
- + builtin: stop using `the_index`
425
- + t/helper: stop using `the_index`
426
-
427
- The singleton index_state instance "the_index" has been eliminated
428
- by always instantiating "the_repository" and replacing references
429
- to "the_index" with references to its .index member.
430
-
431
- Will merge to 'master'.
432
- source: <cover.1713442061.git.ps@pks.im>
433
-
434
-
435
-* ps/ci-test-with-jgit (2024-04-12) 13 commits
436
- (merged to 'next' on 2024-05-01 at 35e293e618)
437
- + t0612: add tests to exercise Git/JGit reftable compatibility
438
- + t0610: fix non-portable variable assignment
439
- + t06xx: always execute backend-specific tests
440
- + ci: install JGit dependency
441
- + ci: make Perforce binaries executable for all users
442
- + ci: merge scripts which install dependencies
443
- + ci: fix setup of custom path for GitLab CI
444
- + ci: merge custom PATH directories
445
- + ci: convert "install-dependencies.sh" to use "/bin/sh"
446
- + ci: drop duplicate package installation for "linux-gcc-default"
447
- + ci: skip sudo when we are already root
448
- + ci: expose distro name in dockerized GitHub jobs
449
- + ci: rename "runs_on_pool" to "distro"
450
-
451
- Tests to ensure interoperability between reftable written by jgit
452
- and our code have been added and enabled in CI.
453
-
454
- Will merge to 'master'.
455
- source: <cover.1712896868.git.ps@pks.im>
600
+ source: <cover.1715057362.git.ps@pks.im>
601
602
603
* pw/rebase-i-error-message (2024-04-08) 2 commits
@@ -468,27 +613,6 @@ Release tarballs are available at:
613
source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
614
615
471
-* ps/reftable-write-optim (2024-04-08) 11 commits
472
- (merged to 'next' on 2024-04-30 at 0667e3c05b)
473
- + reftable/block: reuse compressed array
474
- + reftable/block: reuse zstream when writing log blocks
475
- + reftable/writer: reset `last_key` instead of releasing it
476
- + reftable/writer: unify releasing memory
477
- + reftable/writer: refactorings for `writer_flush_nonempty_block()`
478
- + reftable/writer: refactorings for `writer_add_record()`
479
- + refs/reftable: don't recompute committer ident
480
- + reftable: remove name checks
481
- + refs/reftable: skip duplicate name checks
482
- + refs/reftable: perform explicit D/F check when writing symrefs
483
- + refs/reftable: fix D/F conflict error message on ref copy
484
-
485
- Code to write out reftable has seen some optimization and
486
- simplification.
487
-
488
- Will merge to 'master'.
489
- source: <cover.1712578837.git.ps@pks.im>
490
-
491
-
616
* ds/send-email-per-message-block (2024-04-10) 2 commits
617
- send-email: make it easy to discern the messages for each patch
618
- send-email: move newline characters out of a few translatable strings
@@ -513,33 +637,6 @@ Release tarballs are available at:
637
source: <20240328101356.300374-1-e@80x24.org>
638
639
516
-* bc/credential-scheme-enhancement (2024-04-16) 16 commits
517
- (merged to 'next' on 2024-05-01 at 789ec5bd35)
518
- + credential: add method for querying capabilities
519
- + credential-cache: implement authtype capability
520
- + t: add credential tests for authtype
521
- + credential: add support for multistage credential rounds
522
- + t5563: refactor for multi-stage authentication
523
- + docs: set a limit on credential line length
524
- + credential: enable state capability
525
- + credential: add an argument to keep state
526
- + http: add support for authtype and credential
527
- + docs: indicate new credential protocol fields
528
- + credential: add a field called "ephemeral"
529
- + credential: gate new fields on capability
530
- + credential: add a field for pre-encoded credentials
531
- + http: use new headers for each object request
532
- + remote-curl: reset headers on new request
533
- + credential: add an authtype field
534
-
535
- The credential helper protocol, together with the HTTP layer, have
536
- been enhanced to support authentication schemes different from
537
- username & password pair, like Bearer and NTLM.
538
-
539
- Will merge to 'master'.
540
- source: <20240417000240.3611948-1-sandals@crustytoothpaste.net>
541
-
542
-
640
* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits
641
- t/perf: implement performace tests for pseudo-merge bitmaps
642
- pseudo-merge: implement support for finding existing merges
@@ -589,7 +686,8 @@ Release tarballs are available at:
686
687
The trailer API has been reshuffled a bit.
688
592
- Will merge to 'next'?
689
+ Waiting for a review response.
690
+ cf. <a75133dc-a0bb-4f61-a616-988f2b4d5688@gmail.com>
691
source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com>
692
693
@@ -629,20 +727,21 @@ Release tarballs are available at:
727
728
729
* js/unit-test-suite-runner (2024-05-06) 9 commits
632
- - cmake: let `test-tool` run the unit tests, too
633
- - ci: use test-tool as unit test runner on Windows
634
- - t/Makefile: run unit tests alongside shell tests
635
- - unit tests: add rule for running with test-tool
636
- - test-tool run-command testsuite: support unit tests
637
- - test-tool run-command testsuite: remove hardcoded filter
638
- - test-tool run-command testsuite: get shell from env
639
- - t0080: turn t-basic unit test into a helper
640
- - Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
730
+ (merged to 'next' on 2024-05-07 at 3b376223e3)
731
+ + cmake: let `test-tool` run the unit tests, too
732
+ + ci: use test-tool as unit test runner on Windows
733
+ + t/Makefile: run unit tests alongside shell tests
734
+ + unit tests: add rule for running with test-tool
735
+ + test-tool run-command testsuite: support unit tests
736
+ + test-tool run-command testsuite: remove hardcoded filter
737
+ + test-tool run-command testsuite: get shell from env
738
+ + t0080: turn t-basic unit test into a helper
739
+ + Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner
740
741
The "test-tool" has been taught to run testsuite tests in parallel,
742
bypassing the need to use the "prove" tool.
743
645
- Will merge to 'next'.
744
+ Will merge to 'master'.
745
source: <cover.1715024899.git.steadmon@google.com>
746
source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
747