What's cooking (2020/05 #02)
Junio C Hamano committed
May 5, 2020 at 15:37 UTC
6b33381979ddf4ded63407224d2b2a0f7967898c
1 file changed
+263
-127
whats-cooking.txt
+263
-127
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2020, #01; Fri, 1)
4
-X-master-at: b34789c0b0d3b137f0bb516b417bd8d75e0cb306
5
-X-next-at: 232c24e857ed6ddde51b0435add1905f58948aec
3
+Subject: What's cooking in git.git (May 2020, #02; Tue, 5)
4
+X-master-at: 07d8ea56f2ecb64b75b92264770c0a664231ce17
5
+X-next-at: 55c56c9c57da646085d27e61a3420043978ab4a1
6
7
-What's cooking in git.git (May 2020, #01; Fri, 1)
7
+What's cooking in git.git (May 2020, #02; Tue, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The sixth batch merged quite a few topics to 'master'; they haven't
16
-spent the usual "at least a week" in the 'next' branch, but all of
17
-them looked quite safe and benign. Knock wood.
18
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -24,6 +20,24 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
+* bc/wildcard-credential (2020-04-27) 1 commit
24
+ (merged to 'next' on 2020-04-28 at 1a0d6b91dc)
25
+ + credential: fix matching URLs with multiple levels in path
26
+
27
+ Update the parser used for credential.<URL>.<variable>
28
+ configuration, to handle <URL>s with '/' in them correctly.
29
+
30
+
31
+* dd/iso-8601-updates (2020-04-24) 4 commits
32
+ (merged to 'next' on 2020-04-28 at 18fba39171)
33
+ + date.c: allow compact version of ISO-8601 datetime
34
+ + date.c: skip fractional second part of ISO-8601
35
+ + date.c: validate and set time in a helper function
36
+ + date.c: s/is_date/set_date/
37
+
38
+ The approxidate parser learns to parse seconds with fraction.
39
+
40
+
41
* dd/mailinfo-with-nul (2020-04-22) 3 commits
42
(merged to 'next' on 2020-04-28 at b1d3e40d49)
43
+ mailinfo: disallow NUL character in mail's header
@@ -44,6 +58,20 @@ of the repositories listed at
58
Compilation fix.
59
60
61
+* dl/opt-callback-cleanup (2020-04-28) 1 commit
62
+ (merged to 'next' on 2020-04-28 at aa773e183a)
63
+ + Use OPT_CALLBACK and OPT_CALLBACK_F
64
+
65
+ Code cleanup.
66
+
67
+
68
+* dl/push-recurse-submodules-fix (2020-04-28) 1 commit
69
+ (merged to 'next' on 2020-04-28 at c2cd20ef9e)
70
+ + push: unset PARSE_OPT_OPTARG for --recurse-submodules
71
+
72
+ Code cleanup.
73
+
74
+
75
* dl/test-must-fail-fixes-4 (2020-04-20) 7 commits
76
(merged to 'next' on 2020-04-28 at 6f4804aa09)
77
+ t9819: don't use test_must_fail with p4
@@ -153,6 +181,13 @@ of the repositories listed at
181
cf. <20200428033611.GB2369457@coredump.intra.peff.net>
182
183
184
+* jk/test-fail-prereqs-fix (2020-04-28) 1 commit
185
+ (merged to 'next' on 2020-04-28 at 75787711c0)
186
+ + t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests
187
+
188
+ Test update.
189
+
190
+
191
* js/anonymise-push-url-in-errors (2020-04-28) 1 commit
192
(merged to 'next' on 2020-04-28 at 49539cf116)
193
+ push: anonymize URLs in error messages and warnings
@@ -161,6 +196,29 @@ of the repositories listed at
196
credential material embedded in URLs.
197
198
199
+* js/partial-urlmatch (2020-04-29) 3 commits
200
+ (merged to 'next' on 2020-05-01 at e7017fcfd1)
201
+ + Sync with js/partial-urlmatch-2.17
202
+ + credential: handle `credential.<partial-URL>.<key>` again
203
+ + credential: optionally allow partial URLs in credential_from_url_gently()
204
+ (this branch uses js/partial-urlmatch-2.17.)
205
+
206
+ The same as js/partial-urlmatch-2.17, built on more recent codebase
207
+ to avoid unnecessary merge conflicts.
208
+
209
+
210
+* js/partial-urlmatch-2.17 (2020-04-29) 3 commits
211
+ (merged to 'next' on 2020-05-01 at 7c69571f89)
212
+ + credential: handle `credential.<partial-URL>.<key>` again
213
+ + credential: optionally allow partial URLs in credential_from_url_gently()
214
+ + credential: fix grammar
215
+ (this branch is used by js/partial-urlmatch.)
216
+
217
+ Recent updates broke parsing of "credential.<url>.<key>" where
218
+ <url> is not a full URL (e.g. [credential "https://"] helper = ...)
219
+ stopped working, which has been corrected.
220
+
221
+
222
* jt/v2-fetch-nego-fix (2020-04-28) 3 commits
223
(merged to 'next' on 2020-04-28 at c6f9ebf2f7)
224
+ fetch-pack: in protocol v2, reset in_vain upon ACK
@@ -192,6 +250,19 @@ of the repositories listed at
250
does not have to.
251
252
253
+* tb/commit-graph-perm-bits (2020-04-29) 5 commits
254
+ (merged to 'next' on 2020-04-29 at 66a87c1fbc)
255
+ + commit-graph.c: make 'commit-graph-chain's read-only
256
+ + commit-graph.c: ensure graph layers respect core.sharedRepository
257
+ + commit-graph.c: write non-split graphs as read-only
258
+ + lockfile.c: introduce 'hold_lock_file_for_update_mode'
259
+ + tempfile.c: introduce 'create_tempfile_mode'
260
+
261
+ Some of the files commit-graph subsystem keeps on disk did not
262
+ correctly honor the core.sharedRepository settings and some were
263
+ left read-write.
264
+
265
+
266
* tb/commit-graph-split-strategy (2020-04-29) 8 commits
267
(merged to 'next' on 2020-04-29 at 99fa922569)
268
+ Revert "commit-graph.c: introduce '--[no-]check-oids'"
@@ -237,15 +308,18 @@ of the repositories listed at
308
"git log -L..." now takes advantage of the "which paths are touched
309
by this commit?" info stored in the commit-graph system.
310
311
+ Expecting a reroll.
312
+ cf. <4b7e5f51-9fdb-45ac-123e-2589087afa48@gmail.com>
313
+
314
241
-* es/restore-staged-from-head-by-default (2020-05-01) 3 commits
242
- - restore: default to HEAD when combining --worktree and --staged
243
- - fixup! restore: require --source when combining --worktree and --staged
244
- - restore: require --source when combining --worktree and --staged
315
+* es/restore-staged-from-head-by-default (2020-05-05) 1 commit
316
+ - restore: default to HEAD when combining --staged and --worktree
317
318
"git restore --staged --worktree" now defaults to take the contents
319
out of "HEAD", instead of erroring out.
320
321
+ Will merge to 'next'.
322
+
323
324
* jk/credential-sample-update (2020-05-01) 2 commits
325
- gitcredentials(7): make shell-snippet example more realistic
@@ -257,6 +331,145 @@ of the repositories listed at
331
332
Will merge to 'next'.
333
334
+
335
+* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits
336
+ - ref-filter: apply fallback refname sort only after all user sorts
337
+ - ref-filter: apply --ignore-case to all sorting keys
338
+
339
+ "git branch" and other "for-each-ref" variants accepted multiple
340
+ --sort=<key> options in the increasing order of precedence, but it
341
+ had a few breakages around "--ignore-case" handling, and tiebreaking
342
+ with the refname, which have been fixed.
343
+
344
+ Will merge to 'next'.
345
+
346
+
347
+* js/rebase-autosquash-double-fixup-fix (2020-05-04) 1 commit
348
+ - rebase --autosquash: fix a potential segfault
349
+
350
+ "rebase -i" segfaulted when rearranging a sequence that has a
351
+ fix-up that applies another fix-up (which may or may not be a
352
+ fix-up of yet another step).
353
+
354
+ Under review.
355
+ cf. <pull.625.git.1588624804554.gitgitgadget@gmail.com>
356
+
357
+
358
+* jt/commit-graph-plug-memleak (2020-05-04) 1 commit
359
+ - commit-graph: avoid memory leaks
360
+
361
+ Fix a leak noticed by fuzzer.
362
+
363
+ Will merge to 'next'.
364
+
365
+
366
+* cb/credential-doc-fixes (2020-05-04) 4 commits
367
+ - credential: document protocol updates
368
+ - credential: update gitcredentials documentation
369
+ - credential: correct order of parameters for credential_match
370
+ - credential: update description for credential_from_url_gently
371
+
372
+ Minor in-code comments and documentation updates around credential
373
+ API.
374
+
375
+ Needs review.
376
+ cf. <20200505013908.4596-1-carenas@gmail.com>
377
+
378
+
379
+* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit
380
+ - sparse-checkout: stop blocking empty workdirs
381
+
382
+ The sparse-checkout patterns have been forbidden from excluding all
383
+ paths, leaving an empty working tree, for a long time. This
384
+ limitation has been lifted.
385
+
386
+ Will merge to 'next'.
387
+
388
+
389
+* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit
390
+ - CodingGuidelines: drop arithmetic expansion advice to use "$x"
391
+
392
+ The coding guideline for shell scripts instructed to refer to a
393
+ variable with dollar-sign inside airthmetic expansion to work
394
+ around a bug in old versions of dash, which is a thing of the past.
395
+ Now we are not forbidden from writing $((var+1)).
396
+
397
+ Will merge to 'next'.
398
+
399
+
400
+* tb/bitmap-walk-with-tree-zero-filter (2020-05-04) 4 commits
401
+ - pack-bitmap: pass object filter to fill-in traversal
402
+ - pack-bitmap.c: support 'tree:0' filtering
403
+ - pack-bitmap.c: make object filtering functions generic
404
+ - list-objects-filter: treat NULL filter_options as "disabled"
405
+
406
+ The object walk with object filter "--filter=tree:0" can now take
407
+ advantage of the pack bitmap when available.
408
+
409
+ Will merge to 'next'.
410
+
411
+
412
+* tb/commit-graph-no-check-oids (2020-05-04) 8 commits
413
+ - commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
414
+ - t5318: reorder test below 'graph_read_expect'
415
+ - commit-graph.c: simplify 'fill_oids_from_commits'
416
+ - builtin/commit-graph.c: dereference tags in builtin
417
+ - builtin/commit-graph.c: extract 'read_one_commit()'
418
+ - commit-graph.c: peel refs in 'add_ref_to_set'
419
+ - commit-graph.c: show progress of finding reachable commits
420
+ - commit-graph.c: extract 'refs_cb_data'
421
+
422
+ Clean-up the commit-graph codepath.
423
+
424
+ Expecting a reroll
425
+ cf. <20200505161649.GG69300@syl.local>
426
+
427
+
428
+* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit
429
+ - builtin/receive-pack: avoid generic function name hmac()
430
+
431
+ The <stdlib.h> header on NetBSD brings in its own definition of
432
+ hmac() function (eek), which conflicts with our own and unrelated
433
+ function with the same name. Our function has been renamed to work
434
+ around the issue.
435
+
436
+ Will merge to 'next'.
437
+
438
+
439
+* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit
440
+ - Doc: reference the "stash list" in autostash docs
441
+
442
+ Doc update.
443
+
444
+ Will merge to 'next'.
445
+
446
+
447
+* dl/test-must-fail-fixes-5 (2020-05-05) 4 commits
448
+ - lib-submodule-update: pass OVERWRITING_FAIL
449
+ - lib-submodule-update: prepend "git" to $command
450
+ - lib-submodule-update: consolidate --recurse-submodules
451
+ - lib-submodule-update: add space after function name
452
+
453
+ The effort to avoid using test_must_fail on non-git command continues.
454
+
455
+ Needs review.
456
+ cf. <cover.1588162842.git.liu.denton@gmail.com>
457
+
458
+
459
+* dd/ci-only-on-selective-branches (2020-05-05) 2 commits
460
+ - CI: limit GitHub Actions to designated branches
461
+ - SubmittingPatches: advertise GitHub Actions CI
462
+
463
+ Instead of always building all branches of all forks of our project
464
+ at GitHub via GitHub Actions, only build when branches with known
465
+ and specific names are updated, and also a pull request.
466
+
467
+ Expecting an update.
468
+ cf. <cover.1588695295.git.congdanhqx@gmail.com>
469
+ The description talks too much about helping (or not getting in the
470
+ way of) the current maintainer, but the focus should instead be
471
+ general contributors.
472
+
473
--------------------------------------------------
474
[Stalled]
475
@@ -270,9 +483,10 @@ of the repositories listed at
483
--------------------------------------------------
484
[Cooking]
485
273
-* cb/credential-store-warn-bogus-lines (2020-04-30) 2 commits
274
- - credential-store: warn instead of fatal for bogus lines from store
275
- - credential-store: document the file format a bit more
486
+* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits
487
+ (merged to 'next' on 2020-05-05 at 5b919ec5d6)
488
+ + credential-store: ignore bogus lines from store file
489
+ + credential-store: document the file format a bit more
490
491
With the recent tightening of the code that is used to parse
492
various parts of a URL for use in the credential subsystem, a
@@ -280,20 +494,18 @@ of the repositories listed at
494
die, which is a bit too harsh to the users. Demote the error
495
behaviour to only warn and keep using well-formed lines instead.
496
283
- Expecting a final reroll.
284
- It seems that we decided to do absolute minimum to avoid doing any
285
- unnecessary harm. Ignore malformed lines but without warning.
286
- cf. <20200501135757.GF33264@Carlos-MBP>
497
+ Will merge to 'master'.
498
499
500
* dl/switch-c-option-in-error-message (2020-04-30) 1 commit
290
- - switch: fix errors and comments related to -c and -C
501
+ (merged to 'next' on 2020-05-05 at 472db48735)
502
+ + switch: fix errors and comments related to -c and -C
503
504
In error messages that "git switch" mentions its option to create a
505
new branch, "-b/-B" options were shown, where "-c/-C" options
506
should be, which has been corrected.
507
296
- Will merge to 'next'.
508
+ Will merge to 'master'.
509
510
511
* es/bugreport-with-hooks (2020-04-30) 2 commits
@@ -306,32 +518,24 @@ of the repositories listed at
518
519
520
* tb/shallow-cleanup (2020-04-30) 4 commits
309
- - shallow: use struct 'shallow_lock' for additional safety
310
- - shallow.h: document '{commit,rollback}_shallow_file'
311
- - shallow: extract a header file for shallow-related functions
312
- - commit: make 'commit_graft_pos' non-static
521
+ (merged to 'next' on 2020-05-05 at 647588a8bd)
522
+ + shallow: use struct 'shallow_lock' for additional safety
523
+ + shallow.h: document '{commit,rollback}_shallow_file'
524
+ + shallow: extract a header file for shallow-related functions
525
+ + commit: make 'commit_graft_pos' non-static
526
527
Code cleanup.
528
316
- Will merge to 'next'.
317
-
318
-
319
-* bc/wildcard-credential (2020-04-27) 1 commit
320
- (merged to 'next' on 2020-04-28 at 1a0d6b91dc)
321
- + credential: fix matching URLs with multiple levels in path
322
-
323
- Update the parser used for credential.<URL>.<variable>
324
- configuration, to handle <URL>s with '/' in them correctly.
325
-
529
Will merge to 'master'.
530
531
329
-* ah/userdiff-markdown (2020-04-30) 1 commit
330
- - userdiff: support Markdown
532
+* ah/userdiff-markdown (2020-05-02) 1 commit
533
+ (merged to 'next' on 2020-05-05 at b8e64b75d0)
534
+ + userdiff: support Markdown
535
536
The userdiff patterns for Markdown documents have been added.
537
334
- Will merge to 'next'.
538
+ Will merge to 'master'.
539
540
541
* mr/bisect-in-c-2 (2020-04-23) 12 commits
@@ -350,34 +554,7 @@ of the repositories listed at
554
555
Rewrite of the remainder of "git bisect" script in C continues.
556
353
- Any volunteer to review this?
354
-
355
-
356
-* js/partial-urlmatch-2.17 (2020-04-29) 3 commits
357
- (merged to 'next' on 2020-05-01 at 7c69571f89)
358
- + credential: handle `credential.<partial-URL>.<key>` again
359
- + credential: optionally allow partial URLs in credential_from_url_gently()
360
- + credential: fix grammar
361
- (this branch is used by js/partial-urlmatch.)
362
-
363
- Recent updates broke parsing of "credential.<url>.<key>" where
364
- <url> is not a full URL (e.g. [credential "https://"] helper = ...)
365
- stopped working, which has been corrected.
366
-
367
- Will merge to 'master'.
368
-
369
-
370
-* js/partial-urlmatch (2020-04-29) 3 commits
371
- (merged to 'next' on 2020-05-01 at e7017fcfd1)
372
- + Sync with js/partial-urlmatch-2.17
373
- + credential: handle `credential.<partial-URL>.<key>` again
374
- + credential: optionally allow partial URLs in credential_from_url_gently()
375
- (this branch uses js/partial-urlmatch-2.17.)
376
-
377
- The same as js/partial-urlmatch-2.17, built on more recent codebase
378
- to avoid unnecessary merge conflicts.
379
-
380
- Will merge to 'master'.
557
+ Needs review.
558
559
560
* jk/complete-git-switch (2020-04-28) 11 commits
@@ -396,47 +573,7 @@ of the repositories listed at
573
The command line completion (in contrib/) learned to complete
574
options that the "git switch" command takes.
575
399
-
400
-* tb/commit-graph-perm-bits (2020-04-29) 5 commits
401
- (merged to 'next' on 2020-04-29 at 66a87c1fbc)
402
- + commit-graph.c: make 'commit-graph-chain's read-only
403
- + commit-graph.c: ensure graph layers respect core.sharedRepository
404
- + commit-graph.c: write non-split graphs as read-only
405
- + lockfile.c: introduce 'hold_lock_file_for_update_mode'
406
- + tempfile.c: introduce 'create_tempfile_mode'
407
-
408
- Some of the files commit-graph subsystem keeps on disk did not
409
- correctly honor the core.sharedRepository settings and some were
410
- left read-write.
411
-
412
- Will merge to 'master'.
413
-
414
-
415
-* dl/opt-callback-cleanup (2020-04-28) 1 commit
416
- (merged to 'next' on 2020-04-28 at aa773e183a)
417
- + Use OPT_CALLBACK and OPT_CALLBACK_F
418
-
419
- Code cleanup.
420
-
421
- Will merge to 'master'.
422
-
423
-
424
-* dl/push-recurse-submodules-fix (2020-04-28) 1 commit
425
- (merged to 'next' on 2020-04-28 at c2cd20ef9e)
426
- + push: unset PARSE_OPT_OPTARG for --recurse-submodules
427
-
428
- Code cleanup.
429
-
430
- Will merge to 'master'.
431
-
432
-
433
-* jk/test-fail-prereqs-fix (2020-04-28) 1 commit
434
- (merged to 'next' on 2020-04-28 at 75787711c0)
435
- + t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests
436
-
437
- Test update.
438
-
439
- Will merge to 'master'.
576
+ Needs review.
577
578
579
* dr/push-remoteref-fix (2020-04-23) 1 commit
@@ -461,36 +598,28 @@ of the repositories listed at
598
599
"git rebase -i" learns a bit more options.
600
601
+ Needs review.
602
465
-* dd/iso-8601-updates (2020-04-24) 4 commits
466
- (merged to 'next' on 2020-04-28 at 18fba39171)
467
- + date.c: allow compact version of ISO-8601 datetime
468
- + date.c: skip fractional second part of ISO-8601
469
- + date.c: validate and set time in a helper function
470
- + date.c: s/is_date/set_date/
471
-
472
- The approxidate parser learns to parse seconds with fraction.
473
-
474
- Will merge to 'master'.
603
476
-
477
-* jx/proc-receive-hook (2020-04-15) 8 commits
478
- - SQUASH???
604
+* jx/proc-receive-hook (2020-05-05) 7 commits
605
- doc: add documentation for the proc-receive hook
606
- receive-pack: new config receive.procReceiveRefs
607
- refs.c: refactor to reuse ref_is_hidden()
482
- - send-pack: extension for client-side status report
608
+ - receive-pack: feed report options to post-receive
609
+ - New capability "report-status-v2" for git-push
610
- receive-pack: add new proc-receive hook
484
- - connect: export parse_feature_value()
611
- transport: not report a non-head push as a branch
612
613
"git receive-pack" that accepts requests by "git push" learned to
614
outsource most of the ref updates to the new "proc-receive" hook.
615
616
+ Needs review.
617
491
-* hn/reftable (2020-04-27) 12 commits
618
+
619
+* hn/reftable (2020-05-04) 12 commits
620
- t: use update-ref and show-ref to reading/writing refs
621
- Add some reftable testing infrastructure
622
+ - vcxproj: adjust for the reftable changes
623
- Reftable support for git-core
624
- Add reftable library
625
- reftable: clarify how empty tables should be written
@@ -498,7 +627,6 @@ of the repositories listed at
627
- reftable: file format documentation
628
- Add .gitattributes for the reftable/ directory
629
- refs: document how ref_iterator_advance_fn should handle symrefs
501
- - create .git/refs in files-backend.c
630
- Iterate over the "refs/" namespace in for_each_[raw]ref
631
- refs.h: clarify reflog iteration order
632
@@ -507,9 +635,7 @@ of the repositories listed at
635
has been implemented and integrated for improved performance and
636
atomicity.
637
510
- At v10. VCbuild may have to be updated to deal with the new lib.
511
- cf. https://github.com/git/git/runs/624424705?check_suite_focus=true
512
- cf. <pull.539.v10.git.1588018418.gitgitgadget@gmail.com>
638
+ At v11.
639
640
--------------------------------------------------
641
[Discarded]
@@ -518,3 +644,13 @@ of the repositories listed at
644
. credential-store: document the file format a bit more
645
646
Now has become a part of Carlo's credential-store fix patches.
647
+
648
+
649
+* js/ci-skip-on-github-workflow (2020-05-02) 1 commit
650
+ . ci: respect the [skip ci] convention in our GitHub workflow "CI/PR"
651
+
652
+ Allow contributors to mark a branch/push that it does not have to
653
+ be built via GitHub actions, in a way similar to how Travis lets
654
+ them mark the commits with an embedded "[skip ci]" string.
655
+
656
+ Superseded by dd/ci-only-on-selective-branches topic.