What's cooking (2012/11 #07)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 21, 2012 at 14:01 UTC
2c806864e99fc1252cea652ab0fc837067e726ba
1 file changed
+190
-214
whats-cooking.txt
+190
-214
@@ -1,23 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #06; Mon, 19)
4
-X-master-at: f3828dc0669826660f5034a468913115675ff501
5
-X-next-at: 0037290f177c95a7fd401d8dfe453851e0840c9d
3
+Subject: What's cooking in git.git (Nov 2012, #07; Wed, 21)
4
+X-master-at: 2d242fb3fc19fc9ba046accdd9210be8b9913f64
5
+X-next-at: ce6fbe5b9dc5e1e8ce1499bd8f7fb982e0c68289
6
7
-What's cooking in git.git (Nov 2012, #06; Mon, 19)
7
+What's cooking in git.git (Nov 2012, #07; Wed, 21)
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
-Bunch of topics have been merged to 'next'.
15
-
16
-We are at the beginning of the 5th week of this release cycle
17
-(cf. http://tinyurl.com/gitcal), and I've moved many topics to the
18
-Stalled category, which will be discarded without prejudice soonish
19
-unless there are some updates. I am still a bit behind on some
20
-topics and already posted rerolls may have to be pulled in.
14
+Many topics have been merged to 'maint' in preparation for 1.8.0.1;
15
+and some more dormant topics have been moved to the stalled category
16
+(to be discarded without prejudice unless they see some activities).
17
+The upcoming 1.8.1 release is slowly taking shape.
18
19
You can find the changes described here in the integration branches of the
20
repositories listed at
@@ -27,11 +24,137 @@ repositories listed at
24
--------------------------------------------------
25
[New Topics]
26
30
-* nd/pathspec-wildcard (2012-11-19) 4 commits
31
- - tree_entry_interesting: do basedir compare on wildcard patterns when possible
32
- - pathspec: apply "*.c" optimization from exclude
33
- - pathspec: do exact comparison on the leading non-wildcard part
34
- - pathspec: save the non-wildcard length part
27
+* nd/maint-compat-fnmatch-fix (2012-11-20) 1 commit
28
+ (merged to 'next' on 2012-11-21 at ce6fbe5)
29
+ + compat/fnmatch: fix off-by-one character class's length check
30
+
31
+ Will merge to 'master' and then 'maint'.
32
+
33
+--------------------------------------------------
34
+[Graduated to "master"]
35
+
36
+* cn/config-missing-path (2012-11-15) 1 commit
37
+ (merged to 'next' on 2012-11-18 at c08b73c)
38
+ + config: don't segfault when given --path with a missing value
39
+
40
+
41
+* jk/checkout-out-of-unborn (2012-11-15) 1 commit
42
+ (merged to 'next' on 2012-11-18 at 7d2aa24)
43
+ + checkout: print a message when switching unborn branches
44
+
45
+
46
+* jk/config-ignore-duplicates (2012-10-29) 9 commits
47
+ (merged to 'next' on 2012-10-29 at 67fa0a2)
48
+ + builtin/config.c: Fix a sparse warning
49
+ (merged to 'next' on 2012-10-25 at 233df08)
50
+ + git-config: use git_config_with_options
51
+ + git-config: do not complain about duplicate entries
52
+ + git-config: collect values instead of immediately printing
53
+ + git-config: fix regexp memory leaks on error conditions
54
+ + git-config: remove memory leak of key regexp
55
+ + t1300: test "git config --get-all" more thoroughly
56
+ + t1300: remove redundant test
57
+ + t1300: style updates
58
+
59
+ Drop duplicate detection from git-config; this lets it better match
60
+ the internal config callbacks, which clears up some corner cases
61
+ with includes. This is an API breakage, though.
62
+
63
+
64
+* jk/maint-gitweb-xss (2012-11-12) 1 commit
65
+ (merged to 'next' on 2012-11-14 at 7a667bc)
66
+ + gitweb: escape html in rss title
67
+
68
+ Fixes an XSS vulnerability in gitweb.
69
+
70
+
71
+* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
72
+ (merged to 'next' on 2012-11-09 at af69926)
73
+ + remote-curl: retry failed requests for auth even with gzip
74
+ + remote-curl: hoist gzip buffer size to top of post_rpc
75
+
76
+ Fixes fetch from servers that ask for auth only during the actual
77
+ packing phase. This is not really a recommended configuration, but it
78
+ cleans up the code at the same time.
79
+
80
+
81
+* jl/submodule-rm (2012-11-14) 1 commit
82
+ (merged to 'next' on 2012-11-18 at bf4525d)
83
+ + docs: move submodule section
84
+
85
+ Documentation correction for d21240f (Merge branch
86
+ 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.
87
+
88
+
89
+* kb/preload-index-more (2012-11-02) 1 commit
90
+ (merged to 'next' on 2012-11-09 at a750ebd)
91
+ + update-index/diff-index: use core.preloadindex to improve performance
92
+
93
+ Use preloadindex in more places, which has a nice speedup on systems
94
+ with slow stat calls (and even on Linux).
95
+
96
+
97
+* mg/replace-resolve-delete (2012-11-13) 1 commit
98
+ (merged to 'next' on 2012-11-14 at fa785ae)
99
+ + replace: parse revision argument for -d
100
+
101
+ Be more user friendly to people using "git replace -d".
102
+
103
+
104
+* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
105
+ (merged to 'next' on 2012-11-13 at 2bf41d9)
106
+ + link_alt_odb_entries(): take (char *, len) rather than two pointers
107
+ + link_alt_odb_entries(): use string_list_split_in_place()
108
+
109
+ Cleanups in the alternates code. Fixes a potential bug and makes the
110
+ code much cleaner.
111
+
112
+
113
+* ml/cygwin-mingw-headers (2012-11-18) 2 commits
114
+ (merged to 'next' on 2012-11-19 at f9964da)
115
+ + USE CGYWIN_V15_WIN32API as macro to select api for cygwin
116
+ (merged to 'next' on 2012-11-15 at 22e11b3)
117
+ + Update cygwin.c for new mingw-64 win32 api headers
118
+
119
+ Make git work on newer cygwin.
120
+
121
+
122
+* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit
123
+ (merged to 'next' on 2012-11-13 at e90cc7c)
124
+ + git p4: RCS expansion should not span newlines
125
+
126
+ I do not have p4 to play with, but looks obviously correct to me.
127
+
128
+
129
+* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
130
+ (merged to 'next' on 2012-11-13 at c57d856)
131
+ + gitweb.perl: fix %highlight_ext mappings
132
+
133
+ Fixes a clever misuse of perl's list interpretation.
134
+
135
+
136
+* so/prompt-command (2012-10-17) 4 commits
137
+ (merged to 'next' on 2012-10-25 at 79565a1)
138
+ + coloured git-prompt: paint detached HEAD marker in red
139
+ + Fix up colored git-prompt
140
+ + show color hints based on state of the git tree
141
+ + Allow __git_ps1 to be used in PROMPT_COMMAND
142
+
143
+ Updates __git_ps1 so that it can be used as $PROMPT_COMMAND,
144
+ instead of being used for command substitution in $PS1, to embed
145
+ color escape sequences in its output.
146
+
147
+ Will merge to 'master' in the seventh batch.
148
+
149
+
150
+* ta/doc-cleanup (2012-10-25) 6 commits
151
+ (merged to 'next' on 2012-11-13 at e11fafd)
152
+ + Documentation: build html for all files in technical and howto
153
+ + Documentation/howto: convert plain text files to asciidoc
154
+ + Documentation/technical: convert plain text files to asciidoc
155
+ + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
156
+ + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
157
+ + Split over-long synopsis in git-fetch-pack.txt into several lines
158
159
--------------------------------------------------
160
[Stalled]
@@ -55,18 +178,6 @@ repositories listed at
178
Expecting a re-roll.
179
180
58
-* pp/gitweb-config-underscore (2012-11-08) 1 commit
59
- - gitweb: make remote_heads config setting work
60
-
61
- The key "gitweb.remote_heads" is not legal git config; this maps it to
62
- "gitweb.remoteheads".
63
-
64
- Junio raised a good point about the implementation for three-level
65
- variables.
66
-
67
- Expecting a re-roll.
68
-
69
-
181
* mo/cvs-server-updates (2012-10-16) 10 commits
182
- cvsserver Documentation: new cvs ... -r support
183
- cvsserver: add t9402 to test branch and tag refs
@@ -82,16 +193,6 @@ repositories listed at
193
Needs review by folks interested in cvsserver.
194
195
85
-* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
86
- - apply.c:update_pre_post_images(): the preimage can be truncated
87
-
88
- Fix to update_pre_post_images() that did not take into account the
89
- possibility that whitespace fix could shrink the preimage and
90
- change the number of lines in it.
91
-
92
- Extra set of eyeballs appreciated.
93
-
94
-
196
* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
197
- config: exit on error accessing any config file
198
- doc: advertise GIT_CONFIG_NOSYSTEM
@@ -152,7 +253,7 @@ repositories listed at
253
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
254
- remote-testgit: properly check for errors
255
155
- Is this still in "Needs review" state? Are poeple involved in the
256
+ Is this still in "Needs review" state? Are people involved in the
257
remote interface happy with this change?
258
259
@@ -327,14 +428,54 @@ repositories listed at
428
--------------------------------------------------
429
[Cooking]
430
330
-* jl/submodule-rm (2012-11-14) 1 commit
331
- (merged to 'next' on 2012-11-18 at bf4525d)
332
- + docs: move submodule section
431
+* fc/fast-export-fixes (2012-11-21) 19 commits
432
+ - fast-export: don't handle uninteresting refs
433
+ - fast-export: make sure updated refs get updated
434
+ - fast-export: fix comparison in tests
435
+ - fast-export: trivial cleanup
436
+ - remote-testgit: advertise "done" feature and write "done" ourselves
437
+ - fixup! remote-testgit: report success after an import
438
+ - remote-testgit: report success after an import
439
+ - fixup! remote-testgit: exercise non-default refspec feature
440
+ - remote-testgit: exercise non-default refspec feature
441
+ - remote-testgit: cleanup tests
442
+ - remote-testgit: remove irrelevant test
443
+ - remote-testgit: remove non-local tests
444
+ - fixup! Add git-remote-testgit
445
+ - Add git-remote-testgit
446
+ - Rename git-remote-testgit to git-remote-testpy
447
+ - remote-helpers: fix failure message
448
+ - remote-testgit: fix direction of marks
449
+ - fixup! fast-export: avoid importing blob marks
450
+ - fast-export: avoid importing blob marks
451
334
- Documentation correction for d21240f (Merge branch
335
- 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.
452
+ Replaced with the last re-roll posted to the list, queued with
453
+ various fixup! commits to record suggested changes (most are
454
+ trivial style fixes).
455
337
- Will merge to 'master' in the sixth batch.
456
+
457
+* pp/gitweb-config-underscore (2012-11-21) 1 commit
458
+ - gitweb: make remote_heads config setting work
459
+
460
+ The key "gitweb.remote_heads" is not legal git config; this maps it to
461
+ "gitweb.remoteheads".
462
+
463
+
464
+* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
465
+ - apply.c:update_pre_post_images(): the preimage can be truncated
466
+
467
+ Fix to update_pre_post_images() that did not take into account the
468
+ possibility that whitespace fix could shrink the preimage and
469
+ change the number of lines in it.
470
+
471
+ Will merge to 'next'.
472
+
473
+
474
+* nd/pathspec-wildcard (2012-11-19) 4 commits
475
+ - tree_entry_interesting: do basedir compare on wildcard patterns when possible
476
+ - pathspec: apply "*.c" optimization from exclude
477
+ - pathspec: do exact comparison on the leading non-wildcard part
478
+ - pathspec: save the non-wildcard length part
479
480
481
* sg/complete-help-undup (2012-11-14) 1 commit
@@ -351,20 +492,6 @@ repositories listed at
492
Will merge to 'master' in the seventh batch.
493
494
354
-* cn/config-missing-path (2012-11-15) 1 commit
355
- (merged to 'next' on 2012-11-18 at c08b73c)
356
- + config: don't segfault when given --path with a missing value
357
-
358
- Will merge to 'master' in the sixth batch.
359
-
360
-
361
-* jk/checkout-out-of-unborn (2012-11-15) 1 commit
362
- (merged to 'next' on 2012-11-18 at 7d2aa24)
363
- + checkout: print a message when switching unborn branches
364
-
365
- Will merge to 'master' in the sixth batch.
366
-
367
-
495
* mk/complete-tcsh (2012-11-16) 1 commit
496
(merged to 'next' on 2012-11-19 at 8309029)
497
+ tcsh-completion re-using git-completion.bash
@@ -378,47 +505,6 @@ repositories listed at
505
Will merge to 'next'.
506
507
381
-* jk/maint-gitweb-xss (2012-11-12) 1 commit
382
- (merged to 'next' on 2012-11-14 at 7a667bc)
383
- + gitweb: escape html in rss title
384
-
385
- Fixes an XSS vulnerability in gitweb.
386
-
387
- Will merge to 'master' in the sixth batch.
388
-
389
-
390
-* mg/replace-resolve-delete (2012-11-13) 1 commit
391
- (merged to 'next' on 2012-11-14 at fa785ae)
392
- + replace: parse revision argument for -d
393
-
394
- Be more user friendly to people using "git replace -d".
395
-
396
- Will merge to 'master' in the sixth batch.
397
-
398
-
399
-* ml/cygwin-mingw-headers (2012-11-18) 2 commits
400
- (merged to 'next' on 2012-11-19 at f9964da)
401
- + USE CGYWIN_V15_WIN32API as macro to select api for cygwin
402
- (merged to 'next' on 2012-11-15 at 22e11b3)
403
- + Update cygwin.c for new mingw-64 win32 api headers
404
-
405
- Make git work on newer cygwin.
406
-
407
- Will merge to 'master' in the sixth batch.
408
-
409
-
410
-* ta/doc-cleanup (2012-10-25) 6 commits
411
- (merged to 'next' on 2012-11-13 at e11fafd)
412
- + Documentation: build html for all files in technical and howto
413
- + Documentation/howto: convert plain text files to asciidoc
414
- + Documentation/technical: convert plain text files to asciidoc
415
- + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
416
- + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
417
- + Split over-long synopsis in git-fetch-pack.txt into several lines
418
-
419
- Will merge to 'master' in the sixth batch.
420
-
421
-
508
* lt/diff-stat-show-0-lines (2012-10-17) 1 commit
509
(merged to 'next' on 2012-11-19 at 0037290)
510
+ Fix "git diff --stat" for interesting - but empty - file changes
@@ -438,21 +524,9 @@ repositories listed at
524
Any comments from zsh users?
525
526
441
-* so/prompt-command (2012-10-17) 4 commits
442
- (merged to 'next' on 2012-10-25 at 79565a1)
443
- + coloured git-prompt: paint detached HEAD marker in red
444
- + Fix up colored git-prompt
445
- + show color hints based on state of the git tree
446
- + Allow __git_ps1 to be used in PROMPT_COMMAND
447
-
448
- Updates __git_ps1 so that it can be used as $PROMPT_COMMAND,
449
- instead of being used for command substitution in $PS1, to embed
450
- color escape sequences in its output.
451
-
452
- Will cook in 'next'.
453
-
454
-
455
-* nd/wildmatch (2012-10-15) 13 commits
527
+* nd/wildmatch (2012-11-20) 14 commits
528
+ (merged to 'next' on 2012-11-21 at 151288f)
529
+ + test-wildmatch: avoid Windows path mangling
530
(merged to 'next' on 2012-10-25 at 510e8df)
531
+ Support "**" wildcard in .gitignore and .gitattributes
532
+ wildmatch: make /**/ match zero or more directories
@@ -491,26 +565,6 @@ repositories listed at
565
Will merge to 'master' in the seventh batch.
566
567
494
-* jk/config-ignore-duplicates (2012-10-29) 9 commits
495
- (merged to 'next' on 2012-10-29 at 67fa0a2)
496
- + builtin/config.c: Fix a sparse warning
497
- (merged to 'next' on 2012-10-25 at 233df08)
498
- + git-config: use git_config_with_options
499
- + git-config: do not complain about duplicate entries
500
- + git-config: collect values instead of immediately printing
501
- + git-config: fix regexp memory leaks on error conditions
502
- + git-config: remove memory leak of key regexp
503
- + t1300: test "git config --get-all" more thoroughly
504
- + t1300: remove redundant test
505
- + t1300: style updates
506
-
507
- Drop duplicate detection from git-config; this lets it
508
- better match the internal config callbacks, which clears up
509
- some corner cases with includes.
510
-
511
- Will merge to 'master' in the sixth batch.
512
-
513
-
568
* fc/completion-test-simplification (2012-11-16) 6 commits
569
- completion: simplify __gitcomp() test helper
570
- completion: refactor __gitcomp related tests
@@ -531,8 +585,7 @@ repositories listed at
585
586
Use textconv filters when searching with "log -S".
587
534
- It probably should lose "are the textconv on the two sides the
535
- same?" check.
588
+ Will merge to 'next'.
589
590
591
* fc/remote-bzr (2012-11-08) 5 commits
@@ -576,28 +629,6 @@ repositories listed at
629
Will merge to 'master' in the seventh batch.
630
631
579
-* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
580
- (merged to 'next' on 2012-11-09 at af69926)
581
- + remote-curl: retry failed requests for auth even with gzip
582
- + remote-curl: hoist gzip buffer size to top of post_rpc
583
-
584
- Fixes fetch from servers that ask for auth only during the actual
585
- packing phase. This is not really a recommended configuration, but it
586
- cleans up the code at the same time.
587
-
588
- Will merge to 'master' in the sixth batch.
589
-
590
-
591
-* kb/preload-index-more (2012-11-02) 1 commit
592
- (merged to 'next' on 2012-11-09 at a750ebd)
593
- + update-index/diff-index: use core.preloadindex to improve performance
594
-
595
- Use preloadindex in more places, which has a nice speedup on systems
596
- with slow stat calls (and even on Linux).
597
-
598
- Will merge to 'master' in the sixth batch.
599
-
600
-
632
* cr/push-force-tag-update (2012-11-19) 5 commits
633
- push: update remote tags only with force
634
- push: flag updates that require force
@@ -608,61 +639,6 @@ repositories listed at
639
Require "-f" for push to update a tag, even if it is a fast-forward.
640
641
611
-* fc/fast-export-fixes (2012-11-08) 14 commits
612
- - fast-export: don't handle uninteresting refs
613
- - fast-export: make sure updated refs get updated
614
- - fast-export: fix comparison in tests
615
- - fast-export: trivial cleanup
616
- - remote-testgit: make clear the 'done' feature
617
- - remote-testgit: report success after an import
618
- - remote-testgit: exercise more features
619
- - remote-testgit: cleanup tests
620
- - remote-testgit: remove irrelevant test
621
- - remote-testgit: get rid of non-local functionality
622
- - Add new simplified git-remote-testgit
623
- - Rename git-remote-testgit to git-remote-testpy
624
- - remote-testgit: fix direction of marks
625
- - fast-export: avoid importing blob marks
626
-
627
- Improvements to fix fast-export bugs, including how refs pointing to
628
- already-seen commits are handled. An earlier 4-commit version of this
629
- series looked good to me, but this much-expanded version has not seen
630
- any comments.
631
-
632
- Looks like it has been re-rolled, but I haven't checked it out yet.
633
-
634
- Needs review.
635
-
636
-
637
-* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
638
- (merged to 'next' on 2012-11-13 at 2bf41d9)
639
- + link_alt_odb_entries(): take (char *, len) rather than two pointers
640
- + link_alt_odb_entries(): use string_list_split_in_place()
641
-
642
- Cleanups in the alternates code. Fixes a potential bug and makes the
643
- code much cleaner.
644
-
645
- Will merge to 'master' in the sixth batch.
646
-
647
-
648
-* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit
649
- (merged to 'next' on 2012-11-13 at e90cc7c)
650
- + git p4: RCS expansion should not span newlines
651
-
652
- I do not have p4 to play with, but looks obviously correct to me.
653
-
654
- Will merge to 'master' in the sixth batch.
655
-
656
-
657
-* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
658
- (merged to 'next' on 2012-11-13 at c57d856)
659
- + gitweb.perl: fix %highlight_ext mappings
660
-
661
- Fixes a clever misuse of perl's list interpretation.
662
-
663
- Will merge to 'master' in the sixth batch.
664
-
665
-
642
* rr/submodule-diff-config (2012-11-18) 4 commits
643
(merged to 'next' on 2012-11-19 at 355319e)
644
+ submodule: display summary header in bold