What's cooking (2020/04 #02)

Junio C Hamano committed Apr 20, 2020 at 18:54 UTC 63efe0e5547b28047026f0c838072a8173dae0ec
1 file changed +199 -113
whats-cooking.txt
+199 -113
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Apr 2020, #01; Wed, 15)
4 -X-master-at: efe3874640e2e58209ddbb3b072f48f6b7094f34
5 -X-next-at: 55bc3eb7cb9c200ab95bbd2415bc0a35fbf29053
3 +Subject: What's cooking in git.git (Apr 2020, #02; Mon, 20)
4 +X-master-at: 048abe1751e6727bfbacf7b80466d78e04631f94
5 +X-next-at: 435bf60bd57ed99bd0d44f7afa315bac6c9e97ab
6
7 -What's cooking in git.git (Apr 2020, #01; Wed, 15)
7 +What's cooking in git.git (Apr 2020, #02; Mon, 20)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,12 @@ 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 +Having to issue two security fixes on a pair of very similar issues
16 +was embarrassing, but hopefully that's behind us. Let's restart
17 +merging things down. I am hoping that we can merge all topics
18 +marked to be merged to 'next' by early next week, so please make
19 +loud noises if I mistakenly marked stuff that are not yet ready.
20 +
21 You can find the changes described here in the integration branches
22 of the repositories listed at
23
@@ -20,6 +26,78 @@ of the repositories listed at
26 --------------------------------------------------
27 [New Topics]
28
29 +* eb/mboxrd-doc (2020-04-15) 1 commit
30 + - Documentation: explain "mboxrd" pretty format
31 +
32 + Doc update.
33 +
34 + Will merge to 'next'.
35 +
36 +
37 +* mt/grep-cquote-path (2020-04-20) 1 commit
38 + - grep: follow conventions for printing paths w/ unusual chars
39 +
40 + "git grep" did not quote a path with unusual character like other
41 + commands (like "git diff", "git status") do, but did quote when run
42 + from a subdirectory, both of which has been corrected.
43 +
44 + Will merge to 'next'.
45 +
46 +
47 +* tb/diff-tree-with-notes (2020-04-20) 1 commit
48 + - diff-tree.c: load notes machinery when required
49 +
50 + "git diff-tree --pretty --notes" used to hit an assertion failure,
51 + as it forgot to initialize the notes subsystem.
52 +
53 + Will merge to 'next'.
54 +
55 +
56 +* tm/zsh-complete-switch-restore (2020-04-17) 1 commit
57 + - complete: zsh: add missing sub cmd completion candidates
58 +
59 + zsh command line completion (in contrib/) update.
60 +
61 + Will merge to 'next'.
62 +
63 +
64 +* vd/range-diff-with-custom-pretty-format-fix (2020-04-15) 2 commits
65 + - range-diff: avoid negative string precision
66 + - range-diff: fix a crash in parsing git-log output
67 +
68 + "git range-diff" fixes.
69 +
70 + Will merge to 'next'.
71 + cf. <20200416010734.GE36156@syl.local>
72 +
73 +
74 +* dl/test-must-fail-fixes-4 (2020-04-20) 8 commits
75 + - t9902: don't use `test_must_fail __git_*`
76 + - t9819: don't use test_must_fail with p4
77 + - t9164: use test_must_fail only on git commands
78 + - t9160: use test_path_is_missing()
79 + - t9141: use test_path_is_missing()
80 + - t7508: don't use `test_must_fail test_cmp`
81 + - t7408: replace incorrect uses of test_must_fail
82 + - t6030: use test_path_is_missing()
83 +
84 + Test clean-up.
85 +
86 + Will merge to 'next'.
87 +
88 +--------------------------------------------------
89 +[Stalled]
90 +
91 +* mk/use-size-t-in-zlib (2018-10-15) 1 commit
92 + - zlib.c: use size_t for size
93 +
94 + The wrapper to call into zlib followed our long tradition to use
95 + "unsigned long" for sizes of regions in memory, which have been
96 + updated to use "size_t".
97 +
98 +--------------------------------------------------
99 +[Cooking]
100 +
101 * jk/use-quick-lookup-in-clone-for-tag-following (2020-04-01) 1 commit
102 (merged to 'next' on 2020-04-15 at 11d6110e99)
103 + clone: use "quick" lookup while following tags
@@ -32,20 +110,22 @@ of the repositories listed at
110
111
112 * ds/commit-graph-expiry-fix (2020-04-01) 1 commit
35 - - commit-graph: fix buggy --expire-time option
113 + (merged to 'next' on 2020-04-20 at 4afb3de947)
114 + + commit-graph: fix buggy --expire-time option
115
116 "git commit-graph write --expire-time=<timestamp>" did not use the
117 given timestamp correctly, which has been corrected.
118
40 - Will merge to 'next'.
119 + Will merge to 'master'.
120
121
122 * ds/t5319-touch-fix (2020-04-01) 1 commit
44 - - t5319: replace 'touch -m' with 'test-tool chmtime'
123 + (merged to 'next' on 2020-04-20 at 41ccdb3fcd)
124 + + t5319: replace 'touch -m' with 'test-tool chmtime'
125
126 Tests update to use "test-chmtime" instead of "touch -t".
127
48 - Will merge to 'next'.
128 + Will merge to 'master'.
129
130
131 * en/sequencer-reflog-action (2020-04-07) 1 commit
@@ -73,23 +153,25 @@ of the repositories listed at
153
154
155 * en/rebase-doc-hooks-called-by-accident (2020-04-05) 1 commit
76 - - git-rebase.txt: add another hook to the hooks section, and explain more
156 + (merged to 'next' on 2020-04-20 at 1011f8a876)
157 + + git-rebase.txt: add another hook to the hooks section, and explain more
158
159 "git rebase" happens to call some hooks meant for "checkout" and
160 "commit" by this was not a designed behaviour than historical
161 accident. This has been documented.
162
82 - Will merge to 'next'.
163 + Will merge to 'master'.
164
165
166 * jk/fast-import-use-hashmap (2020-04-06) 1 commit
86 - - fast-import: replace custom hash with hashmap.c
167 + (merged to 'next' on 2020-04-20 at 76e8908efe)
168 + + fast-import: replace custom hash with hashmap.c
169
170 The custom hash function used by "git fast-import" has been
171 replaced with the one from hashmap.c, which gave us a nice
172 performance boost.
173
92 - Will merge to 'next'.
174 + Will merge to 'master'.
175
176
177 * js/t0007-typofix (2020-04-05) 1 commit
@@ -102,25 +184,27 @@ of the repositories listed at
184
185
186 * jt/avoid-prefetch-when-able-in-diff (2020-04-07) 4 commits
105 - - diff: restrict when prefetching occurs
106 - - diff: refactor object read
107 - - diff: make diff_populate_filespec_options struct
108 - - promisor-remote: accept 0 as oid_nr in function
187 + (merged to 'next' on 2020-04-20 at 02b52c34bf)
188 + + diff: restrict when prefetching occurs
189 + + diff: refactor object read
190 + + diff: make diff_populate_filespec_options struct
191 + + promisor-remote: accept 0 as oid_nr in function
192
193 "git diff" in a partial clone learned to avoid lazy loading blob
194 objects in more casese when they are not needed.
195
113 - Will merge to 'next'.
196 + Will merge to 'master'.
197
198
199 * lx/submodule-clear-variables (2020-04-02) 1 commit
117 - - git-submodule.sh: setup uninitialized variables
200 + (merged to 'next' on 2020-04-20 at c18cd924c9)
201 + + git-submodule.sh: setup uninitialized variables
202
203 The "git submodule" command did not initialize a few variables it
204 internally uses and was affected by variable settings leaked from
205 the environment.
206
123 - Will merge to 'next'.
207 + Will merge to 'master'.
208
209
210 * pb/pull-fetch-doc (2020-04-05) 2 commits
@@ -136,26 +220,27 @@ of the repositories listed at
220
221
222 * dd/ci-swap-azure-pipelines-with-github-actions (2020-04-10) 14 commits
139 - - ci: let GitHub Actions upload failed tests' directories
140 - - ci: add a problem matcher for GitHub Actions
141 - - tests: when run in Bash, annotate test failures with file name/line number
142 - - ci: retire the Azure Pipelines definition
143 - - README: add a build badge for the GitHub Actions runs
144 - - ci: configure GitHub Actions for CI/PR
145 - - ci: run gem with sudo to install asciidoctor
146 - - ci: explicit install all required packages
147 - - ci: fix the `jobname` of the `GETTEXT_POISON` job
148 - - ci/lib: set TERM environment variable if not exist
149 - - ci/lib: allow running in GitHub Actions
150 - - ci/lib: if CI type is unknown, show the environment variables
151 - - Merge branch 'dd/ci-musl-libc' into HEAD
152 - - Merge branch 'dd/test-with-busybox' into HEAD
223 + (merged to 'next' on 2020-04-20 at 40d0486c23)
224 + + ci: let GitHub Actions upload failed tests' directories
225 + + ci: add a problem matcher for GitHub Actions
226 + + tests: when run in Bash, annotate test failures with file name/line number
227 + + ci: retire the Azure Pipelines definition
228 + + README: add a build badge for the GitHub Actions runs
229 + + ci: configure GitHub Actions for CI/PR
230 + + ci: run gem with sudo to install asciidoctor
231 + + ci: explicit install all required packages
232 + + ci: fix the `jobname` of the `GETTEXT_POISON` job
233 + + ci/lib: set TERM environment variable if not exist
234 + + ci/lib: allow running in GitHub Actions
235 + + ci/lib: if CI type is unknown, show the environment variables
236 + + Merge branch 'dd/ci-musl-libc' into HEAD
237 + + Merge branch 'dd/test-with-busybox' into HEAD
238 (this branch uses dd/ci-musl-libc and dd/test-with-busybox.)
239
240 Update the CI configuration to use GitHub Actions, retiring the one
241 based on Azure Pipelines.
242
158 - Will merge to 'next'.
243 + Will merge to 'master'.
244
245
246 * eb/format-patch-no-encode-headers (2020-04-07) 1 commit
@@ -182,22 +267,24 @@ of the repositories listed at
267
268
269 * js/stash-p-fix (2020-04-08) 2 commits
185 - - stash -p: (partially) fix bug concerning split hunks
186 - - t3904: fix incorrect demonstration of a bug
270 + (merged to 'next' on 2020-04-20 at 435bf60bd5)
271 + + stash -p: (partially) fix bug concerning split hunks
272 + + t3904: fix incorrect demonstration of a bug
273
274 Allowing the user to split a patch hunk while "git stash -p" does
275 not work well; a band-aid has been added to make this (partially)
276 work better.
277
192 - Will merge to 'next'.
278 + Will merge to 'master'.
279
280
281 * js/subtree-doc-update-to-asciidoctor-2 (2020-04-08) 1 commit
196 - - subtree: fix build with AsciiDoctor 2
282 + (merged to 'next' on 2020-04-20 at db1ed7a858)
283 + + subtree: fix build with AsciiDoctor 2
284
285 Doc markup update.
286
200 - Will merge to 'next'.
287 + Will merge to 'master'.
288
289
290 * pw/rebase-i-more-options (2020-04-07) 7 commits
@@ -216,12 +303,13 @@ of the repositories listed at
303
304
305 * bc/constant-memequal (2020-04-09) 1 commit
219 - - builtin/receive-pack: use constant-time comparison for HMAC value
306 + (merged to 'next' on 2020-04-20 at 31180dae7d)
307 + + builtin/receive-pack: use constant-time comparison for HMAC value
308
309 Validation of push certificate has been made more robust against
310 timing attacks.
311
224 - Will merge to 'next'.
312 + Will merge to 'master'.
313
314
315 * ds/revision-show-pulls (2020-04-10) 1 commit
@@ -264,18 +352,19 @@ of the repositories listed at
352
353
354 * jk/config-use-size-t (2020-04-10) 6 commits
267 - - config: reject parsing of files over INT_MAX
268 - - config: use size_t to store parsed variable baselen
269 - - git_config_parse_key(): return baselen as size_t
270 - - config: drop useless length variable in write_pair()
271 - - parse_config_key(): return subsection len as size_t
272 - - remote: drop auto-strlen behavior of make_branch() and make_rewrite()
355 + (merged to 'next' on 2020-04-20 at 4af9fea74f)
356 + + config: reject parsing of files over INT_MAX
357 + + config: use size_t to store parsed variable baselen
358 + + git_config_parse_key(): return baselen as size_t
359 + + config: drop useless length variable in write_pair()
360 + + parse_config_key(): return subsection len as size_t
361 + + remote: drop auto-strlen behavior of make_branch() and make_rewrite()
362
363 The config API made mixed uses of int and size_t types to represent
364 length of various pieces of text it parsed, which has been updated
365 to use the correct type (i.e. size_t) throughout.
366
278 - Will merge to 'next'.
367 + Will merge to 'master'.
368
369
370 * js/flush-prompt-before-interative-input (2020-04-10) 2 commits
@@ -326,16 +415,17 @@ of the repositories listed at
415 Will merge to 'master'.
416
417
329 -* ds/blame-on-bloom (2020-04-13) 4 commits
418 +* ds/blame-on-bloom (2020-04-16) 3 commits
419 - blame: use changed-path Bloom filters
331 - - commit-graph: write commit-graph in more tests
332 - - commit: write commit-graph with Bloom filters
420 + - tests: write commit-graph with Bloom filters
421 - revision: complicated pathspecs disable filters
422 (this branch uses gs/commit-graph-path-filter.)
423
424 "git blame" learns to take advantage of the "changed-paths" Bloom
425 filter stored in the commit-graph file.
426
427 + Will merge to 'next'.
428 +
429
430 * dd/iso-8601-updates (2020-04-15) 2 commits
431 - date.c: allow compact version of ISO-8601 datetime
@@ -343,19 +433,20 @@ of the repositories listed at
433
434 The approxidate parser learns to parse seconds with fraction.
435
346 - Will merge to 'next'.
436 + Expecting further work.
437 + cf. <20200417133647.GA26701@danh.dev>
438
439
349 -* ds/log-exclude-decoration-config (2020-04-15) 2 commits
350 - - SQUASH???
440 +* ds/log-exclude-decoration-config (2020-04-16) 2 commits
441 - log: add log.excludeDecoration config option
442 + - log-tree: make ref_filter_match() a helper method
443
444 The "--decorate-refs" and "--decorate-refs-exclude" options "git
445 log" takes have learned a companion configuration variable
446 log.excludeDecoration that sits at the lowest priority in the
447 family.
448
358 - Getting there.
449 + Will merge to 'next'.
450
451
452 * jk/credential-parsing-end-of-host-in-URL (2020-04-15) 1 commit
@@ -368,12 +459,13 @@ of the repositories listed at
459
460
461 * lr/freshen-file-fix (2020-04-15) 1 commit
371 - - freshen_file(): use NULL `times' for implicit current-time
462 + (merged to 'next' on 2020-04-20 at e9370b0a81)
463 + + freshen_file(): use NULL `times' for implicit current-time
464
465 The code that refreshes the last access and modified time of
466 on-disk packfiles and loose object files have been updated.
467
376 - Will merge to 'next'.
468 + Will merge to 'master'.
469
470
471 * tb/commit-graph-split-strategy (2020-04-15) 7 commits
@@ -388,18 +480,6 @@ of the repositories listed at
480 "git commit-graph write" learned different ways to write out split
481 files.
482
391 ---------------------------------------------------
392 -[Stalled]
393 -
394 -* mk/use-size-t-in-zlib (2018-10-15) 1 commit
395 - - zlib.c: use size_t for size
396 -
397 - The wrapper to call into zlib followed our long tradition to use
398 - "unsigned long" for sizes of regions in memory, which have been
399 - updated to use "size_t".
400 -
401 ---------------------------------------------------
402 -[Cooking]
483
484 * gs/commit-graph-path-filter (2020-04-09) 16 commits
485 - bloom: ignore renames when computing changed paths
@@ -424,7 +504,7 @@ of the repositories listed at
504 check for the paths that were modified at each commit using Bloom
505 filters.
506
427 - Getting there.
507 + Will merge to 'next'.
508
509
510 * ag/rebase-merge-allow-ff-under-abbrev-command (2020-03-30) 2 commits
@@ -492,30 +572,31 @@ of the repositories listed at
572
573
574 * dd/ci-musl-libc (2020-04-06) 6 commits
495 - - travis: build and test on Linux with musl libc and busybox
496 - - ci/linux32: libify install-dependencies step
497 - - ci: refactor docker runner script
498 - - ci/linux32: parameterise command to switch arch
499 - - ci/lib-docker: preserve required environment variables
500 - - ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
575 + + travis: build and test on Linux with musl libc and busybox
576 + + ci/linux32: libify install-dependencies step
577 + + ci: refactor docker runner script
578 + + ci/linux32: parameterise command to switch arch
579 + + ci/lib-docker: preserve required environment variables
580 + + ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
581 (this branch is used by dd/ci-swap-azure-pipelines-with-github-actions.)
582
583 A new CI job to build and run test suite on linux with musl libc
584 has been added.
585
506 - Will merge to 'next'.
586 + Will merge to 'master'.
587
588
589 * dr/doc-recurse-submodules (2020-04-06) 5 commits
510 - - doc: --recurse-submodules mostly applies to active submodules
511 - - doc: be more precise on (fetch|push).recurseSubmodules
512 - - doc: explain how to deactivate submodule.recurse completely
513 - - doc: document --recurse-submodules for reset and restore
514 - - doc: list all commands affected by submodule.recurse
590 + (merged to 'next' on 2020-04-20 at 601e10f9a1)
591 + + doc: --recurse-submodules mostly applies to active submodules
592 + + doc: be more precise on (fetch|push).recurseSubmodules
593 + + doc: explain how to deactivate submodule.recurse completely
594 + + doc: document --recurse-submodules for reset and restore
595 + + doc: list all commands affected by submodule.recurse
596
597 Documentation updates around the "--recurse-submodules" option.
598
518 - Will merge to 'next'.
599 + Will merge to 'master'.
600
601
602 * dr/push-remoteref-fix (2020-04-06) 2 commits
@@ -533,12 +614,13 @@ of the repositories listed at
614
615
616 * jc/doc-test-leaving-early (2020-03-29) 1 commit
536 - - t/README: suggest how to leave test early with failure
617 + (merged to 'next' on 2020-04-20 at 4bd94585d1)
618 + + t/README: suggest how to leave test early with failure
619
620 Document the recommended way to abort a failing test early (e.g. by
621 exiting a loop), which is to say "return 1".
622
541 - Will merge to 'next'.
623 + Will merge to 'master'.
624
625
626 * jk/build-with-right-curl (2020-04-05) 3 commits
@@ -660,32 +742,35 @@ of the repositories listed at
742 Will merge to 'master'.
743
744
663 -* jx/atomic-push (2020-03-29) 4 commits
664 - - transport-helper: new method reject_atomic_push()
665 - - transport-helper: mark failure for atomic push
666 - - send-pack: mark failure of atomic push properly
667 - - t5543: never report what we do not push
745 +* jx/atomic-push (2020-04-17) 5 commits
746 + (merged to 'next' on 2020-04-20 at 266d6934d8)
747 + + transport-helper: new method reject_atomic_push()
748 + + transport-helper: mark failure for atomic push
749 + + send-pack: mark failure of atomic push properly
750 + + t5543: never report what we do not push
751 + + send-pack: fix inconsistent porcelain output
752
753 "git push --atomic" used to show failures for refs that weren't
754 even pushed, which has been corrected.
755
672 - Will merge to 'next'.
756 + Will merge to 'master'.
757
758
759 * ma/doc-discard-docbook-xsl-1.73 (2020-03-31) 7 commits
676 - - user-manual.conf: don't specify [listingblock]
677 - - INSTALL: drop support for docbook-xsl before 1.74
678 - - manpage-normal.xsl: fold in manpage-base.xsl
679 - - manpage-bold-literal.xsl: stop using git.docbook.backslash
680 - - Doc: drop support for docbook-xsl before 1.73.0
681 - - Doc: drop support for docbook-xsl before 1.72.0
682 - - Doc: drop support for docbook-xsl before 1.71.1
760 + (merged to 'next' on 2020-04-20 at c280472e02)
761 + + user-manual.conf: don't specify [listingblock]
762 + + INSTALL: drop support for docbook-xsl before 1.74
763 + + manpage-normal.xsl: fold in manpage-base.xsl
764 + + manpage-bold-literal.xsl: stop using git.docbook.backslash
765 + + Doc: drop support for docbook-xsl before 1.73.0
766 + + Doc: drop support for docbook-xsl before 1.72.0
767 + + Doc: drop support for docbook-xsl before 1.71.1
768
769 Raise the minimum required version of docbook-xsl package to 1.74,
770 as 1.74.0 was from late 2008, which is more than 10 years old, and
771 drop compatibility cruft from our documentation suite.
772
688 - Will merge to 'next'.
773 + Will merge to 'master'.
774
775
776 * pb/rebase-doc-typofix (2020-03-28) 1 commit
@@ -727,7 +812,7 @@ of the repositories listed at
812 made its performance characteristics exponential with respect to
813 the depth of the tree, which was corrected.
814
730 - Is this ready for 'next'?
815 + Will merge to 'next'.
816
817
818 * dd/test-with-busybox (2020-03-26) 8 commits
@@ -749,15 +834,16 @@ of the repositories listed at
834
835
836 * dl/libify-a-few (2020-03-24) 2 commits
752 - - Lib-ify prune-packed
753 - - Lib-ify fmt-merge-msg
837 + (merged to 'next' on 2020-04-20 at 84eb704a32)
838 + + Lib-ify prune-packed
839 + + Lib-ify fmt-merge-msg
840
841 Code in builtin/*, i.e. those can only be called from within
842 built-in subcommands, that implements bulk of a couple of
843 subcommands have been moved to libgit.a so that they could be used
844 by others.
845
760 - Will merge to 'next'.
846 + Will merge to 'master'.
847
848
849 * dl/test-must-fail-fixes-3 (2020-03-27) 8 commits
@@ -960,18 +1046,17 @@ of the repositories listed at
1046
1047
1048 * jc/log-no-mailmap (2020-03-16) 3 commits
963 - - log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
964 - - clone: reorder --recursive/--recurse-submodules
965 - - parse-options: teach "git cmd -h" to show alias as alias
1049 + (merged to 'next' on 2020-04-20 at b43968e73e)
1050 + + log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
1051 + + clone: reorder --recursive/--recurse-submodules
1052 + + parse-options: teach "git cmd -h" to show alias as alias
1053
1054 "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
1055
969 - Will merge to 'next'.
1056 + Will merge to 'master'.
1057
1058
972 -* hn/reftable (2020-04-09) 11 commits
973 - - SQUASH??? - whitespace errors
974 - - SQUASH??? - do not forget to clean reftable library
1059 +* hn/reftable (2020-04-20) 10 commits
1060 - Reftable support for git-core
1061 - Add reftable library
1062 - reftable: clarify how empty tables should be written
@@ -980,6 +1065,7 @@ of the repositories listed at
1065 - Add .gitattributes for the reftable/ directory
1066 - refs: document how ref_iterator_advance_fn should handle symrefs
1067 - create .git/refs in files-backend.c
1068 + - Iterate over the "refs/" namespace in for_each_[raw]ref
1069 - refs.h: clarify reflog iteration order
1070
1071 A new refs backend "reftable" to replace the traditional
@@ -987,11 +1073,11 @@ of the repositories listed at
1073 has been implemented and integrated for improved performance and
1074 atomicity.
1075
990 - At v8.
991 - cf. <pull.539.v8.git.1585740538.gitgitgadget@gmail.com>
1076 + At v9
1077 + cf. <pull.539.v9.git.1587417295.gitgitgadget@gmail.com>
1078
1079
994 -* es/bugreport (2020-04-06) 5 commits
1080 +* es/bugreport (2020-04-16) 5 commits
1081 - bugreport: add compiler info
1082 - bugreport: add uname info
1083 - bugreport: gather git version and build info