What's cooking (2020/03 #08)
Junio C Hamano committed
Mar 25, 2020 at 15:01 UTC
a1559cac8e400e7493b2337cbbefe9e634e50f53
1 file changed
+267
-214
whats-cooking.txt
+267
-214
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2020, #07; Sun, 22)
4
-X-master-at: 274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925
5
-X-next-at: b8618d28a927273cc429ccf5d4d91508d4fb0799
3
+Subject: What's cooking in git.git (Mar 2020, #08; Wed, 25)
4
+X-master-at: a7d14a44285d3ec4b25bf9e3b7df701221350661
5
+X-next-at: 33ef6b2f381b0c2d6c1eba5609779d5de2162ad9
6
7
-What's cooking in git.git (Mar 2020, #07; Sun, 22)
7
+What's cooking in git.git (Mar 2020, #08; Wed, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,8 @@ 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
-Git 2.26 (final) has been tagged.
15
+The first batch of topics after v2.26 are now in 'master'. I plan
16
+to rewind and rebuild 'next' after merging another batch.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -22,67 +23,126 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
25
-* en/rebase-backend (2020-03-20) 1 commit
26
- (merged to 'next' on 2020-03-21 at abd2f92971)
27
- + t3419: prevent failure when run with EXPENSIVE
26
+* am/real-path-fix (2020-03-10) 4 commits
27
+ (merged to 'next' on 2020-03-11 at 1f843820a7)
28
+ + get_superproject_working_tree(): return strbuf
29
+ + real_path_if_valid(): remove unsafe API
30
+ + real_path: remove unsafe API
31
+ + set_git_dir: fix crash when used with real_path()
32
29
- Test fix.
33
+ The real_path() convenience function can easily be misused; with a
34
+ bit of code refactoring in the callers' side, its use has been
35
+ eliminated.
36
31
---------------------------------------------------
32
-[New Topics]
37
34
-* ds/default-pack-use-sparse-to-true (2020-03-20) 2 commits
35
- (merged to 'next' on 2020-03-21 at 25cc87784d)
36
- + pack-objects: flip the use of GIT_TEST_PACK_SPARSE
37
- + config: set pack.useSparse=true by default
38
+* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
39
+ (merged to 'next' on 2020-03-16 at 609a322030)
40
+ + connected.c: reprepare packs for corner cases
41
39
- The 'pack.useSparse' configuration variable now defaults to 'true',
40
- enabling an optimization that has been experimental since Git 2.21.
42
+ Corner case "git fetch" fix.
43
42
- Will cook in 'next'.
44
45
+* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
46
+ (merged to 'next' on 2020-03-16 at a79879866d)
47
+ + oidset: remove unnecessary include
48
45
-* js/trace2-env-vars (2020-03-20) 1 commit
46
- - trace2: teach Git to log environment variables
49
+ Code clean-up.
50
48
- Trace2 enhancement to allow logging of the environment variables.
51
52
+* hw/advise-ng (2020-03-05) 4 commits
53
+ (merged to 'next' on 2020-03-09 at ea9e5a1fa3)
54
+ + tag: use new advice API to check visibility
55
+ + advice: revamp advise API
56
+ + advice: change "setupStreamFailure" to "setUpstreamFailure"
57
+ + advice: extract vadvise() from advise()
58
51
-* ar/test-style-fixes (2020-03-22) 2 commits
52
- - t: fix whitespace around &&
53
- - t9500: remove spaces after redirect operators
59
+ Revamping of the advise API to allow more systematic enumeration of
60
+ advice knobs in the future.
61
55
- Style fixes.
62
57
- Will merge to 'next'.
63
+* jc/config-tar (2020-03-18) 1 commit
64
+ (merged to 'next' on 2020-03-19 at aa6216fd1a)
65
+ + separate tar.* config to its own source file
66
67
+ Improve the structure of the documentation source a bit.
68
60
-* ds/doc-clone-filter (2020-03-22) 1 commit
61
- - clone: document --filter options
69
+
70
+* jc/maintain-doc (2020-03-09) 1 commit
71
+ (merged to 'next' on 2020-03-09 at 7f1a754f60)
72
+ + update how-to-maintain-git
73
74
Doc update.
75
65
- Will merge to 'next'.
76
77
+* js/https-proxy-config (2020-03-05) 2 commits
78
+ (merged to 'next' on 2020-03-09 at 8a06f8501d)
79
+ + http: add environment variable support for HTTPS proxies
80
+ + http: add client cert support for HTTPS proxies
81
68
-* jk/t3419-drop-expensive-tests (2020-03-22) 1 commit
69
- - t3419: drop EXPENSIVE tests
82
+ A handful of options to configure SSL when talking to proxies have
83
+ been added.
84
71
- Test update.
85
73
- Will merge to 'next'.
86
+* pw/advise-rebase-skip (2019-12-06) 7 commits
87
+ (merged to 'next' on 2020-03-11 at 80386de756)
88
+ + commit: give correct advice for empty commit during a rebase
89
+ + commit: encapsulate determine_whence() for sequencer
90
+ + commit: use enum value for multiple cherry-picks
91
+ + sequencer: write CHERRY_PICK_HEAD for reword and edit
92
+ + cherry-pick: check commit error messages
93
+ + cherry-pick: add test for `--skip` advice in `git commit`
94
+ + t3404: use test_cmp_rev
95
96
+ The mechanism to prevent "git commit" from making an empty commit
97
+ or amending during an interrupted cherry-pick was broken during the
98
+ rewrite of "git rebase" in C, which has been corrected.
99
+ cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
100
76
-* jt/connectivity-check-optim-in-partial-clone (2020-03-22) 1 commit
77
- - connected: always use partial clone optimization
101
79
- Simplify the commit ancestry connectedness check in a partial clone
80
- repository in which "promised" objects are assumed to be obtainable
81
- lazily on-demand from promisor remote repositories.
102
+* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
103
+ (merged to 'next' on 2020-03-12 at f08dab7228)
104
+ + pull: document more passthru options
105
+
106
+ Doc update.
107
108
109
+* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
110
+ (merged to 'next' on 2020-03-11 at 0496b26f23)
111
+ + commit-slab: clarify slabname##_peek()'s return value
112
85
-* mt/test-lib-bundled-short-options (2020-03-22) 9 commits
113
+ In-code comment update.
114
+
115
+
116
+* ss/submodule-foreach-cb (2020-03-18) 1 commit
117
+ (merged to 'next' on 2020-03-21 at 6651eafe02)
118
+ + submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'
119
+
120
+ Code clean-up.
121
+
122
+
123
+* yz/p4-py3 (2020-03-10) 14 commits
124
+ (merged to 'next' on 2020-03-11 at 01ca57c2b2)
125
+ + ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
126
+ + git-p4: use python3's input() everywhere
127
+ + git-p4: simplify regex pattern generation for parsing diff-tree
128
+ + git-p4: use dict.items() iteration for python3 compatibility
129
+ + git-p4: use functools.reduce instead of reduce
130
+ + git-p4: fix freezing while waiting for fast-import progress
131
+ + git-p4: use marshal format version 2 when sending to p4
132
+ + git-p4: open .gitp4-usercache.txt in text mode
133
+ + git-p4: convert path to unicode before processing them
134
+ + git-p4: encode/decode communication with git for python3
135
+ + git-p4: encode/decode communication with p4 for python3
136
+ + git-p4: remove string type aliasing
137
+ + git-p4: change the expansion test from basestring to list
138
+ + git-p4: make python2.7 the oldest supported version
139
+
140
+ Update "git p4" to work with Python 3.
141
+
142
+--------------------------------------------------
143
+[New Topics]
144
+
145
+* dd/test-with-busybox (2020-03-25) 8 commits
146
- t5703: feed raw data into test-tool unpack-sideband
147
- t4124: fix test for non-compliant diff(1)
148
- t7063: drop non-POSIX argument "-ls" from find(1)
@@ -91,9 +151,87 @@ of the repositories listed at
151
- t5003: drop the subshell in test_lazy_prereq
152
- test-lib-functions: test_cmp: eval $GIT_TEST_CMP
153
- t4061: use POSIX compliant regex(7)
94
- - test-lib: allow short options to be bundled
154
96
- Minor test usability improvement.
155
+ Various tests have been updated to work around issues found with
156
+ shell utilities that come with busybox etc.
157
+
158
+ Will merge to 'next'.
159
+
160
+
161
+* dl/libify-a-few (2020-03-24) 2 commits
162
+ - Lib-ify prune-packed
163
+ - Lib-ify fmt-merge-msg
164
+
165
+ Code in builtin/*, i.e. those can only be called from within
166
+ built-in subcommands, that implements bulk of a couple of
167
+ subcommands have been moved to libgit.a so that they could be used
168
+ by others.
169
+
170
+
171
+* dl/test-must-fail-fixes-3 (2020-03-24) 8 commits
172
+ - t5801: teach compare_refs() to accept !
173
+ - t5612: stop losing return codes of git commands
174
+ - t5612: don't use `test_must_fail test_cmp`
175
+ - t5607: reorder `nongit test_must_fail`
176
+ - t5550: remove use of `test_might_fail grep`
177
+ - t5512: stop losing return codes of git commands
178
+ - t5512: generate references with generate_references()
179
+ - t5512: don't use `test_must_fail test_cmp`
180
+
181
+ Test clean-up continues.
182
+
183
+
184
+* en/sparse-checkout (2020-03-23) 18 commits
185
+ - sparse-checkout: provide a new reapply subcommand
186
+ - unpack-trees: failure to set SKIP_WORKTREE bits always just a warning
187
+ - unpack-trees: provide warnings on sparse updates for unmerged paths too
188
+ - unpack-trees: make sparse path messages sound like warnings
189
+ - unpack-trees: split display_error_msgs() into two
190
+ - unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*
191
+ - unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier
192
+ - sparse-checkout: use improved unpack_trees porcelain messages
193
+ - sparse-checkout: use new update_sparsity() function
194
+ - unpack-trees: add a new update_sparsity() function
195
+ - unpack-trees: pull sparse-checkout pattern reading into a new function
196
+ - unpack-trees: do not mark a dirty path with SKIP_WORKTREE
197
+ - unpack-trees: allow check_updates() to work on a different index
198
+ - t1091: make some tests a little more defensive against failures
199
+ - unpack-trees: simplify pattern_list freeing
200
+ - unpack-trees: simplify verify_absent_sparse()
201
+ - unpack-trees: remove unused error type
202
+ - unpack-trees: fix minor typo in comment
203
+
204
+ "sparse-checkout" UI improvements.
205
+
206
+
207
+* js/import-tars-do-not-make-phony-files-from-pax-headers (2020-03-24) 1 commit
208
+ - import-tars: ignore the global PAX header
209
+
210
+ The import-tars importer (in contrib/fast-import/) used to create
211
+ phony files at the top-level of the repository when the archive
212
+ contains global PAX headers, which made its own logic to detect and
213
+ omit the common leading directory ineffective, which has been
214
+ corrected.
215
+
216
+ Will merge to 'next'.
217
+
218
+
219
+* js/test-junit-finalization-fix (2020-03-23) 1 commit
220
+ - tests(junit-xml): avoid invalid XML
221
+
222
+ Test fix.
223
+
224
+ Will merge to 'next'.
225
+
226
+
227
+* js/tests-gpg-integration-on-windows (2020-03-25) 5 commits
228
+ - tests: increase the verbosity of the GPG-related prereqs
229
+ - tests: do not let lazy prereqs inside `test_expect_*` turn off tracing
230
+ - tests: turn GPG, GPGSM and RFC1991 into lazy prereqs
231
+ - t/lib-gpg.sh: stop pretending to be a stand-alone script
232
+ - tests(gpg): allow the gpg-agent to start on Windows
233
+
234
+ Enable tests that require GnuPG on Windows.
235
236
Will merge to 'next'.
237
@@ -122,31 +260,6 @@ of the repositories listed at
260
Breakage due to byte-order dependency reported.
261
262
125
-* dl/merge-autostash (2020-01-13) 17 commits
126
- - pull: pass --autostash to merge
127
- - t5520: make test_pull_autostash() accept expect_parent_num
128
- - merge: teach --autostash option
129
- - sequencer: unlink autostash in apply_autostash()
130
- - sequencer: extract perform_autostash() from rebase
131
- - rebase: generify create_autostash()
132
- - rebase: extract create_autostash()
133
- - reset: extract reset_head() from rebase
134
- - rebase: generify reset_head()
135
- - rebase: use apply_autostash() from sequencer.c
136
- - sequencer: make apply_rebase() accept a path
137
- - rebase: use read_oneliner()
138
- - sequencer: make read_oneliner() extern
139
- - sequencer: configurably warn on non-existent files
140
- - sequencer: use file strbuf for read_oneliner()
141
- - t7600: use test_write_lines()
142
- - Makefile: alphabetically sort += lists
143
-
144
- "git merge" learns the "--autostash" option.
145
-
146
- Expecting a reroll.
147
- cf. <20200123042906.GA29009@generichostname>
148
-
149
-
263
* en/fill-directory-exponential (2020-01-31) 6 commits
264
- t7063: blindly accept diffs
265
- dir: replace exponential algorithm with a linear one
@@ -185,6 +298,88 @@ of the repositories listed at
298
--------------------------------------------------
299
[Cooking]
300
301
+* dl/merge-autostash (2020-03-24) 19 commits
302
+ - pull: pass --autostash to merge
303
+ - t5520: make test_pull_autostash() accept expect_parent_num
304
+ - merge: teach --autostash option
305
+ - sequencer: implement save_autostash()
306
+ - sequencer: unlink autostash in apply_autostash()
307
+ - sequencer: extract perform_autostash() from rebase
308
+ - rebase: generify create_autostash()
309
+ - rebase: extract create_autostash()
310
+ - reset: extract reset_head() from rebase
311
+ - rebase: generify reset_head()
312
+ - rebase: use apply_autostash() from sequencer.c
313
+ - sequencer: make apply_rebase() accept a path
314
+ - rebase: use read_oneliner()
315
+ - sequencer: make read_oneliner() extern
316
+ - sequencer: configurably warn on non-existent files
317
+ - sequencer: make read_oneliner() accept flags
318
+ - sequencer: use file strbuf for read_oneliner()
319
+ - t7600: use test_write_lines()
320
+ - Makefile: ASCII-sort += lists
321
+
322
+ "git merge" learns the "--autostash" option.
323
+
324
+
325
+* ds/default-pack-use-sparse-to-true (2020-03-20) 2 commits
326
+ (merged to 'next' on 2020-03-21 at 25cc87784d)
327
+ + pack-objects: flip the use of GIT_TEST_PACK_SPARSE
328
+ + config: set pack.useSparse=true by default
329
+
330
+ The 'pack.useSparse' configuration variable now defaults to 'true',
331
+ enabling an optimization that has been experimental since Git 2.21.
332
+
333
+ Will cook in 'next'.
334
+
335
+
336
+* js/trace2-env-vars (2020-03-23) 1 commit
337
+ - trace2: teach Git to log environment variables
338
+
339
+ Trace2 enhancement to allow logging of the environment variables.
340
+
341
+
342
+* ar/test-style-fixes (2020-03-22) 2 commits
343
+ - t: fix whitespace around &&
344
+ - t9500: remove spaces after redirect operators
345
+
346
+ Style fixes.
347
+
348
+ Will merge to 'next'.
349
+
350
+
351
+* ds/doc-clone-filter (2020-03-22) 1 commit
352
+ - clone: document --filter options
353
+
354
+ Doc update.
355
+
356
+ Will merge to 'next'.
357
+
358
+
359
+* jk/t3419-drop-expensive-tests (2020-03-22) 1 commit
360
+ - t3419: drop EXPENSIVE tests
361
+
362
+ Test update.
363
+
364
+ Will merge to 'next'.
365
+
366
+
367
+* jt/connectivity-check-optim-in-partial-clone (2020-03-22) 1 commit
368
+ - connected: always use partial clone optimization
369
+
370
+ Simplify the commit ancestry connectedness check in a partial clone
371
+ repository in which "promised" objects are assumed to be obtainable
372
+ lazily on-demand from promisor remote repositories.
373
+
374
+
375
+* mt/test-lib-bundled-short-options (2020-03-25) 1 commit
376
+ - test-lib: allow short options to be bundled
377
+
378
+ Minor test usability improvement.
379
+
380
+ Will merge to 'next'.
381
+
382
+
383
* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
384
- git-p4: add RCS keyword status message
385
- git-p4: add p4 submit hooks
@@ -202,15 +397,6 @@ of the repositories listed at
397
cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
398
399
205
-* jc/config-tar (2020-03-18) 1 commit
206
- (merged to 'next' on 2020-03-19 at aa6216fd1a)
207
- + separate tar.* config to its own source file
208
-
209
- Improve the structure of the documentation source a bit.
210
-
211
- Will merge to 'master'.
212
-
213
-
400
* jt/rebase-allow-duplicate (2020-03-18) 1 commit
401
- rebase --merge: optionally skip upstreamed commits
402
@@ -221,33 +407,6 @@ of the repositories listed at
407
cf. <20200318192821.43808-1-jonathantanmy@google.com>
408
409
224
-* ss/submodule-foreach-cb (2020-03-18) 1 commit
225
- (merged to 'next' on 2020-03-21 at 6651eafe02)
226
- + submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'
227
-
228
- Code clean-up.
229
-
230
- Will merge to 'master'.
231
-
232
-
233
-* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
234
- (merged to 'next' on 2020-03-11 at 0496b26f23)
235
- + commit-slab: clarify slabname##_peek()'s return value
236
-
237
- In-code comment update.
238
-
239
- Will merge to 'master'.
240
-
241
-
242
-* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
243
- (merged to 'next' on 2020-03-12 at f08dab7228)
244
- + pull: document more passthru options
245
-
246
- Doc update.
247
-
248
- Will merge to 'master'.
249
-
250
-
410
* bc/filter-process (2020-03-16) 8 commits
411
(merged to 'next' on 2020-03-17 at 2cd9dbf794)
412
+ t0021: test filter metadata for additional cases
@@ -266,30 +425,12 @@ of the repositories listed at
425
Will merge to 'master'.
426
427
269
-* bc/faq (2020-03-15) 1 commit
428
+* bc/faq (2020-03-24) 1 commit
429
- docs: add a FAQ
430
431
Doc update.
432
433
275
-* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
276
- (merged to 'next' on 2020-03-16 at 609a322030)
277
- + connected.c: reprepare packs for corner cases
278
-
279
- Corner case "git fetch" fix.
280
-
281
- Will merge to 'master'.
282
-
283
-
284
-* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
285
- (merged to 'next' on 2020-03-16 at a79879866d)
286
- + oidset: remove unnecessary include
287
-
288
- Code clean-up.
289
-
290
- Will merge to 'master'.
291
-
292
-
434
* jc/log-no-mailmap (2020-03-16) 3 commits
435
- log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
436
- clone: reorder --recursive/--recurse-submodules
@@ -298,28 +439,6 @@ of the repositories listed at
439
"git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
440
441
301
-* yz/p4-py3 (2020-03-10) 14 commits
302
- (merged to 'next' on 2020-03-11 at 01ca57c2b2)
303
- + ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
304
- + git-p4: use python3's input() everywhere
305
- + git-p4: simplify regex pattern generation for parsing diff-tree
306
- + git-p4: use dict.items() iteration for python3 compatibility
307
- + git-p4: use functools.reduce instead of reduce
308
- + git-p4: fix freezing while waiting for fast-import progress
309
- + git-p4: use marshal format version 2 when sending to p4
310
- + git-p4: open .gitp4-usercache.txt in text mode
311
- + git-p4: convert path to unicode before processing them
312
- + git-p4: encode/decode communication with git for python3
313
- + git-p4: encode/decode communication with p4 for python3
314
- + git-p4: remove string type aliasing
315
- + git-p4: change the expansion test from basestring to list
316
- + git-p4: make python2.7 the oldest supported version
317
-
318
- Update "git p4" to work with Python 3.
319
-
320
- Will merge to 'master'.
321
-
322
-
442
* hi/gpg-prefer-check-signature (2020-03-15) 2 commits
443
(merged to 'next' on 2020-03-17 at 2def2d9a7e)
444
+ gpg-interface: prefer check_signature() for GPG verification
@@ -330,32 +449,8 @@ of the repositories listed at
449
Will merge to 'master'.
450
451
333
-* jc/maintain-doc (2020-03-09) 1 commit
334
- (merged to 'next' on 2020-03-09 at 7f1a754f60)
335
- + update how-to-maintain-git
336
-
337
- Doc update.
338
-
339
- Will merge to 'master'.
340
-
341
-
342
-* am/real-path-fix (2020-03-10) 4 commits
343
- (merged to 'next' on 2020-03-11 at 1f843820a7)
344
- + get_superproject_working_tree(): return strbuf
345
- + real_path_if_valid(): remove unsafe API
346
- + real_path: remove unsafe API
347
- + set_git_dir: fix crash when used with real_path()
348
-
349
- The real_path() convenience function can easily be misused; with a
350
- bit of code refactoring in the callers' side, its use has been
351
- eliminated.
352
-
353
- Will merge to 'master'.
354
-
355
-
356
-* tb/commit-graph-split-merge (2020-03-05) 3 commits
357
- (merged to 'next' on 2020-03-09 at f3aa7bb305)
358
- + builtin/commit-graph.c: support '--input=none'
452
+* tb/commit-graph-split-merge (2020-03-24) 3 commits
453
+ - builtin/commit-graph.c: support '--input=graphed'
454
+ builtin/commit-graph.c: introduce '--input=<source>'
455
+ builtin/commit-graph.c: support '--split[=<strategy>]'
456
@@ -363,7 +458,7 @@ of the repositories listed at
458
options to control if the resulting graph chains should be merged
459
or a single new incremental graph is created.
460
366
- Will cook in 'next'.
461
+ Will merge to 'next'.
462
463
464
* ah/force-pull-rebase-configuration (2020-03-10) 1 commit
@@ -389,35 +484,6 @@ of the repositories listed at
484
cf. <20200306172913.GF1571684@cat>
485
486
392
-* js/https-proxy-config (2020-03-05) 2 commits
393
- (merged to 'next' on 2020-03-09 at 8a06f8501d)
394
- + http: add environment variable support for HTTPS proxies
395
- + http: add client cert support for HTTPS proxies
396
-
397
- A handful of options to configure SSL when talking to proxies have
398
- been added.
399
-
400
- Will merge to 'master'.
401
-
402
-
403
-* pw/advise-rebase-skip (2019-12-06) 7 commits
404
- (merged to 'next' on 2020-03-11 at 80386de756)
405
- + commit: give correct advice for empty commit during a rebase
406
- + commit: encapsulate determine_whence() for sequencer
407
- + commit: use enum value for multiple cherry-picks
408
- + sequencer: write CHERRY_PICK_HEAD for reword and edit
409
- + cherry-pick: check commit error messages
410
- + cherry-pick: add test for `--skip` advice in `git commit`
411
- + t3404: use test_cmp_rev
412
-
413
- The mechanism to prevent "git commit" from making an empty commit
414
- or amending during an interrupted cherry-pick was broken during the
415
- rewrite of "git rebase" in C, which has been corrected.
416
-
417
- Will merge to 'master'.
418
- cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
419
-
420
-
487
* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
488
(merged to 'next' on 2020-03-02 at a1a84d37a7)
489
+ rebase: --fork-point regression fix
@@ -489,19 +555,6 @@ of the repositories listed at
555
Will merge to 'master'.
556
557
492
-* hw/advise-ng (2020-03-05) 4 commits
493
- (merged to 'next' on 2020-03-09 at ea9e5a1fa3)
494
- + tag: use new advice API to check visibility
495
- + advice: revamp advise API
496
- + advice: change "setupStreamFailure" to "setUpstreamFailure"
497
- + advice: extract vadvise() from advise()
498
-
499
- Revamping of the advise API to allow more systematic enumeration of
500
- advice knobs in the future.
501
-
502
- Will merge to 'master'.
503
-
504
-
558
* hn/reftable (2020-02-26) 6 commits
559
. Reftable support for git-core
560
. Add reftable library
@@ -519,8 +572,7 @@ of the repositories listed at
572
SHA-256 topic.
573
574
522
-* es/bugreport (2020-03-06) 6 commits
523
- - SQUASH???
575
+* es/bugreport (2020-03-23) 5 commits
576
- bugreport: add compiler info
577
- bugreport: add uname info
578
- bugreport: gather git version and build info
@@ -529,6 +581,7 @@ of the repositories listed at
581
582
The "bugreport" tool.
583
584
+ New iteration (v11) exists, which needs to be picked up.
585
As the scope of the topic got trimmed, hopefully these early parts
586
can be polished quickly enough to be merged down.
587