What's cooking (2021/06 #04)
Junio C Hamano committed
Jun 10, 2021 at 13:31 UTC
94390190440bd1fd036dbf43c39a74da95b816cc
2 files changed
+315
-196
cook
+11
-5
@@ -287,11 +287,17 @@ sub blurb_text {
287
$master_at ||= '0' x 40;
288
$next_at ||= '0' x 40;
289
$text ||= <<'EOF';
290
-Here are the topics that have been cooking. Commits prefixed with '-' are
291
-only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
292
-with '+' are in 'next'. The ones marked with '.' do not appear in any of
293
-the integration branches, but I am still holding onto them.
294
-
290
+Here are the topics that have been cooking in my tree. Commits
291
+prefixed with '-' are only in 'seen' while commits prefixed with '+'
292
+are in 'next'. The ones marked with '.' do not appear in any of the
293
+integration branches, but I am still holding onto them. Generally,
294
+being in 'next' is a sign that a topic is stable enough to be used
295
+and are candidate to be in a future release, while being in 'seen'
296
+means nothing more than that the maintainer has found it interesting
297
+for some reason (like "it may have hard-to-resolve conflicts with
298
+another topic already in flight" or "this may turn out to be
299
+useful")---do not read too much into a topic being in (or not in)
300
+'seen'.
301
302
303
Copies of the source code to Git live in many repositories, and the
whats-cooking.txt
+304
-191
@@ -1,44 +1,29 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2021, #03; Tue, 8)
4
-X-master-at: ebf3c04b262aa27fbb97f8a0156c2347fecafafb
5
-X-next-at: 935e593368000d8476c1712a0a3d40699d2af34b
3
+Subject: What's cooking in git.git (Jun 2021, #04; Thu, 10)
4
+X-master-at: 211eca0895794362184da2be2a2d812d070719d3
5
+X-next-at: 62a8d224e6203d9d3d2d1d63a01cf5647ec312c9
6
7
-What's cooking in git.git (Jun 2021, #03; Tue, 8)
7
+What's cooking in git.git (Jun 2021, #04; Thu, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
11
-prefixed with '-' are only in 'seen' (which collects random set of
12
-topics that are not yet in 'next') while commits prefixed with '+'
11
+prefixed with '-' are only in 'seen' while commits prefixed with '+'
12
are in 'next'. The ones marked with '.' do not appear in any of the
14
-integration branches, but I am still holding onto them.
15
-
16
-As announced in the previous issue of this report, while we wait to
17
-see if people notice brown-paper-bag bugs and deal with them, we'd
18
-start merging down topics that have been cooking in 'next' from
19
-simpler and obvious ones. This issue marks the simpler ones to be
20
-merged to 'master' soonish (please holler if you have a reason some
21
-of them should wait further fixup):
22
-
23
- ef/mailinfo-short-name
24
- mt/parallel-checkout-with-padded-oidcpy
25
- jn/size-t-casted-to-off-t-fix
26
- ah/merge-usage-i18n-fix
27
- ah/stash-usage-i18n-fix
28
- ah/submodule-helper-module-summary-parseopt
29
- ah/doc-describe
30
- jc/clarify-revision-range
31
- wm/rev-parse-die-i18n
32
- ry/clarify-fast-forward-in-glossary
33
- tl/fix-packfile-uri-doc
34
- jk/doc-color-pager
35
- ah/fetch-reject-warning-grammofix
36
- ah/setup-extensions-message-i18n-fix
37
-
38
-while leaving topics that touch the code in a more significant ways
39
-in 'next' for the next batch. Also those topics that are not yet in
40
-'next' but are marked to be merged to 'next' would stay out until
41
-next week when the tip of 'next' gets rebuilt on 2.32.
13
+integration branches, but I am still holding onto them. Generally,
14
+being in 'next' is a sign that a topic is stable enough to be used
15
+and are candidate to be in a future release, while being in 'seen'
16
+means nothing more than that the maintainer has found it interesting
17
+for some reason (like "it may have hard-to-resolve conflicts with
18
+another topic already in flight" or "this may turn out to be
19
+useful")---do not read too much into a topic being in (or not in)
20
+'seen'.
21
+
22
+The first batch of topics that have been cooking in 'next' are now
23
+in 'master'. They are all simple and obvious improvements. The
24
+next batch is expected to be more extensive. Also those topics that
25
+are not yet in 'next' but are marked to be merged to 'next' would
26
+stay out until the tip of 'next' gets rewound.
27
28
Copies of the source code to Git live in many repositories, and the
29
following is a list of the ones I push into or their mirrors. Some
@@ -68,38 +53,265 @@ Release tarballs are available at:
53
54
https://www.kernel.org/pub/software/scm/git/
55
56
+--------------------------------------------------
57
+[Graduated to 'master']
58
+
59
+* ah/doc-describe (2021-05-17) 1 commit
60
+ (merged to 'next' on 2021-05-22 at 8f3925fd41)
61
+ + describe-doc: clarify default length of abbreviation
62
+
63
+ Doc update.
64
+
65
+
66
+* ah/fetch-reject-warning-grammofix (2021-05-20) 1 commit
67
+ (merged to 'next' on 2021-05-28 at 09820da41b)
68
+ + fetch: improve grammar of "shallow roots" message
69
+
70
+ Message update.
71
+
72
+
73
+* ah/merge-usage-i18n-fix (2021-05-16) 1 commit
74
+ (merged to 'next' on 2021-05-20 at e26a60d624)
75
+ + merge: don't translate literal commands
76
+
77
+ i18n update.
78
+
79
+
80
+* ah/setup-extensions-message-i18n-fix (2021-05-20) 1 commit
81
+ (merged to 'next' on 2021-05-28 at 562b4e6f10)
82
+ + setup: split "extensions found" messages into singular and plural
83
+
84
+ Message update.
85
+
86
+
87
+* ah/stash-usage-i18n-fix (2021-05-17) 1 commit
88
+ (merged to 'next' on 2021-05-20 at 68e6a46117)
89
+ + stash: don't translate literal commands
90
+
91
+ i18n update.
92
+
93
+
94
+* ah/submodule-helper-module-summary-parseopt (2021-05-17) 1 commit
95
+ (merged to 'next' on 2021-05-20 at 928e72b83f)
96
+ + submodule: use the imperative mood to describe the --files option
97
+
98
+ Message update.
99
+
100
+
101
+* ef/mailinfo-short-name (2021-05-17) 1 commit
102
+ (merged to 'next' on 2021-05-20 at 5ee67911ea)
103
+ + mailinfo: don't discard names under 3 characters
104
+
105
+ We historically rejected a very short string as an author name
106
+ while accepting a patch e-mail, which has been loosened.
107
+
108
+
109
+* jc/clarify-revision-range (2021-05-18) 1 commit
110
+ (merged to 'next' on 2021-05-22 at 83a689d8ad)
111
+ + revisions(7): clarify that most commands take a single revision range
112
+
113
+ Doc update.
114
+
115
+
116
+* jk/doc-color-pager (2021-05-20) 1 commit
117
+ (merged to 'next' on 2021-05-28 at 52e4aa77df)
118
+ + doc: explain the use of color.pager
119
+
120
+ The documentation for "color.pager" configuration variable has been
121
+ updated.
122
+
123
+
124
+* jn/size-t-casted-to-off-t-fix (2021-05-19) 1 commit
125
+ (merged to 'next' on 2021-05-20 at bbde7e6616)
126
+ + xsize_t: avoid implementation defined behavior when len < 0
127
+
128
+ Rewrite code that triggers undefined behaiour warning.
129
+
130
+
131
+* mt/parallel-checkout-with-padded-oidcpy (2021-05-18) 1 commit
132
+ (merged to 'next' on 2021-05-20 at 016cab0381)
133
+ + parallel-checkout: send the new object_id algo field to the workers
134
+
135
+ The parallel checkout codepath did not initialize object ID field
136
+ used to talk to the worker processes in a futureproof way.
137
+
138
+
139
+* ry/clarify-fast-forward-in-glossary (2021-05-19) 1 commit
140
+ (merged to 'next' on 2021-05-22 at 97a851d59f)
141
+ + docs: improve fast-forward in glossary content
142
+
143
+ The description of "fast-forward" in the glossary has been updated.
144
+
145
+
146
+* tl/fix-packfile-uri-doc (2021-05-25) 1 commit
147
+ (merged to 'next' on 2021-05-25 at d047277014)
148
+ + packfile-uri.txt: fix blobPackfileUri description
149
+
150
+ Doc fix.
151
+
152
+
153
+* wm/rev-parse-die-i18n (2021-05-17) 1 commit
154
+ (merged to 'next' on 2021-05-22 at 65c256d92b)
155
+ + rev-parse: mark die() messages for translation
156
+
157
+ Quite a many die() messages in rev-parse haven't been marked for
158
+ translation.
159
+
160
--------------------------------------------------
161
[New Topics]
162
74
-* dd/svn-test-wo-locale-a (2021-06-07) 1 commit
75
- - t: use user-specified utf-8 locale for testing svn
163
+* ab/cmd-foo-should-return (2021-06-09) 1 commit
164
+ - builtins + test helpers: use return instead of exit() in cmd_*
165
77
- "git-svn" tests assumed that "locale -a", which is used to pick an
78
- available UTF-8 locale, is available everywhere. A knob has been
79
- introduced to allow testers to specify a suitable locale to use.
166
+ Code clean-up.
167
168
+ Will merge to 'next'.
169
82
-* fc/completion-updates (2021-06-07) 4 commits
83
- - completion: bash: add correct suffix in variables
84
- - completion: bash: fix for multiple dash commands
85
- - completion: bash: fix for suboptions with value
86
- - completion: bash: fix prefix detection in branch.*
170
88
- Command line completion updates.
171
+* ab/progress-cleanup (2021-06-08) 1 commit
172
+ - read-cache.c: don't guard calls to progress.c API
173
90
- Expecting a reroll.
91
- cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
174
+ Code clean-up.
175
176
+ Will merge to 'next'.
177
94
-* mr/cmake (2021-06-07) 3 commits
95
- - cmake: add warning for ignored MSGFMT_EXE
96
- - cmake: create compile_commands.json by default
97
- - cmake: add knob to disable vcpkg
178
99
- CMake update.
179
+* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
180
+ - read-cache perf: add a perf test for refresh_index()
181
+ - test-tool: migrate read-cache-again to parse_options()
182
+ - test-tool: migrate read-cache-perf to parse_options()
183
+ - test-tool: split up test-tool read-cache
184
+
185
+ Test code shuffling.
186
+
187
+ Comments?
188
+
189
+
190
+* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
191
+ - xdiff: use BUG(...), not xdl_bug(...)
192
+
193
+ Code clean-up.
194
+
195
+ Will merge to 'next'.
196
+
197
+
198
+* ar/test-code-cleanup (2021-06-08) 1 commit
199
+ - t: fix whitespace around &&
200
+
201
+ Test code clean-up.
202
+
203
+ Will merge to 'next'.
204
+
205
+
206
+* ba/object-info (2021-06-08) 1 commit
207
+ - protocol-caps.h: add newline at end of file
208
+
209
+ Code clean-up.
210
+
211
+ Will merge to 'next'.
212
+
213
+
214
+* dd/document-log-decorate-default (2021-06-08) 1 commit
215
+ - doc/log: correct default for --decorate
216
+
217
+ Doc clean-up.
218
+
219
+ Will merge to 'next'.
220
+
221
+
222
+* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
223
+ - doc: merge: mention default of defaulttoupstream
224
+
225
+ Doc clean-up.
226
+
227
+ Will merge to 'next'.
228
+
229
+
230
+* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
231
+ - mergetools/kdiff3: make kdiff3 work on Windows too
232
+
233
+ On Windows, mergetool has been taught to find kdiff3.exe just like
234
+ it finds winmerge.exe.
235
+
236
+ Will merge to 'next'.
237
+
238
+
239
+* ab/pack-objects-stdin (2021-06-09) 4 commits
240
+ - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
241
+ - pack-objects.c: do stdin parsing via revision.c's API
242
+ - revision.h: unify "disable_stdin" and "read_from_stdin"
243
+ - upload-pack: run is_repository_shallow() before setup_revisions()
244
+
245
+ Code clean-up.
246
+
247
+ Comments?
248
+
249
+
250
+* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
251
+ - MyFirstContribution: link #git-devel to Libera Chat
252
+
253
+ Update MyFirst document.
254
+
255
+ Will merge to 'next'.
256
+
257
+
258
+* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
259
+ - mailinfo: use starts_with() when checking scissors
260
+
261
+ Code clean-up.
262
+
263
+ Will merge to 'next'.
264
+
265
+
266
+* ar/submodule-add (2021-06-09) 2 commits
267
+ - submodule--helper: introduce add-config subcommand
268
+ - submodule--helper: introduce add-clone subcommand
269
+
270
+ Rewrite of "git submodule" in C continues.
271
+
272
+ Comments?
273
+
274
+
275
+* ds/gender-neutral-doc (2021-06-10) 4 commits
276
+ - CodingGuidelines: recommend singular they
277
+ - *: fix typos
278
+ - *: use singular they in comments
279
+ - Documentation: use singular they when appropriate
280
+
281
+ Attempt to update the documentation not to assume users are of
282
+ certain gender and adds to guidelines to do so.
283
+
284
+ Will wait for conclusion of the on-list discussion.
285
+
286
+
287
+* gh/gitweb-branch-sort (2021-06-10) 1 commit
288
+ - gitweb: use HEAD as secondary sort key in git_get_heads_list()
289
+
290
+ Tie-break branches that point at the same object in the list of
291
+ branches on GitWeb to show the one pointed at by HEAD early.
292
+
293
+ Comments?
294
+
295
+
296
+* jk/doc-max-pack-size (2021-06-09) 1 commit
297
+ - doc: warn people against --max-pack-size
298
+
299
+ Doc update.
300
301
Will merge to 'next'.
302
303
+
304
+* lh/systemd-timers (2021-06-09) 3 commits
305
+ - maintenance: add support for systemd timers on Linux
306
+ - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
307
+ - cache.h: Introduce a generic "xdg_config_home_for(…)" function
308
+
309
+ "git maintenance" scheduler learned to use systemd timers as a
310
+ possible backend.
311
+
312
+ Expecting a reroll.
313
+ cf. <YMCLQ5pOyg+SSKhD@coredump.intra.peff.net>
314
+
315
--------------------------------------------------
316
[Stalled]
317
@@ -337,7 +549,39 @@ Release tarballs are available at:
549
--------------------------------------------------
550
[Cooking]
551
340
-* ab/update-submitting-patches (2021-05-13) 3 commits
552
+* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
553
+ - t: use user-specified utf-8 locale for testing svn
554
+
555
+ "git-svn" tests assumed that "locale -a", which is used to pick an
556
+ available UTF-8 locale, is available everywhere. A knob has been
557
+ introduced to allow testers to specify a suitable locale to use.
558
+
559
+ Will merge to 'next'.
560
+
561
+
562
+* fc/completion-updates (2021-06-07) 4 commits
563
+ - completion: bash: add correct suffix in variables
564
+ - completion: bash: fix for multiple dash commands
565
+ - completion: bash: fix for suboptions with value
566
+ - completion: bash: fix prefix detection in branch.*
567
+
568
+ Command line completion updates.
569
+
570
+ Expecting a reroll.
571
+ cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
572
+
573
+
574
+* mr/cmake (2021-06-07) 3 commits
575
+ - cmake: add warning for ignored MSGFMT_EXE
576
+ - cmake: create compile_commands.json by default
577
+ - cmake: add knob to disable vcpkg
578
+
579
+ CMake update.
580
+
581
+ Will merge to 'next'.
582
+
583
+
584
+* ab/update-submitting-patches (2021-06-08) 3 commits
585
- SubmittingPatches: remove pine-specific hints from MUA hints
586
- SubmittingPatches: replace discussion of Travis with GitHub Actions
587
- SubmittingPatches: move discussion of Signed-off-by above "send"
@@ -345,7 +589,8 @@ Release tarballs are available at:
589
Reorganize and update the SubmitingPatches document.
590
591
Expecting a reroll.
348
- cf. <xmqq4kf7fueq.fsf@gitster.g>, <20210512235136.GB10785@localhost>
592
+ cf. <20210607172542.GA6312@szeder.dev>
593
+ cf. <nycvar.QRO.7.76.6.2106072346560.55@tvgsbejvaqbjf.bet>
594
595
596
* hn/prep-tests-for-reftable (2021-06-02) 22 commits
@@ -449,18 +694,16 @@ Release tarballs are available at:
694
Will merge to 'next'.
695
696
452
-* en/ort-perf-batch-12 (2021-06-04) 4 commits
697
+* en/ort-perf-batch-12 (2021-06-09) 4 commits
698
- merge-ort: miscellaneous touch-ups
454
- - merge-ort: fix various issues found in comments
699
+ - Fix various issues found in comments
700
- diffcore-rename: avoid unnecessary strdup'ing in break_idx
701
- merge-ort: replace string_list_df_name_compare with faster alternative
702
(this branch uses en/ort-perf-batch-11.)
703
704
460
-* zh/ref-filter-raw-data (2021-06-07) 6 commits
461
- . ref-filter: add %(raw:textconv) and %(raw:filters)
462
- . ref-filter: teach grab_sub_body_contents() return value and err
463
- . ref-filter: add %(rest) atom and --rest option
705
+* zh/ref-filter-raw-data (2021-06-10) 4 commits
706
+ . ref-filter: add %(rest) atom
707
. ref-filter: use non-const ref_format in *_atom_parser()
708
. ref-filter: add %(raw) atom
709
. ref-filter: add obj-type check in grab contents
@@ -569,24 +812,6 @@ Release tarballs are available at:
812
Will merge to 'master'.
813
814
572
-* ah/fetch-reject-warning-grammofix (2021-05-20) 1 commit
573
- (merged to 'next' on 2021-05-28 at 09820da41b)
574
- + fetch: improve grammar of "shallow roots" message
575
-
576
- Message update.
577
-
578
- Will merge to 'master'.
579
-
580
-
581
-* ah/setup-extensions-message-i18n-fix (2021-05-20) 1 commit
582
- (merged to 'next' on 2021-05-28 at 562b4e6f10)
583
- + setup: split "extensions found" messages into singular and plural
584
-
585
- Message update.
586
-
587
- Will merge to 'master'.
588
-
589
-
815
* jk/clone-clean-upon-transport-error (2021-05-19) 1 commit
816
(merged to 'next' on 2021-05-22 at 464b1f187c)
817
+ clone: clean up directory after transport_fetch_refs() failure
@@ -597,16 +822,6 @@ Release tarballs are available at:
822
Will cook in 'next'.
823
824
600
-* jk/doc-color-pager (2021-05-20) 1 commit
601
- (merged to 'next' on 2021-05-28 at 52e4aa77df)
602
- + doc: explain the use of color.pager
603
-
604
- The documentation for "color.pager" configuration variable has been
605
- updated.
606
-
607
- Will merge to 'master'.
608
-
609
-
825
* jk/fetch-pack-v2-half-close-early (2021-05-20) 1 commit
826
(merged to 'next' on 2021-05-28 at 56e97ec2df)
827
+ fetch-pack: signal v2 server that we are done making requests
@@ -618,26 +833,7 @@ Release tarballs are available at:
833
Will cook in 'next'.
834
835
621
-* ry/clarify-fast-forward-in-glossary (2021-05-19) 1 commit
622
- (merged to 'next' on 2021-05-22 at 97a851d59f)
623
- + docs: improve fast-forward in glossary content
624
-
625
- The description of "fast-forward" in the glossary has been updated.
626
-
627
- Will merge to 'master'.
628
-
629
-
630
-* wm/rev-parse-die-i18n (2021-05-17) 1 commit
631
- (merged to 'next' on 2021-05-22 at 65c256d92b)
632
- + rev-parse: mark die() messages for translation
633
-
634
- Quite a many die() messages in rev-parse haven't been marked for
635
- translation.
636
-
637
- Will merge to 'master'.
638
-
639
-
640
-* es/trace2-log-parent-process-name (2021-05-25) 1 commit
836
+* es/trace2-log-parent-process-name (2021-06-09) 1 commit
837
- tr2: log parent process name
838
839
@@ -684,15 +880,6 @@ Release tarballs are available at:
880
Will cook in 'next'.
881
882
687
-* tl/fix-packfile-uri-doc (2021-05-25) 1 commit
688
- (merged to 'next' on 2021-05-25 at d047277014)
689
- + packfile-uri.txt: fix blobPackfileUri description
690
-
691
- Doc fix.
692
-
693
- Will merge to 'master'.
694
-
695
-
883
* ga/send-email-sendmail-cmd (2021-05-17) 1 commit
884
(merged to 'next' on 2021-05-22 at 755df67f0e)
885
+ git-send-email: add option to specify sendmail command
@@ -706,52 +893,6 @@ Release tarballs are available at:
893
Will cook in 'next'.
894
895
709
-* ah/doc-describe (2021-05-17) 1 commit
710
- (merged to 'next' on 2021-05-22 at 8f3925fd41)
711
- + describe-doc: clarify default length of abbreviation
712
-
713
- Doc update.
714
-
715
- Will merge to 'master'.
716
-
717
-
718
-* ah/merge-usage-i18n-fix (2021-05-16) 1 commit
719
- (merged to 'next' on 2021-05-20 at e26a60d624)
720
- + merge: don't translate literal commands
721
-
722
- i18n update.
723
-
724
- Will merge to 'master'.
725
-
726
-
727
-* ah/stash-usage-i18n-fix (2021-05-17) 1 commit
728
- (merged to 'next' on 2021-05-20 at 68e6a46117)
729
- + stash: don't translate literal commands
730
-
731
- i18n update.
732
-
733
- Will merge to 'master'.
734
-
735
-
736
-* ah/submodule-helper-module-summary-parseopt (2021-05-17) 1 commit
737
- (merged to 'next' on 2021-05-20 at 928e72b83f)
738
- + submodule: use the imperative mood to describe the --files option
739
-
740
- Message update.
741
-
742
- Will merge to 'master'.
743
-
744
-
745
-* ef/mailinfo-short-name (2021-05-17) 1 commit
746
- (merged to 'next' on 2021-05-20 at 5ee67911ea)
747
- + mailinfo: don't discard names under 3 characters
748
-
749
- We historically rejected a very short string as an author name
750
- while accepting a patch e-mail, which has been loosened.
751
-
752
- Will merge to 'master'.
753
-
754
-
896
* ds/write-index-with-hashfile-api (2021-05-19) 4 commits
897
(merged to 'next' on 2021-05-28 at f0c51ddf7c)
898
+ read-cache: delete unused hashing methods
@@ -765,34 +906,6 @@ Release tarballs are available at:
906
Will cook in 'next'.
907
908
768
-* jc/clarify-revision-range (2021-05-18) 1 commit
769
- (merged to 'next' on 2021-05-22 at 83a689d8ad)
770
- + revisions(7): clarify that most commands take a single revision range
771
-
772
- Doc update.
773
-
774
- Will merge to 'master'.
775
-
776
-
777
-* jn/size-t-casted-to-off-t-fix (2021-05-19) 1 commit
778
- (merged to 'next' on 2021-05-20 at bbde7e6616)
779
- + xsize_t: avoid implementation defined behavior when len < 0
780
-
781
- Rewrite code that triggers undefined behaiour warning.
782
-
783
- Will merge to 'master'.
784
-
785
-
786
-* mt/parallel-checkout-with-padded-oidcpy (2021-05-18) 1 commit
787
- (merged to 'next' on 2021-05-20 at 016cab0381)
788
- + parallel-checkout: send the new object_id algo field to the workers
789
-
790
- The parallel checkout codepath did not initialize object ID field
791
- used to talk to the worker processes in a futureproof way.
792
-
793
- Will merge to 'master'.
794
-
795
-
909
* so/log-m-implies-p (2021-05-21) 10 commits
910
(merged to 'next' on 2021-05-28 at 2733ec2409)
911
+ diff-merges: let "-m" imply "-p"