What's cooking (2011/08 #05)
Junio C Hamano committed
Aug 19, 2011 at 15:12 UTC
0e0d281e204caa63065ef776574ea31b719ea4e3
1 file changed
+247
-163
whats-cooking.txt
+247
-163
@@ -1,17 +1,14 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2011, #04; Tue, 16)
3
-X-master-at: 4bfe7cb6668c43c1136304bbb17eea1b3ddf0237
4
-X-next-at: 0e3f8f0b05033eaaaa60133977cc86dd9a5db4bf
2
+Subject: What's cooking in git.git (Aug 2011, #05; Fri, 19)
3
+X-master-at: cee426811c981c62c4b236ebdcb47d1c2945cf56
4
+X-next-at: b5fcad02a1cc9cc1c2b8ebaef4ad67d0f9101c98
5
6
-What's cooking in git.git (Aug 2011, #04; Tue, 16)
6
+What's cooking in git.git (Aug 2011, #05; Fri, 19)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-The kernel.org machine seems to be very busy for the past 48 hours so it
13
-might take a while for tonight's pushout to propagate to mirrors.
14
-
12
There are a few 'fixup!' commits queued in topics still in 'pu', so that
13
authors have a choice to just say "that fix looks good, squash it in!"
14
instead of going through an extra round.
@@ -19,38 +16,184 @@ instead of going through an extra round.
16
--------------------------------------------------
17
[New Topics]
18
22
-* di/fast-import-deltified-tree (2011-08-14) 2 commits
23
- - fast-import: prevent producing bad delta
24
- - fast-import: add a test for tree delta base corruption
19
+* jc/traverse-commit-list (2011-08-17) 3 commits
20
+ - revision.c: update show_object_with_name() without using malloc()
21
+ - revision.c: add show_object_with_name() helper function
22
+ - rev-list: fix finish_object() call
23
+
24
+* rc/diff-cleanup-records (2011-08-17) 2 commits
25
+ - Merge branch 'rc/histogram-diff' into HEAD
26
+ - xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
27
+
28
+* fk/make-auto-header-dependencies (2011-08-18) 1 commit
29
+ - Makefile: Use computed header dependencies if the compiler supports it
30
+
31
+* jk/color-and-pager (2011-08-18) 10 commits
32
+ - want_color: automatically fallback to color.ui
33
+ - diff: don't load color config in plumbing
34
+ - config: refactor get_colorbool function
35
+ - color: delay auto-color decision until point of use
36
+ - git_config_colorbool: refactor stdout_is_tty handling
37
+ - diff: refactor COLOR_DIFF from a flag into an int
38
+ - setup_pager: set GIT_PAGER_IN_USE
39
+ - t7006: use test_config helpers
40
+ - test-lib: add helper functions for config
41
+ - t7006: modernize calls to unset
42
+ (this branch is used by jk/pager-with-alias.)
43
+
44
+Looked reasonable.
45
+Will merge to "next".
46
+
47
+* jk/pager-with-alias (2011-08-18) 2 commits
48
+ - support pager.* for aliases
49
+ - support pager.* for external commands
50
+ (this branch uses jk/color-and-pager.)
51
+
52
+* nd/decorate-grafts (2011-08-19) 5 commits
53
+ - log: decorate "replaced" on to replaced commits
54
+ - log: decorate grafted commits with "grafted"
55
+ - Move write_shallow_commits to fetch-pack.c
56
+ - Add for_each_commit_graft() to iterate all grafts
57
+ - decoration: do not mis-decorate refs with same prefix
58
+
59
+Looked reasonable.
60
+Will merge to "next".
61
+
62
+* va/p4-branch-import (2011-08-19) 4 commits
63
+ - git-p4: Add simple test case for branch import
64
+ - git-p4: Allow branch definition with git config
65
+ - git-p4: Allow filtering Perforce branches by user
66
+ - git-p4: Correct branch base depot path detection
67
+ (this branch uses va/p4-rename-copy.)
68
+
69
+* va/p4-rename-copy (2011-08-18) 4 commits
70
+ - git-p4: Add test case for copy detection.
71
+ - git-p4: Add test case for rename detection.
72
+ - git-p4: Add description of rename/copy detection options.
73
+ - git-p4: Allow setting rename/copy detection threshold.
74
+ (this branch is used by va/p4-branch-import.)
75
+
76
+* da/difftool-mergtool-refactor (2011-08-19) 4 commits
77
+ - mergetools/meld: Use '--output' when available
78
+ - mergetool--lib: Refactor tools into separate files
79
+ - mergetool--lib: Make style consistent with git
80
+ - difftool--helper: Make style consistent with git
81
+
82
+* mg/branch-set-upstream-previous (2011-08-19) 1 commit
83
+ - branch.c: use the parsed branch name
84
26
-* di/parse-options-split (2011-08-11) 2 commits
27
- - Reduce parse-options.o dependencies
28
- - parse-options: export opterr, optbug
85
+--------------------------------------------------
86
+[Graduated to "master"]
87
30
-* mh/attr (2011-08-14) 7 commits
31
- - Unroll the loop over passes
32
- - Change while loop into for loop
33
- - Determine the start of the states outside of the pass loop
34
- - Change parse_attr() to take a pointer to struct attr_state
35
- - Increment num_attr in parse_attr_line(), not parse_attr()
36
- - Document struct match_attr
37
- - Add a file comment
88
+* cb/maint-exec-error-report (2011-08-01) 2 commits
89
+ (merged to 'next' on 2011-08-05 at 2764424)
90
+ + notice error exit from pager
91
+ + error_routine: use parent's stderr if exec fails
92
39
-All looked reasonable.
93
+* cb/maint-quiet-push (2011-08-08) 2 commits
94
+ (merged to 'next' on 2011-08-08 at 917d73b)
95
+ + receive-pack: do not overstep command line argument array
96
+ (merged to 'next' on 2011-08-01 at 87df938)
97
+ + propagate --quiet to send-pack/receive-pack
98
41
-* mh/iterate-refs (2011-08-14) 6 commits
42
- - Retain caches of submodule refs
43
- - Store the submodule name in struct cached_refs
44
- - Allocate cached_refs objects dynamically
45
- - Change the signature of read_packed_refs()
46
- - Access reference caches only through new function get_cached_refs()
47
- - Extract a function clear_cached_refs()
99
+* db/am-skip-blank-at-the-beginning (2011-08-11) 1 commit
100
+ (merged to 'next' on 2011-08-11 at 3637843)
101
+ + am: ignore leading whitespace before patch
102
49
-* jn/plug-empty-tree-leak (2011-08-16) 2 commits
50
- - merge-recursive: take advantage of hardcoded empty tree
51
- - revert: plug memory leak in "cherry-pick root commit" codepath
103
+* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
104
+ (merged to 'next' on 2011-08-05 at 976a4d4)
105
+ + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
106
53
-Both looked reasonable.
107
+* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
108
+ (merged to 'next' on 2011-08-11 at 3f24b64)
109
+ + helping smart-http/stateless-rpc fetch race
110
+
111
+* js/bisect-no-checkout (2011-08-09) 11 commits
112
+ (merged to 'next' on 2011-08-11 at 6c94a45)
113
+ + bisect: add support for bisecting bare repositories
114
+ + bisect: further style nitpicks
115
+ + bisect: replace "; then" with "\n<tab>*then"
116
+ + bisect: cleanup whitespace errors in git-bisect.sh.
117
+ + bisect: add documentation for --no-checkout option.
118
+ + bisect: add tests for the --no-checkout option.
119
+ + bisect: introduce --no-checkout support into porcelain.
120
+ + bisect: introduce support for --no-checkout option.
121
+ + bisect: add tests to document expected behaviour in presence of broken trees.
122
+ + bisect: use && to connect statements that are deferred with eval.
123
+ + bisect: move argument parsing before state modification.
124
+
125
+* js/ref-namespaces (2011-07-21) 5 commits
126
+ (merged to 'next' on 2011-07-25 at 5b7dcfe)
127
+ + ref namespaces: tests
128
+ + ref namespaces: documentation
129
+ + ref namespaces: Support remote repositories via upload-pack and receive-pack
130
+ + ref namespaces: infrastructure
131
+ + Fix prefix handling in ref iteration functions
132
+
133
+* js/sh-style (2011-08-05) 2 commits
134
+ (merged to 'next' on 2011-08-11 at 4a4c22c)
135
+ + filter-branch.sh: de-dent usage string
136
+ + misc-sh: fix up whitespace in some other .sh files.
137
+
138
+* ma/am-exclude (2011-08-09) 2 commits
139
+ (merged to 'next' on 2011-08-11 at cf0ba4d)
140
+ + am: Document new --exclude=<path> option
141
+ (merged to 'next' on 2011-08-05 at 658e57c)
142
+ + am: pass exclude down to apply
143
+
144
+* mh/check-attr-listing (2011-08-04) 23 commits
145
+ (merged to 'next' on 2011-08-11 at f73ad50)
146
+ + Rename git_checkattr() to git_check_attr()
147
+ + git-check-attr: Fix command-line handling to match docs
148
+ + git-check-attr: Drive two tests using the same raw data
149
+ + git-check-attr: Add an --all option to show all attributes
150
+ + git-check-attr: Error out if no pathnames are specified
151
+ + git-check-attr: Process command-line args more systematically
152
+ + git-check-attr: Handle each error separately
153
+ + git-check-attr: Extract a function error_with_usage()
154
+ + git-check-attr: Introduce a new variable
155
+ + git-check-attr: Extract a function output_attr()
156
+ + Allow querying all attributes on a file
157
+ + Remove redundant check
158
+ + Remove redundant call to bootstrap_attr_stack()
159
+ + Extract a function collect_all_attrs()
160
+ + Teach prepare_attr_stack() to figure out dirlen itself
161
+ + git-check-attr: Use git_attr_name()
162
+ + Provide access to the name attribute of git_attr
163
+ + git-check-attr: Add tests of command-line parsing
164
+ + git-check-attr: Add missing "&&"
165
+ + Disallow the empty string as an attribute name
166
+ + Remove anachronism from comment
167
+ + doc: Correct git_attr() calls in example code
168
+ + doc: Add a link from gitattributes(5) to git-check-attr(1)
169
+ (this branch is used by mh/check-attr-relative.)
170
+
171
+* mh/check-attr-relative (2011-08-04) 6 commits
172
+ (merged to 'next' on 2011-08-11 at f94550c)
173
+ + test-path-utils: Add subcommand "prefix_path"
174
+ + test-path-utils: Add subcommand "absolute_path"
175
+ + git-check-attr: Normalize paths
176
+ + git-check-attr: Demonstrate problems with relative paths
177
+ + git-check-attr: Demonstrate problems with unnormalized paths
178
+ + git-check-attr: test that no output is written to stderr
179
+ (this branch uses mh/check-attr-listing.)
180
+
181
+* rc/histogram-diff (2011-08-08) 12 commits
182
+ (merged to 'next' on 2011-08-11 at 684dfd1)
183
+ + xdiff/xhistogram: drop need for additional variable
184
+ + xdiff/xhistogram: rely on xdl_trim_ends()
185
+ + xdiff/xhistogram: rework handling of recursed results
186
+ + xdiff: do away with xdl_mmfile_next()
187
+ (merged to 'next' on 2011-08-03 at f9e2328)
188
+ + Make test number unique
189
+ (merged to 'next' on 2011-07-25 at 3351028)
190
+ + xdiff/xprepare: use a smaller sample size for histogram diff
191
+ + xdiff/xprepare: skip classification
192
+ + teach --histogram to diff
193
+ + t4033-diff-patience: factor out tests
194
+ + xdiff/xpatience: factor out fall-back-diff function
195
+ + xdiff/xprepare: refactor abort cleanups
196
+ + xdiff/xprepare: use memset()
197
198
--------------------------------------------------
199
[Stalled]
@@ -66,12 +209,6 @@ Probably the topmost commit should be dropped.
209
210
Perhaps needs an updated commit log message?
211
69
-* di/fast-import-doc (2011-07-13) 2 commits
70
- - doc/fast-import: document feature import-marks-if-exists
71
- - doc/fast-import: clarify notemodify command
72
-
73
-Comments from fast-import folks?
74
-
212
* jh/receive-count-limit (2011-05-23) 10 commits
213
- receive-pack: Allow server to refuse pushes with too many objects
214
- pack-objects: Estimate pack size; abort early if pack size limit is exceeded
@@ -118,6 +255,63 @@ I think a further refactoring (no, not my suggestion) was offered?
255
--------------------------------------------------
256
[Cooking]
257
258
+* di/fast-import-doc (2011-08-17) 1 commit
259
+ - doc/fast-import: document feature import-marks-if-exists
260
+
261
+Comments from fast-import folks?
262
+
263
+* di/fast-import-deltified-tree (2011-08-14) 2 commits
264
+ - fast-import: prevent producing bad delta
265
+ - fast-import: add a test for tree delta base corruption
266
+
267
+Comments from fast-import folks?
268
+
269
+* di/fast-import-ident (2011-08-11) 5 commits
270
+ - fsck: improve committer/author check
271
+ - fsck: add a few committer name tests
272
+ - fast-import: check committer name more strictly
273
+ - fast-import: don't fail on omitted committer name
274
+ - fast-import: add input format tests
275
+
276
+Comments from fast-import folks?
277
+
278
+* di/parse-options-split (2011-08-11) 2 commits
279
+ - Reduce parse-options.o dependencies
280
+ - parse-options: export opterr, optbug
281
+
282
+Looked reasonable.
283
+Will merge to "next".
284
+
285
+* mh/attr (2011-08-14) 7 commits
286
+ - Unroll the loop over passes
287
+ - Change while loop into for loop
288
+ - Determine the start of the states outside of the pass loop
289
+ - Change parse_attr() to take a pointer to struct attr_state
290
+ - Increment num_attr in parse_attr_line(), not parse_attr()
291
+ - Document struct match_attr
292
+ - Add a file comment
293
+
294
+All looked reasonable.
295
+Will merge to "next".
296
+
297
+* mh/iterate-refs (2011-08-14) 6 commits
298
+ - Retain caches of submodule refs
299
+ - Store the submodule name in struct cached_refs
300
+ - Allocate cached_refs objects dynamically
301
+ - Change the signature of read_packed_refs()
302
+ - Access reference caches only through new function get_cached_refs()
303
+ - Extract a function clear_cached_refs()
304
+
305
+I did not see anything wrong per-se, but it was unclear what the benefit
306
+of these changes are. I probably need to read it once again.
307
+
308
+* jn/plug-empty-tree-leak (2011-08-16) 2 commits
309
+ - merge-recursive: take advantage of hardcoded empty tree
310
+ - revert: plug memory leak in "cherry-pick root commit" codepath
311
+
312
+Both looked reasonable.
313
+Will merge to "next".
314
+
315
* ac/describe-dirty-refresh (2011-08-11) 1 commit
316
- describe: Refresh the index when run with --dirty
317
@@ -183,13 +377,7 @@ Will merge to "next", but needs Sign-off.
377
- t6042: Add a testcase where git deletes an untracked file
378
379
Rerolled.
186
-
187
-* di/fast-import-ident (2011-08-11) 5 commits
188
- - fsck: improve committer/author check
189
- - fsck: add a few committer name tests
190
- - fast-import: check committer name more strictly
191
- - fast-import: don't fail on omitted committer name
192
- - fast-import: add input format tests
380
+Will merge to "next".
381
382
* fg/submodule-ff-check-before-push (2011-08-09) 1 commit
383
- push: Don't push a repository with unpushed submodules
@@ -198,6 +386,8 @@ Rerolled.
386
- add update 'none' flag to disable update of submodule by default
387
- submodule: move update configuration variable further up
388
389
+Will merge to "next".
390
+
391
* jc/lookup-object-hash (2011-08-11) 6 commits
392
- object hash: replace linear probing with 4-way cuckoo hashing
393
- object hash: we know the table size is a power of two
@@ -213,38 +403,13 @@ Rerolled.
403
- git-am: take advantage of gettextln and eval_gettextln.
404
- gettext: add gettextln, eval_gettextln to encode common idiom
405
406
+Will merge to "next".
407
+
408
* cb/maint-ls-files-error-report (2011-08-11) 1 commit
409
(merged to 'next' on 2011-08-15 at 69f41cf)
410
+ ls-files: fix pathspec display on error
411
220
-* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
221
- (merged to 'next' on 2011-08-05 at 976a4d4)
222
- + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
223
-
224
-Will merge to "master" after cooking for a bit more.
225
-
226
-* js/sh-style (2011-08-05) 2 commits
227
- (merged to 'next' on 2011-08-11 at 4a4c22c)
228
- + filter-branch.sh: de-dent usage string
229
- + misc-sh: fix up whitespace in some other .sh files.
230
-
231
-* ma/am-exclude (2011-08-09) 2 commits
232
- (merged to 'next' on 2011-08-11 at cf0ba4d)
233
- + am: Document new --exclude=<path> option
234
- (merged to 'next' on 2011-08-05 at 658e57c)
235
- + am: pass exclude down to apply
236
-
237
-Will merge to "master" after cooking for a bit more.
238
-
239
-* db/am-skip-blank-at-the-beginning (2011-08-11) 1 commit
240
- (merged to 'next' on 2011-08-11 at 3637843)
241
- + am: ignore leading whitespace before patch
242
-
243
-Will merge to "master" after cooking for a bit more.
244
-
245
-* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
246
- (merged to 'next' on 2011-08-11 at 3f24b64)
247
- + helping smart-http/stateless-rpc fetch race
412
+Will merge to "master".
413
414
* jn/maint-test-return (2011-08-11) 3 commits
415
(merged to 'next' on 2011-08-15 at 5a42301)
@@ -252,44 +417,21 @@ Will merge to "master" after cooking for a bit more.
417
+ test: cope better with use of return for errors
418
+ test: simplify return value of test_run_
419
420
+Will merge to "master".
421
+
422
* rt/zlib-smaller-window (2011-08-11) 2 commits
423
(merged to 'next' on 2011-08-15 at e05b26b)
424
+ test: consolidate definition of $LF
425
+ Tolerate zlib deflation with window size < 32Kb
426
427
+Will merge to "master".
428
+
429
* fg/submodule-git-file-git-dir (2011-08-16) 3 commits
430
- fixup! Move git-dir for submodules
431
- Move git-dir for submodules
432
- rev-parse: add option --resolve-git-dir <path>
433
265
-* js/bisect-no-checkout (2011-08-09) 11 commits
266
- (merged to 'next' on 2011-08-11 at 6c94a45)
267
- + bisect: add support for bisecting bare repositories
268
- + bisect: further style nitpicks
269
- + bisect: replace "; then" with "\n<tab>*then"
270
- + bisect: cleanup whitespace errors in git-bisect.sh.
271
- + bisect: add documentation for --no-checkout option.
272
- + bisect: add tests for the --no-checkout option.
273
- + bisect: introduce --no-checkout support into porcelain.
274
- + bisect: introduce support for --no-checkout option.
275
- + bisect: add tests to document expected behaviour in presence of broken trees.
276
- + bisect: use && to connect statements that are deferred with eval.
277
- + bisect: move argument parsing before state modification.
278
-
279
-* cb/maint-exec-error-report (2011-08-01) 2 commits
280
- (merged to 'next' on 2011-08-05 at 2764424)
281
- + notice error exit from pager
282
- + error_routine: use parent's stderr if exec fails
283
-
284
-Will merge to "master" after cooking for a bit more.
285
-
286
-* cb/maint-quiet-push (2011-08-08) 2 commits
287
- (merged to 'next' on 2011-08-08 at 917d73b)
288
- + receive-pack: do not overstep command line argument array
289
- (merged to 'next' on 2011-08-01 at 87df938)
290
- + propagate --quiet to send-pack/receive-pack
291
-
292
-Will merge to "master" after cooking for a bit more.
434
+Will merge to "next", after squashing the top one.
435
436
* jk/add-i-hunk-filter (2011-07-27) 5 commits
437
(merged to 'next' on 2011-08-11 at 8ff9a56)
@@ -299,42 +441,7 @@ Will merge to "master" after cooking for a bit more.
441
+ add--interactive: factor out regex error handling
442
+ add--interactive: refactor patch mode argument processing
443
302
-* mh/check-attr-listing (2011-08-04) 23 commits
303
- (merged to 'next' on 2011-08-11 at f73ad50)
304
- + Rename git_checkattr() to git_check_attr()
305
- + git-check-attr: Fix command-line handling to match docs
306
- + git-check-attr: Drive two tests using the same raw data
307
- + git-check-attr: Add an --all option to show all attributes
308
- + git-check-attr: Error out if no pathnames are specified
309
- + git-check-attr: Process command-line args more systematically
310
- + git-check-attr: Handle each error separately
311
- + git-check-attr: Extract a function error_with_usage()
312
- + git-check-attr: Introduce a new variable
313
- + git-check-attr: Extract a function output_attr()
314
- + Allow querying all attributes on a file
315
- + Remove redundant check
316
- + Remove redundant call to bootstrap_attr_stack()
317
- + Extract a function collect_all_attrs()
318
- + Teach prepare_attr_stack() to figure out dirlen itself
319
- + git-check-attr: Use git_attr_name()
320
- + Provide access to the name attribute of git_attr
321
- + git-check-attr: Add tests of command-line parsing
322
- + git-check-attr: Add missing "&&"
323
- + Disallow the empty string as an attribute name
324
- + Remove anachronism from comment
325
- + doc: Correct git_attr() calls in example code
326
- + doc: Add a link from gitattributes(5) to git-check-attr(1)
327
- (this branch is used by mh/check-attr-relative.)
328
-
329
-* mh/check-attr-relative (2011-08-04) 6 commits
330
- (merged to 'next' on 2011-08-11 at f94550c)
331
- + test-path-utils: Add subcommand "prefix_path"
332
- + test-path-utils: Add subcommand "absolute_path"
333
- + git-check-attr: Normalize paths
334
- + git-check-attr: Demonstrate problems with relative paths
335
- + git-check-attr: Demonstrate problems with unnormalized paths
336
- + git-check-attr: test that no output is written to stderr
337
- (this branch uses mh/check-attr-listing.)
444
+Needs documentation updates.
445
446
* jk/http-auth-keyring (2011-08-03) 13 commits
447
(merged to 'next' on 2011-08-03 at b06e80e)
@@ -356,31 +463,6 @@ Looked mostly reasonable except for the limitation that it is not clear
463
how to deal with a site at which a user needs to use different passwords
464
for different repositories.
465
359
-* js/ref-namespaces (2011-07-21) 5 commits
360
- (merged to 'next' on 2011-07-25 at 5b7dcfe)
361
- + ref namespaces: tests
362
- + ref namespaces: documentation
363
- + ref namespaces: Support remote repositories via upload-pack and receive-pack
364
- + ref namespaces: infrastructure
365
- + Fix prefix handling in ref iteration functions
366
-
367
-* rc/histogram-diff (2011-08-08) 12 commits
368
- (merged to 'next' on 2011-08-11 at 684dfd1)
369
- + xdiff/xhistogram: drop need for additional variable
370
- + xdiff/xhistogram: rely on xdl_trim_ends()
371
- + xdiff/xhistogram: rework handling of recursed results
372
- + xdiff: do away with xdl_mmfile_next()
373
- (merged to 'next' on 2011-08-03 at f9e2328)
374
- + Make test number unique
375
- (merged to 'next' on 2011-07-25 at 3351028)
376
- + xdiff/xprepare: use a smaller sample size for histogram diff
377
- + xdiff/xprepare: skip classification
378
- + teach --histogram to diff
379
- + t4033-diff-patience: factor out tests
380
- + xdiff/xpatience: factor out fall-back-diff function
381
- + xdiff/xprepare: refactor abort cleanups
382
- + xdiff/xprepare: use memset()
383
-
466
* rr/revert-cherry-pick-continue (2011-08-08) 18 commits
467
- revert: Propagate errors upwards from do_pick_commit
468
- revert: Introduce --continue to continue the operation
@@ -400,3 +482,5 @@ for different repositories.
482
- revert: Simplify and inline add_message_to_msg
483
- config: Introduce functions to write non-standard file
484
- advice: Introduce error_resolve_conflict
485
+
486
+Will merge to "next".