What's cooking (2020/01 #02)
Junio C Hamano committed
Jan 4, 2020 at 17:20 UTC
d4673431dcae4ac05be0a44716aabbfd1cb5a3e7
1 file changed
+155
-151
whats-cooking.txt
+155
-151
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2020, #01; Thu, 2)
3
+Subject: What's cooking in git.git (Jan 2020, #02; Sat, 4)
4
X-master-at: 8679ef24ed64018bb62170c43ce73e0261c0600a
5
-X-next-at: 88dfdc41939891b16a5f8d00053e9c81d6d73f4e
5
+X-next-at: 71ea739a6cfbb938bae4fd7453c913c984f66f90
6
7
-What's cooking in git.git (Jan 2020, #01; Thu, 2)
7
+What's cooking in git.git (Jan 2020, #02; Sat, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,168 +12,45 @@ 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 first release candidate for this cycle v2.25.0-rc1 has been
16
-tagged.
15
+After the topics marked to be merged to 'master' go in, the tip of
16
+the master will hopefully be very close to the final release.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
---------------------------------------------------
24
-[Graduated to "master"]
25
-
26
-* bk/p4-misc-usability (2019-12-16) 2 commits
27
- (merged to 'next' on 2019-12-25 at b4789bcb08)
28
- + git-p4: show detailed help when parsing options fail
29
- + git-p4: yes/no prompts should sanitize user text
30
- (this branch is used by bk/p4-exception-cleanup.)
31
-
32
- Miscellaneous small UX improvements on "git-p4".
33
-
34
-
35
-* em/freebsd-cirrus-ci (2019-12-20) 1 commit
36
- (merged to 'next' on 2019-12-25 at b6b609fbf0)
37
- + CI: add FreeBSD CI support via Cirrus-CI
38
-
39
-
40
-* en/rebase-signoff-fix (2019-12-20) 1 commit
41
- (merged to 'next' on 2019-12-25 at 96d84920b5)
42
- + rebase: fix saving of --signoff state for am-based rebases
43
-
44
- "git rebase --signoff" stopped working when the command was written
45
- in C, which has been corrected.
46
-
47
-
48
-* js/mingw-reserved-filenames (2019-12-21) 2 commits
49
- (merged to 'next' on 2019-12-30 at 5b814fd785)
50
- + mingw: refuse paths containing reserved names
51
- + mingw: short-circuit the conversion of `/dev/null` to UTF-16
52
-
53
- Forbid pathnames that the platform's filesystem cannot represent on
54
- MinGW.
55
-
56
-
57
-* js/use-test-tool-on-path (2019-12-27) 1 commit
58
- (merged to 'next' on 2019-12-30 at fe59c1996d)
59
- + t3008: find test-tool through path lookup
60
-
61
- Test fix.
62
-
23
--------------------------------------------------
24
[New Topics]
25
66
-* dl/merge-autostash (2019-12-26) 17 commits
67
- - pull: pass --autostash to merge
68
- - t5520: make test_pull_autostash() accept expect_parent_num
69
- - merge: teach --autostash option
70
- - sequencer: unlink autostash in apply_autostash()
71
- - sequencer: extract perform_autostash() from rebase
72
- - rebase: generify create_autostash()
73
- - rebase: extract create_autostash()
74
- - reset: extract reset_head() from rebase
75
- - rebase: generify reset_head()
76
- - rebase: use apply_autostash() from sequencer.c
77
- - sequencer: make apply_rebase() accept a path
78
- - rebase: use read_oneliner()
79
- - sequencer: make read_oneliner() extern
80
- - sequencer: configurably warn on non-existent files
81
- - sequencer: use file strbuf for read_oneliner()
82
- - t7600: use test_write_lines()
83
- - Makefile: alphabetically sort += lists
84
-
85
- "git merge" learns the "--autostash" option.
26
+* do/gitweb-typofix-in-comments (2020-01-04) 1 commit
27
+ - gitweb: fix a couple spelling errors in comments
28
87
-
88
-* dl/test-must-fail-fixes-2 (2019-12-27) 16 commits
89
- - t4124: let sed open its own files
90
- - t4124: only mark git command with test_must_fail
91
- - t3507: use test_path_is_missing()
92
- - t3507: fix indentation
93
- - t3504: do check for conflict marker after failed cherry-pick
94
- - t3419: stop losing return code of git command
95
- - t3415: increase granularity of test_auto_{fixup,squash}()
96
- - t3415: stop losing return codes of git commands
97
- - t3310: extract common no_notes_merge_left()
98
- - t3030: use test_path_is_missing()
99
- - t2018: replace "sha" with "oid"
100
- - t2018: don't lose return code of git commands
101
- - t2018: teach do_checkout() to accept `!` arg
102
- - t2018: use test_must_fail for failing git commands
103
- - t2018: add space between function name and ()
104
- - t2018: remove trailing space from test description
105
-
106
- Test updates.
107
-
108
- Not quite.
109
- cf. <CAPig+cQo1nbRo=n8-XOtycGijj3k1y_Zozu7VW-WTSBB9LncqQ@mail.gmail.com>
110
- cf. <86lfqt36ah.fsf@gmail.com>
111
-
112
-
113
-* jn/promote-proto2-to-default (2019-12-27) 5 commits
114
- - fetch: default to protocol version 2
115
- - protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
116
- - test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
117
- - config doc: protocol.version is not experimental
118
- - fetch test: use more robust test for filtered objects
119
- (this branch uses jn/test-lint-one-shot-export-to-shell-function.)
120
-
121
- The transport protocol version 2 becomes the default one.
122
-
123
-
124
-* ds/sparse-list-in-cone-mode (2019-12-30) 2 commits
125
- - sparse-checkout: document interactions with submodules
126
- - sparse-checkout: list directories in cone mode
127
-
128
- "git sparse-checkout list" subcommand learned to give its output in
129
- a more concise form when the "cone" mode is in effect.
130
-
131
- Will merge to 'next'.
132
-
133
-
134
-* am/test-pathspec-f-f-error-cases (2020-01-02) 1 commit
135
- - t: add tests for error conditions with --pathspec-from-file
136
-
137
- More tests.
138
-
139
- Will merge to 'next'.
140
-
141
-
142
-* ds/sparse-cone (2020-01-02) 1 commit
143
- - sparse-checkout: use extern for global variables
144
-
145
- Code cleanup.
29
+ Typofix.
30
31
Will merge to 'next' and then to 'master'.
32
33
150
-* en/merge-recursive-oid-eq-simplify (2020-01-02) 1 commit
151
- - merge-recursive: remove unnecessary oid_eq function
34
+* en/unpack-trees-check-updates-simplify (2020-01-04) 1 commit
35
+ - unpack-trees: exit check_updates() early if updates are not wanted
36
153
- Code cleanup.
154
-
155
- Will merge to 'next'.
37
+ Code simplification.
38
39
158
-* jt/sha1-file-remove-oi-skip-cached (2020-01-02) 1 commit
159
- - sha1-file: remove OBJECT_INFO_SKIP_CACHED
40
+* jb/doc-multi-pack-idx-fix (2020-01-04) 1 commit
41
+ - multi-pack-index: correct configuration in documentation
42
161
- has_object_file() said "no" given an object registered to the
162
- system via pretend_object_file(), making it inconsistent with
163
- read_object_file(), causing lazy fetch to attempt fetching an
164
- empty tree from promisor remotes.
43
+ Typofix.
44
166
- Will merge to 'next'.
45
+ Will merge to 'next' and then to 'master'.
46
47
169
-* ds/commit-graph-set-size-mult (2020-01-02) 1 commit
170
- - commit-graph: prefer default size_mult when given zero
48
+* pm/am-in-body-header-doc-update (2020-01-04) 1 commit
49
+ - am: document that Date: can appear as an in-body header
50
172
- The code to write split commit-graph file(s) upon fetching computed
173
- bogus value for the parameter used in splitting the resulting
174
- files, which has been corrected.
51
+ Doc update.
52
176
- Will merge to 'next'.
53
+ Will merge to 'next' and then to 'master'.
54
55
--------------------------------------------------
56
[Stalled]
@@ -319,6 +196,128 @@ of the repositories listed at
196
--------------------------------------------------
197
[Cooking]
198
199
+* dl/merge-autostash (2019-12-26) 17 commits
200
+ - pull: pass --autostash to merge
201
+ - t5520: make test_pull_autostash() accept expect_parent_num
202
+ - merge: teach --autostash option
203
+ - sequencer: unlink autostash in apply_autostash()
204
+ - sequencer: extract perform_autostash() from rebase
205
+ - rebase: generify create_autostash()
206
+ - rebase: extract create_autostash()
207
+ - reset: extract reset_head() from rebase
208
+ - rebase: generify reset_head()
209
+ - rebase: use apply_autostash() from sequencer.c
210
+ - sequencer: make apply_rebase() accept a path
211
+ - rebase: use read_oneliner()
212
+ - sequencer: make read_oneliner() extern
213
+ - sequencer: configurably warn on non-existent files
214
+ - sequencer: use file strbuf for read_oneliner()
215
+ - t7600: use test_write_lines()
216
+ - Makefile: alphabetically sort += lists
217
+
218
+ "git merge" learns the "--autostash" option.
219
+
220
+
221
+* dl/test-must-fail-fixes-2 (2019-12-27) 16 commits
222
+ - t4124: let sed open its own files
223
+ - t4124: only mark git command with test_must_fail
224
+ - t3507: use test_path_is_missing()
225
+ - t3507: fix indentation
226
+ - t3504: do check for conflict marker after failed cherry-pick
227
+ - t3419: stop losing return code of git command
228
+ - t3415: increase granularity of test_auto_{fixup,squash}()
229
+ - t3415: stop losing return codes of git commands
230
+ - t3310: extract common no_notes_merge_left()
231
+ - t3030: use test_path_is_missing()
232
+ - t2018: replace "sha" with "oid"
233
+ - t2018: don't lose return code of git commands
234
+ - t2018: teach do_checkout() to accept `!` arg
235
+ - t2018: use test_must_fail for failing git commands
236
+ - t2018: add space between function name and ()
237
+ - t2018: remove trailing space from test description
238
+
239
+ Test updates.
240
+
241
+ Not quite.
242
+ cf. <CAPig+cQo1nbRo=n8-XOtycGijj3k1y_Zozu7VW-WTSBB9LncqQ@mail.gmail.com>
243
+ cf. <86lfqt36ah.fsf@gmail.com>
244
+
245
+
246
+* jn/promote-proto2-to-default (2019-12-27) 5 commits
247
+ - fetch: default to protocol version 2
248
+ - protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
249
+ - test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
250
+ - config doc: protocol.version is not experimental
251
+ - fetch test: use more robust test for filtered objects
252
+ (this branch uses jn/test-lint-one-shot-export-to-shell-function.)
253
+
254
+ The transport protocol version 2 becomes the default one.
255
+
256
+ Will merge to 'next'.
257
+
258
+
259
+* ds/sparse-list-in-cone-mode (2019-12-30) 2 commits
260
+ (merged to 'next' on 2020-01-04 at e1a174647e)
261
+ + sparse-checkout: document interactions with submodules
262
+ + sparse-checkout: list directories in cone mode
263
+
264
+ "git sparse-checkout list" subcommand learned to give its output in
265
+ a more concise form when the "cone" mode is in effect.
266
+
267
+ Will merge to 'master'.
268
+
269
+
270
+* am/test-pathspec-f-f-error-cases (2020-01-02) 1 commit
271
+ (merged to 'next' on 2020-01-04 at 73ac7e77fb)
272
+ + t: add tests for error conditions with --pathspec-from-file
273
+
274
+ More tests.
275
+
276
+ Will cook in 'next'.
277
+
278
+
279
+* ds/sparse-cone (2020-01-04) 2 commits
280
+ (merged to 'next' on 2020-01-04 at cc4b6fbb41)
281
+ + Documentation/git-sparse-checkout.txt: fix a typo
282
+ + sparse-checkout: use extern for global variables
283
+
284
+ Code cleanup.
285
+
286
+ Will merge to 'master'.
287
+
288
+
289
+* en/merge-recursive-oid-eq-simplify (2020-01-02) 1 commit
290
+ (merged to 'next' on 2020-01-04 at 623ecf4f16)
291
+ + merge-recursive: remove unnecessary oid_eq function
292
+
293
+ Code cleanup.
294
+
295
+ Will merge to 'master'.
296
+
297
+
298
+* jt/sha1-file-remove-oi-skip-cached (2020-01-02) 1 commit
299
+ (merged to 'next' on 2020-01-04 at fab9964f10)
300
+ + sha1-file: remove OBJECT_INFO_SKIP_CACHED
301
+
302
+ has_object_file() said "no" given an object registered to the
303
+ system via pretend_object_file(), making it inconsistent with
304
+ read_object_file(), causing lazy fetch to attempt fetching an
305
+ empty tree from promisor remotes.
306
+
307
+ Will cook in 'next'.
308
+
309
+
310
+* ds/commit-graph-set-size-mult (2020-01-02) 1 commit
311
+ (merged to 'next' on 2020-01-04 at 71ea739a6c)
312
+ + commit-graph: prefer default size_mult when given zero
313
+
314
+ The code to write split commit-graph file(s) upon fetching computed
315
+ bogus value for the parameter used in splitting the resulting
316
+ files, which has been corrected.
317
+
318
+ Will merge to 'master'.
319
+
320
+
321
* hw/commit-advise-while-rejecting (2019-12-19) 1 commit
322
(merged to 'next' on 2019-12-30 at e26700d582)
323
+ commit: honor advice.statusHints when rejecting an empty commit
@@ -466,13 +465,6 @@ of the repositories listed at
465
Will cook in 'next'.
466
467
469
-* bk/p4-exception-cleanup (2019-12-16) 2 commits
470
- - git-p4: failure because of RCS keywords should show help
471
- - git-p4: wrap patchRCSKeywords test to revert changes on failure
472
-
473
- Will discard for now.
474
-
475
-
468
* ew/packfile-syscall-optim (2019-12-26) 2 commits
469
(merged to 'next' on 2019-12-30 at ada15abf22)
470
+ packfile: replace lseek+read with pread
@@ -480,7 +472,7 @@ of the repositories listed at
472
473
Code cleanup.
474
483
- Will cook in 'next'.
475
+ Will merge to 'master'.
476
477
478
* jn/test-lint-one-shot-export-to-shell-function (2019-12-27) 3 commits
@@ -509,6 +501,10 @@ of the repositories listed at
501
- built-in add -p: support interactive.diffFilter
502
(this branch uses js/patch-mode-in-others-in-c.)
503
504
+ The final leg of rewriting "add -i/-p" in C.
505
+
506
+ Will merge to 'next'.
507
+
508
509
* js/mingw-loosen-overstrict-tree-entry-checks (2020-01-02) 1 commit
510
(merged to 'next' on 2020-01-02 at 3088a0ccf1)
@@ -530,7 +526,7 @@ of the repositories listed at
526
527
Doc update.
528
533
- Will cook in 'next'.
529
+ Will merge to 'master'.
530
531
532
* pw/advise-rebase-skip (2019-12-06) 9 commits
@@ -601,3 +597,11 @@ of the repositories listed at
597
Superseded by pw/advise-rebase-skip
598
599
600
+* bk/p4-exception-cleanup (2019-12-16) 2 commits
601
+ . git-p4: failure because of RCS keywords should show help
602
+ . git-p4: wrap patchRCSKeywords test to revert changes on failure
603
+
604
+ Discarded for now without prejudice.
605
+
606
+
607
+