What's cooking (2015/03 #06)
Junio C Hamano committed
Mar 17, 2015 at 16:41 UTC
b781d32f8a6955aeb23d7bf4a926053b1667e39a
1 file changed
+168
-140
whats-cooking.txt
+168
-140
@@ -1,96 +1,123 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2015, #05; Sat, 14)
4
-X-master-at: 52cae643c5d49b7fa18a7a4c60c284f9ae2e2c71
5
-X-next-at: dac11456999723012aeb1167e3d09a83b1e0f740
3
+Subject: What's cooking in git.git (Mar 2015, #06; Tue, 17)
4
+X-master-at: 9ab698f4000a736864c41f57fbae1e021ac27799
5
+X-next-at: 9c5cf4debae1a49f88979567369a5809977ff34b
6
7
-What's cooking in git.git (Mar 2015, #05; Sat, 14)
7
+What's cooking in git.git (Mar 2015, #06; Tue, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-On the 'maint' front is the latest maintenance release v2.3.3.
15
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
22
-[New Topics]
20
+[Graduated to "master"]
21
24
-* jk/tag-h-column-is-a-listing-option (2015-03-12) 1 commit
25
- - tag: fix some mis-organized options in "-h" listing
22
+* ak/git-done-help-cleanup (2015-03-06) 1 commit
23
+ (merged to 'next' on 2015-03-10 at 971382b)
24
+ + git: make was_alias and done_help non-static
25
27
- "git tag -h" used to show the "--column" and "--sort" options
28
- that are about listing in a wrong section.
26
+ Code simplification.
27
30
- Will merge to 'next'.
28
29
+* es/rebase-i-count-todo (2015-03-06) 2 commits
30
+ (merged to 'next' on 2015-03-10 at fff95d5)
31
+ + rebase-interactive: re-word "item count" comment
32
+ + rebase-interactive: suppress whitespace preceding item count
33
33
-* as/userdiff-sh (2015-03-13) 1 commit
34
- - userdiff: funcname and word patterns for sh
34
+ "git rebase -i" recently started to include the number of
35
+ commits in the insn sheet to be processed, but on a platform
36
+ that prepends leading whitespaces to "wc -l" output, the numbers
37
+ are shown with extra whitespaces that aren't necessary.
38
39
37
-* bc/object-id (2015-03-13) 10 commits
38
- - apply: convert threeway_stage to object_id
39
- - patch-id: convert to use struct object_id
40
- - commit: convert parts to struct object_id
41
- - diff: convert struct combine_diff_path to object_id
42
- - bulk-checkin.c: convert to use struct object_id
43
- - zip: use GIT_SHA1_HEXSZ for trailers
44
- - archive.c: convert to use struct object_id
45
- - bisect.c: convert leaf functions to use struct object_id
46
- - define utility functions for object IDs
47
- - define a structure for object IDs
40
+* mg/doc-status-color-slot (2015-03-10) 1 commit
41
+ (merged to 'next' on 2015-03-12 at e53910a)
42
+ + config,completion: add color.status.unmerged
43
44
+ Documentation fixes.
45
50
-* ct/prompt-untracked-fix (2015-03-13) 1 commit
51
- - git prompt: use toplevel to find untracked files
46
53
- The prompt script (in contrib/) did not show the untracked sign
54
- when working in a subdirectory without any untracked files.
47
+* mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit
48
+ (merged to 'next' on 2015-03-10 at 6a09295)
49
+ + sequencer: preserve commit messages
50
51
+ "git cherry-pick" used to clean-up the log message even when it is
52
+ merely replaying an existing commit. It now replays the message
53
+ verbatim unless you are editing the message of resulting commits.
54
57
-* jk/smart-http-hide-refs (2015-03-12) 2 commits
58
- - upload-pack: do not check NULL return of lookup_unknown_object
59
- - upload-pack: fix transfer.hiderefs over smart-http
55
61
- The transfer.hiderefs support did not quite work for smart-http
62
- transport.
56
+* mg/status-v-v (2015-03-06) 3 commits
57
+ (merged to 'next' on 2015-03-10 at 4fa5af0)
58
+ + commit/status: show the index-worktree diff with -v -v
59
+ + t7508: test git status -v
60
+ + t7508: .gitignore 'expect' and 'output' files
61
64
- Will merge to 'next'.
62
+ "git status" now allows the "-v" to be given twice to show the
63
+ differences that are left in the working tree not to be committed.
64
65
67
-* jk/test-annoyances (2015-03-12) 5 commits
68
- - t5551: make EXPENSIVE test cheaper
69
- - t5541: move run_with_cmdline_limit to test-lib.sh
70
- - t: pass GIT_TRACE through Apache
71
- - t: redirect stderr GIT_TRACE to descriptor 4
72
- - t: translate SIGINT to an exit
66
+* rs/deflate-init-cleanup (2015-03-05) 1 commit
67
+ (merged to 'next' on 2015-03-10 at 053157f)
68
+ + zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
69
74
- Will merge to 'next'.
70
+ Code simplification.
71
72
77
-* nd/config-doc-camelCase (2015-03-13) 1 commit
78
- - *config.txt: stick to camelCase naming convention
73
+* rs/zip-text (2015-03-05) 1 commit
74
+ (merged to 'next' on 2015-03-10 at 2f3fa92)
75
+ + archive-zip: mark text files in archives
76
+
77
+ "git archive" can now be told to set the 'text' attribute in the
78
+ resulting zip archive.
79
80
- Will merge to 'next'.
80
+
81
+* sg/completion-remote (2015-03-06) 2 commits
82
+ (merged to 'next' on 2015-03-10 at e1cd42b)
83
+ + completion: simplify __git_remotes()
84
+ + completion: add a test for __git_remotes() helper function
85
+
86
+ Code simplification.
87
88
--------------------------------------------------
83
-[Stalled]
89
+[New Topics]
90
+
91
+* js/completion-ctags-pattern-substitution-fix (2015-03-14) 1 commit
92
+ (merged to 'next' on 2015-03-17 at 4a68861)
93
+ + contrib/completion: escape the forward slash in __git_match_ctag
94
+
95
+ The code that reads from the ctags file in the completion script
96
+ (in contrib/) did not spell ${param/pattern/string} substitution
97
+ correctly, which happened to work with bash but not with zsh.
98
+
99
+ Will merge to 'master'.
100
+
101
85
-* jk/push-config (2015-02-17) 4 commits
86
- - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags
87
- - cmd_push: pass "flags" pointer to config callback
88
- - cmd_push: set "atomic" bit directly
89
- - git_push_config: drop cargo-culted wt_status pointer
102
+* jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
103
+ - "-" and "@{-1}" on various programs
104
91
- Waiting for Ack and/or update for the tip one from Dave Olszewski
92
- ($gmane/263880, $gmane/263991).
105
+ Lose special case code to make a lone dash "-" mean the previous
106
+ branch aka "@{-1}" from a handful subcommands, and instead support
107
+ the notation throughout the system by reimplementing it at the
108
+ revisions layer.
109
110
+ Needs tests, documentation updates, etc.
111
+
112
+
113
+* jc/submitting-patches-mention-send-email (2015-03-15) 1 commit
114
+ - SubmittingPatches: encourage users to use format-patch and send-email
115
+
116
+ Recommend format-patch and send-email for those who want to submit
117
+ patches to this project.
118
+
119
+--------------------------------------------------
120
+[Stalled]
121
122
* nd/untracked-cache (2015-03-12) 24 commits
123
- git-status.txt: advertisement for untracked cache
@@ -271,6 +298,92 @@ of the repositories listed at
298
--------------------------------------------------
299
[Cooking]
300
301
+* jk/push-config (2015-03-14) 4 commits
302
+ (merged to 'next' on 2015-03-16 at 6452570)
303
+ + push: allow --follow-tags to be set by config push.followTags
304
+ + cmd_push: pass "flags" pointer to config callback
305
+ + cmd_push: set "atomic" bit directly
306
+ + git_push_config: drop cargo-culted wt_status pointer
307
+
308
+ Restructure "git push" codepath to make it easier to add new
309
+ configuration bits and then add push.followTags configuration that
310
+ turns --follow-tags option on by default.
311
+
312
+ Will merge to 'master'.
313
+
314
+
315
+* jk/tag-h-column-is-a-listing-option (2015-03-12) 1 commit
316
+ (merged to 'next' on 2015-03-16 at 42b04c6)
317
+ + tag: fix some mis-organized options in "-h" listing
318
+
319
+ "git tag -h" used to show the "--column" and "--sort" options
320
+ that are about listing in a wrong section.
321
+
322
+ Will merge to 'master'.
323
+
324
+
325
+* as/userdiff-sh (2015-03-13) 1 commit
326
+ - userdiff: funcname and word patterns for sh
327
+
328
+
329
+* bc/object-id (2015-03-13) 10 commits
330
+ - apply: convert threeway_stage to object_id
331
+ - patch-id: convert to use struct object_id
332
+ - commit: convert parts to struct object_id
333
+ - diff: convert struct combine_diff_path to object_id
334
+ - bulk-checkin.c: convert to use struct object_id
335
+ - zip: use GIT_SHA1_HEXSZ for trailers
336
+ - archive.c: convert to use struct object_id
337
+ - bisect.c: convert leaf functions to use struct object_id
338
+ - define utility functions for object IDs
339
+ - define a structure for object IDs
340
+
341
+ Identify parts of the code that knows that we use SHA-1 hash to
342
+ name our objects too much, and use (1) symbolic constants instead
343
+ of hardcoded 20 as byte count and/or (2) use struct object_id
344
+ instead of unsigned char [20] for object names.
345
+
346
+ Will cook in 'next'.
347
+
348
+
349
+* ct/prompt-untracked-fix (2015-03-15) 1 commit
350
+ - git prompt: use toplevel to find untracked files
351
+
352
+ The prompt script (in contrib/) did not show the untracked sign
353
+ when working in a subdirectory without any untracked files.
354
+
355
+ Will merge to 'next'
356
+
357
+
358
+* jk/smart-http-hide-refs (2015-03-12) 2 commits
359
+ (merged to 'next' on 2015-03-16 at 530df4c)
360
+ + upload-pack: do not check NULL return of lookup_unknown_object
361
+ + upload-pack: fix transfer.hiderefs over smart-http
362
+
363
+ The transfer.hiderefs support did not quite work for smart-http
364
+ transport.
365
+
366
+ Will merge to 'master'.
367
+
368
+
369
+* jk/test-annoyances (2015-03-12) 5 commits
370
+ (merged to 'next' on 2015-03-16 at 845b091)
371
+ + t5551: make EXPENSIVE test cheaper
372
+ + t5541: move run_with_cmdline_limit to test-lib.sh
373
+ + t: pass GIT_TRACE through Apache
374
+ + t: redirect stderr GIT_TRACE to descriptor 4
375
+ + t: translate SIGINT to an exit
376
+
377
+ Will merge to 'master'.
378
+
379
+
380
+* nd/config-doc-camelCase (2015-03-13) 1 commit
381
+ (merged to 'next' on 2015-03-16 at 0e3fedb)
382
+ + *config.txt: stick to camelCase naming convention
383
+
384
+ Will merge to 'master'.
385
+
386
+
387
* kn/git-cd-to-empty (2015-03-06) 1 commit
388
(merged to 'next' on 2015-03-12 at 54dea03)
389
+ git: treat "git -C '<path>'" as a no-op when <path> is empty
@@ -281,7 +394,8 @@ of the repositories listed at
394
Will merge to 'master'.
395
396
284
-* dj/log-graph-with-no-walk (2015-03-10) 1 commit
397
+* dj/log-graph-with-no-walk (2015-03-17) 2 commits
398
+ - SQUASH: no test $a -a $b please
399
- revision: forbid combining --graph and --no-walk
400
401
"git log --graph --no-walk A B..." is a otcnflicting request that
@@ -289,9 +403,6 @@ of the repositories listed at
403
history, while graph asks to draw connections between these
404
discrete points. Forbid the combination.
405
292
- Will replace with the version that does not special case "git show"
293
- that implies "--no-walk" unless it is given a range.
294
-
406
407
* km/bsd-shells (2015-03-10) 5 commits
408
(merged to 'next' on 2015-03-13 at f839e4c)
@@ -329,15 +440,6 @@ of the repositories listed at
440
Will merge to 'master'.
441
442
332
-* mg/doc-status-color-slot (2015-03-10) 1 commit
333
- (merged to 'next' on 2015-03-12 at e53910a)
334
- + config,completion: add color.status.unmerged
335
-
336
- Documentation fixes.
337
-
338
- Will merge to 'master'.
339
-
340
-
443
* mg/verify-commit (2015-03-10) 1 commit
444
(merged to 'next' on 2015-03-13 at 292197f)
445
+ t7510: do not fail when gpg warns about insecure memory
@@ -383,28 +485,6 @@ of the repositories listed at
485
Waiting for further comments.
486
487
386
-* ak/git-done-help-cleanup (2015-03-06) 1 commit
387
- (merged to 'next' on 2015-03-10 at 971382b)
388
- + git: make was_alias and done_help non-static
389
-
390
- Code simplification.
391
-
392
- Will merge to 'master'.
393
-
394
-
395
-* es/rebase-i-count-todo (2015-03-06) 2 commits
396
- (merged to 'next' on 2015-03-10 at fff95d5)
397
- + rebase-interactive: re-word "item count" comment
398
- + rebase-interactive: suppress whitespace preceding item count
399
-
400
- "git rebase -i" recently started to include the number of
401
- commits in the insn sheet to be processed, but on a platform
402
- that prepends leading whitespaces to "wc -l" output, the numbers
403
- are shown with extra whitespaces that aren't necessary.
404
-
405
- Will merge to 'master'.
406
-
407
-
488
* mg/log-decorate-HEAD (2015-03-10) 2 commits
489
(merged to 'next' on 2015-03-13 at 96ce660)
490
+ log: decorate HEAD with branch name
@@ -430,46 +510,6 @@ of the repositories listed at
510
Will merge to 'master'.
511
512
433
-* rs/deflate-init-cleanup (2015-03-05) 1 commit
434
- (merged to 'next' on 2015-03-10 at 053157f)
435
- + zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
436
-
437
- Code simplification.
438
-
439
- Will merge to 'master'.
440
-
441
-
442
-* rs/zip-text (2015-03-05) 1 commit
443
- (merged to 'next' on 2015-03-10 at 2f3fa92)
444
- + archive-zip: mark text files in archives
445
-
446
- "git archive" can now be told to set the 'text' attribute in the
447
- resulting zip archive.
448
-
449
- Will merge to 'master'.
450
-
451
-
452
-* sg/completion-remote (2015-03-06) 2 commits
453
- (merged to 'next' on 2015-03-10 at e1cd42b)
454
- + completion: simplify __git_remotes()
455
- + completion: add a test for __git_remotes() helper function
456
-
457
- Code simplification.
458
-
459
- Will merge to 'master'.
460
-
461
-
462
-* mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit
463
- (merged to 'next' on 2015-03-10 at 6a09295)
464
- + sequencer: preserve commit messages
465
-
466
- "git cherry-pick" used to clean-up the log message even when it is
467
- merely replaying an existing commit. It now replays the message
468
- verbatim unless you are editing the message of resulting commits.
469
-
470
- Will merge to 'master'.
471
-
472
-
513
* mg/detached-head-report (2015-03-06) 2 commits
514
(merged to 'next' on 2015-03-12 at 89443b5)
515
+ branch: name detached HEAD analogous to status
@@ -484,18 +524,6 @@ of the repositories listed at
524
Will merge to 'master'.
525
526
487
-* mg/status-v-v (2015-03-06) 3 commits
488
- (merged to 'next' on 2015-03-10 at 4fa5af0)
489
- + commit/status: show the index-worktree diff with -v -v
490
- + t7508: test git status -v
491
- + t7508: .gitignore 'expect' and 'output' files
492
-
493
- "git status" now allows the "-v" to be given twice to show the
494
- differences that are left in the working tree not to be committed.
495
-
496
- Will merge to 'master'.
497
-
498
-
527
* nd/versioncmp-prereleases (2015-03-10) 2 commits
528
(merged to 'next' on 2015-03-10 at 1df647c)
529
+ config.txt: update versioncmp.prereleaseSuffix