What's cooking (2014/05 #03)
Junio C Hamano committed
May 13, 2014 at 16:27 UTC
cc7e1998c586fab6937f3d608004f9cd181c9273
1 file changed
+171
-109
whats-cooking.txt
+171
-109
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2014, #02; Fri, 9)
4
-X-master-at: b28aeab4ec1df28f3be3cb62ff4b85e5332d8d13
5
-X-next-at: b2ff043d5327709c5228ef35b94974af38e78e42
3
+Subject: What's cooking in git.git (May 2014, #03; Tue, 13)
4
+X-master-at: 6308767f0bb58116cb405e1f4f77f5dfc1589920
5
+X-next-at: 7b9918a45049db8fa9b101e28a314928c31e0b5f
6
7
-What's cooking in git.git (May 2014, #02; Fri, 9)
7
+What's cooking in git.git (May 2014, #03; Tue, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,97 +23,49 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
27
- - Bump core.deltaBaseCacheLimit to 96m
28
-
29
- The original 16 MiB limit for the in-core delta-base-cache
30
- introduced in 18bdec11 (Limit the size of the new delta_base_cache,
31
- 2007-03-19) is turning too small.
32
-
33
- Will merge to 'next' and keep it there for the rest of this cycle.
34
-
35
-
36
-* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
37
- - [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
38
- - remote-hg: add support for hg v3.0
39
- - t: remote-hg: trivial cleanups and fixes
40
- - t: remote-hg: add file operation tests
41
- - remote-hg: add more tests
42
-
43
- Update remote-hg helper to work with newer versions of Mercurial,
44
- and fixes an incompatibility with older versions triggered by new
45
- tests.
46
-
47
- Will merge to 'next' and keep it there for the rest of this cycle.
26
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
27
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
28
+ - git-add--interactive: Preserve diff heading when splitting hunks
29
49
-
50
-* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
51
- - silence a bunch of format-zero-length warnings
52
-
53
- Will merge to 'next' and keep it there for the rest of this cycle.
54
-
55
-
56
-* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
57
- - grep: use run-command's "dir" option for --open-files-in-pager
58
-
59
- Will merge to 'next' and keep it there for the rest of this cycle.
30
+ Waiting for a reroll.
31
32
62
-* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
63
- - let clang use the constant-return error() macro
64
- - inline constant return from error() function
33
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
34
+ - t/lib-httpd: require SANITY prereq
35
36
Will merge to 'next' and keep it there for the rest of this cycle.
37
38
69
-* rs/reflog-exists (2014-05-08) 2 commits
70
- - checkout.c: use ref_exists instead of file_exist
71
- - refs.c: add new functions reflog_exists and delete_reflog
39
+* jk/index-pack-report-missing (2014-05-12) 1 commit
40
+ - index-pack: distinguish missing objects from type errors
41
42
Will merge to 'next' and keep it there for the rest of this cycle.
43
44
76
-* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
77
- - builtin/tag.c: show tag name to hint in the message editor
78
-
79
- Will merge to 'next' and keep it there for the rest of this cycle.
45
+* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
46
+ - utf8: make it easier to auto-update git_wcwidth()
47
+ - utf8.c: use a table for double_width
48
49
+ Update the logic to compute the display width needed for utf8
50
+ strings and allow us to more easily maintain the tables used in
51
+ that logic.
52
82
-* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
83
- - Revert "submodules: fix ambiguous absolute paths under Windows"
53
+ We may want to let the users choose if codepoints with ambiguous
54
+ widths are treated as a double or single width in a follow-up patch.
55
56
Will merge to 'next' and keep it there for the rest of this cycle.
57
58
88
-* jn/contrib-remove-diffall (2014-05-09) 1 commit
89
- - contrib: remove git-diffall
90
-
91
- Spring cleaning of contrib/.
59
+* mk/show-s-no-extra-blank-line-for-merges (2014-05-13) 3 commits
60
+ - fixup! git-show: fix 'git show -s' to not add extra terminator after merge commit
61
+ - t: git-show: adapt tests to fixed 'git show'
62
+ - git-show: fix 'git show -s' to not add extra terminator after merge commit
63
93
- Will merge to 'next' and keep it there for the rest of this cycle.
94
-
95
-
96
-* jn/contrib-remove-vim (2014-05-09) 1 commit
97
- - contrib: remove vim support instructions
98
-
99
- Spring cleaning of contrib/.
100
-
101
- Will merge to 'next' and keep it there for the rest of this cycle.
102
-
103
-
104
-* ss/howto-manage-trunk (2014-05-09) 8 commits
105
- - SQUASH describe what the picture shows
106
- - SQUASH minor typographic fix
107
- - SQUASH clarify the informal description of 'trunk'
108
- - SQUASH typeset literal commands with `git command`
109
- - SQUASH use a better URL
110
- - SQUASH mark-up fix
111
- - SQUASH typofix
112
- - How to keep a project's canonical history correct.
64
+ Waiting for a reroll.
65
66
115
-* wg/svn-fe-style-fixes (2014-05-09) 1 commit
116
- - svn-fe: Conform to pep8
67
+* wk/doc-clarify-upstream (2014-05-13) 1 commit
68
+ - Documentation: mention config sources for @{upstream}
69
70
Will merge to 'next' and keep it there for the rest of this cycle.
71
@@ -267,6 +219,108 @@ of the repositories listed at
219
--------------------------------------------------
220
[Cooking]
221
222
+* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
223
+ (merged to 'next' on 2014-05-12 at 97ec92a)
224
+ + Bump core.deltaBaseCacheLimit to 96m
225
+
226
+ The original 16 MiB limit for the in-core delta-base-cache
227
+ introduced in 18bdec11 (Limit the size of the new delta_base_cache,
228
+ 2007-03-19) is turning too small.
229
+
230
+ Will keep in 'next' for the remainder of the cycle.
231
+
232
+
233
+* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
234
+ - [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
235
+ - remote-hg: add support for hg v3.0
236
+ - t: remote-hg: trivial cleanups and fixes
237
+ - t: remote-hg: add file operation tests
238
+ - remote-hg: add more tests
239
+
240
+ Update remote-hg helper to work with newer versions of Mercurial,
241
+ and fixes an incompatibility with older versions triggered by new
242
+ tests.
243
+
244
+
245
+* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
246
+ (merged to 'next' on 2014-05-12 at 6b04e23)
247
+ + silence a bunch of format-zero-length warnings
248
+
249
+ Will keep in 'next' for the remainder of the cycle.
250
+
251
+
252
+* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
253
+ (merged to 'next' on 2014-05-12 at 065cb22)
254
+ + grep: use run-command's "dir" option for --open-files-in-pager
255
+
256
+ Will keep in 'next' for the remainder of the cycle.
257
+
258
+
259
+* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
260
+ (merged to 'next' on 2014-05-12 at d9daf8d)
261
+ + let clang use the constant-return error() macro
262
+ + inline constant return from error() function
263
+
264
+ Will keep in 'next' for the remainder of the cycle.
265
+
266
+
267
+* rs/reflog-exists (2014-05-08) 2 commits
268
+ (merged to 'next' on 2014-05-12 at 24a1d01)
269
+ + checkout.c: use ref_exists instead of file_exist
270
+ + refs.c: add new functions reflog_exists and delete_reflog
271
+
272
+ Will keep in 'next' for the remainder of the cycle.
273
+
274
+
275
+* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
276
+ (merged to 'next' on 2014-05-12 at 0b7db32)
277
+ + builtin/tag.c: show tag name to hint in the message editor
278
+
279
+ Will keep in 'next' for the remainder of the cycle.
280
+
281
+
282
+* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
283
+ - Revert "submodules: fix ambiguous absolute paths under Windows"
284
+
285
+ Will merge to 'next' and keep it there for the rest of this cycle.
286
+
287
+
288
+* jn/contrib-remove-diffall (2014-05-09) 1 commit
289
+ (merged to 'next' on 2014-05-12 at 416009e)
290
+ + contrib: remove git-diffall
291
+
292
+ Spring cleaning of contrib/.
293
+
294
+ Will keep in 'next' for the remainder of the cycle.
295
+
296
+
297
+* jn/contrib-remove-vim (2014-05-09) 1 commit
298
+ (merged to 'next' on 2014-05-12 at 9e727c8)
299
+ + contrib: remove vim support instructions
300
+
301
+ Spring cleaning of contrib/.
302
+
303
+ Will keep in 'next' for the remainder of the cycle.
304
+
305
+
306
+* ss/howto-manage-trunk (2014-05-09) 8 commits
307
+ - SQUASH describe what the picture shows
308
+ - SQUASH minor typographic fix
309
+ - SQUASH clarify the informal description of 'trunk'
310
+ - SQUASH typeset literal commands with `git command`
311
+ - SQUASH use a better URL
312
+ - SQUASH mark-up fix
313
+ - SQUASH typofix
314
+ - How to keep a project's canonical history correct.
315
+
316
+
317
+* wg/svn-fe-style-fixes (2014-05-12) 1 commit
318
+ (merged to 'next' on 2014-05-12 at 88c0e0d)
319
+ + svn-fe: conform to pep8
320
+
321
+ Will keep in 'next' for the remainder of the cycle.
322
+
323
+
324
* bg/strbuf-trim (2014-05-06) 2 commits
325
(merged to 'next' on 2014-05-07 at 978f378)
326
+ api-strbuf.txt: add docs for _trim and _ltrim
@@ -293,14 +347,15 @@ of the repositories listed at
347
348
349
* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
296
- - mv: allow renaming to fix case on case insensitive filesystems
297
- - merge-recursive.c: fix case-changing merge bug
350
+ (merged to 'next' on 2014-05-12 at 820d524)
351
+ + mv: allow renaming to fix case on case insensitive filesystems
352
+ + merge-recursive.c: fix case-changing merge bug
353
354
On a case insensitive filesystem, merge-recursive incorrectly
355
deleted the file that is to be renamed to a name that is the same
356
except for case differences.
357
303
- Will merge to 'next' and keep it there for the rest of this cycle.
358
+ Will keep in 'next' for the remainder of the cycle.
359
360
361
* ew/config-protect-mode (2014-05-06) 1 commit
@@ -318,19 +373,21 @@ of the repositories listed at
373
374
375
* jc/coding-guidelines (2014-05-02) 8 commits
321
- - CodingGuidelines: on splitting a long line
322
- - CodingGuidelines: on comparison
323
- - CodingGuidelines: do not call the conditional statement "if()"
324
- - CodingGuidelines: give an example for shell function preamble
325
- - CodingGuidelines: give an example for control statements
326
- - CodingGuidelines: give an example for redirection
327
- - CodingGuidelines: give an example for case/esac statement
328
- - CodingGuidelines: once it is in, it is not worth the code churn
376
+ (merged to 'next' on 2014-05-12 at e1fcf62)
377
+ + CodingGuidelines: on splitting a long line
378
+ + CodingGuidelines: on comparison
379
+ + CodingGuidelines: do not call the conditional statement "if()"
380
+ + CodingGuidelines: give an example for shell function preamble
381
+ + CodingGuidelines: give an example for control statements
382
+ + CodingGuidelines: give an example for redirection
383
+ + CodingGuidelines: give an example for case/esac statement
384
+ + CodingGuidelines: once it is in, it is not worth the code churn
385
330
- Will merge to 'next' and keep it there for the rest of this cycle.
386
+ Will keep in 'next' for the remainder of the cycle.
387
388
333
-* jd/subtree (2014-05-06) 5 commits
389
+* jd/subtree (2014-05-13) 6 commits
390
+ - contrib/subtree: allow adding an annotated tag
391
(merged to 'next' on 2014-05-07 at 81b375d)
392
+ contrib/subtree/Makefile: clean up rule for "clean"
393
+ contrib/subtree/Makefile: clean up rules to generate documentation
@@ -366,65 +423,69 @@ of the repositories listed at
423
424
425
* cc/replace-edit (2014-04-29) 4 commits
369
- - replace: add --edit option
370
- - replace: factor object resolution out of replace_object
371
- - replace: use OPT_CMDMODE to handle modes
372
- - replace: refactor command-mode determination
426
+ (merged to 'next' on 2014-05-12 at 71449bf)
427
+ + replace: add --edit option
428
+ + replace: factor object resolution out of replace_object
429
+ + replace: use OPT_CMDMODE to handle modes
430
+ + replace: refactor command-mode determination
431
432
"git replace" learns a new "--edit" option.
433
376
- Will merge to 'next' and keep it there for the rest of this cycle.
434
+ Will keep in 'next' for the remainder of the cycle.
435
436
437
* da/imap-send-use-credential-helper (2014-04-29) 1 commit
380
- - imap-send: use git-credential
438
+ (merged to 'next' on 2014-05-12 at b0698a5)
439
+ + imap-send: use git-credential
440
441
"git imap-send" learns to ask the credential helper for
442
authentication material.
443
385
- Will merge to 'next' and keep it there for the rest of this cycle.
444
+ Will keep in 'next' for the remainder of the cycle.
445
446
447
* dk/blame-reorg (2014-04-28) 1 commit
448
- blame: large-scale performance rewrite
449
391
- I haven't found any "WAT" in my daily use, but I need to find time
392
- to re-read the whole thing once again. After doing that, will
393
- merge to 'next' and keep it there for the rest of this cycle.
450
+ Will merge to 'next' and keep it there for the rest of this cycle.
451
452
453
* je/pager-do-not-recurse (2014-04-28) 1 commit
397
- - pager: do allow spawning pager recursively
454
+ (merged to 'next' on 2014-05-12 at 32de470)
455
+ + pager: do allow spawning pager recursively
456
457
We used to unconditionally disabled the pager in the pager process
458
we spawn to feed out output, but that prevents people who want to
459
run less within less from doing so.
460
403
- Will merge to 'next' and keep it there for the rest of this cycle.
461
+ Will keep in 'next' for the remainder of the cycle.
462
463
464
* jk/commit-C-pick-empty (2014-04-28) 1 commit
407
- - commit: do not complain of empty messages from -C
465
+ (merged to 'next' on 2014-05-12 at c187e1e)
466
+ + commit: do not complain of empty messages from -C
467
468
"git commit --allow-empty-message -C $commit" did not work when the
469
commit did not have any log message.
470
412
- Will merge to 'next' and keep it there for the rest of this cycle.
471
+ Will keep in 'next' for the remainder of the cycle.
472
473
474
* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
416
- - t3910: show failure of core.precomposeunicode with decomposed filenames
475
+ (merged to 'next' on 2014-05-12 at 948823c)
476
+ + t3910: show failure of core.precomposeunicode with decomposed filenames
477
478
Document a known breakage with a test.
479
420
- Will merge to 'next' and keep it there for the rest of this cycle.
480
+ Will keep in 'next' for the remainder of the cycle.
481
482
483
* mt/send-email-cover-to-cc (2014-04-29) 2 commits
424
- - test/send-email: to-cover, cc-cover tests
425
- - git-send-email: two new options: to-cover, cc-cover
484
+ (merged to 'next' on 2014-05-12 at b696006)
485
+ + test/send-email: to-cover, cc-cover tests
486
+ + git-send-email: two new options: to-cover, cc-cover
487
427
- Will merge to 'next' and keep it there for the rest of this cycle.
488
+ Will keep in 'next' for the remainder of the cycle.
489
490
491
* nd/split-index (2014-04-29) 33 commits
@@ -467,9 +528,10 @@ of the repositories listed at
528
529
530
* tl/relax-in-poll-emulation (2014-04-29) 1 commit
470
- - compat/poll: sleep 1 millisecond to avoid busy wait
531
+ (merged to 'next' on 2014-05-12 at 9369b08)
532
+ + compat/poll: sleep 1 millisecond to avoid busy wait
533
472
- Will merge to 'next' and keep it there for the rest of this cycle.
534
+ Will keep in 'next' for the remainder of the cycle.
535
536
537
* bc/blame-crlf-test (2014-05-08) 1 commit