What's cooking (2012/11 #08)
Junio C Hamano committed
Nov 25, 2012 at 19:15 UTC
d4b03c303dd5ca90545d3448dfecbca81ba0ee00
1 file changed
+37
-179
whats-cooking.txt
+37
-179
@@ -1,160 +1,73 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2012, #07; Wed, 21)
4
-X-master-at: 2d242fb3fc19fc9ba046accdd9210be8b9913f64
5
-X-next-at: ce6fbe5b9dc5e1e8ce1499bd8f7fb982e0c68289
3
+Subject: What's cooking in git.git (Nov 2012, #08; Sun, 25)
4
+X-master-at: e8a1f5a2ae53805986b1b965e036450bdfc0c460
5
+X-next-at: 9942e54037a4342f619d609da15329417569d00b
6
7
-What's cooking in git.git (Nov 2012, #07; Wed, 21)
7
+What's cooking in git.git (Nov 2012, #08; Sun, 25)
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
-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.
14
+The tip of 'maint' has been tagged as 1.8.0.1 with many fixes since
15
+the 1.8.0 release.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
19
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
24
---------------------------------------------------
25
-[New Topics]
26
-
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
-
22
--------------------------------------------------
23
[Graduated to "master"]
24
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.
25
+* bc/do-not-recurse-in-die (2012-11-15) 1 commit
26
+ (merged to 'next' on 2012-11-18 at 79d62a8)
27
+ + usage.c: detect recursion in die routines and bail out immediately
28
29
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
30
+* jh/update-ref-d-through-symref (2012-10-21) 2 commits
31
+ (merged to 'next' on 2012-11-19 at 6bcca4c)
32
+ + Fix failure to delete a packed ref through a symref
33
+ + t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
34
119
- Make git work on newer cygwin.
35
+ "update-ref -d --deref SYM" to delete a ref through a symbolic ref
36
+ that points to it did not remove it correctly.
37
38
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
39
+* lt/diff-stat-show-0-lines (2012-10-17) 1 commit
40
+ (merged to 'next' on 2012-11-19 at 0037290)
41
+ + Fix "git diff --stat" for interesting - but empty - file changes
42
126
- I do not have p4 to play with, but looks obviously correct to me.
43
+ We failed to mention a file without any content change but whose
44
+ permission bit was modified, or (worse yet) a new file without any
45
+ content in the "git diff --stat" output.
46
47
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
48
+* mk/complete-tcsh (2012-11-16) 1 commit
49
+ (merged to 'next' on 2012-11-19 at 8309029)
50
+ + tcsh-completion re-using git-completion.bash
51
133
- Fixes a clever misuse of perl's list interpretation.
52
53
+* nd/maint-compat-fnmatch-fix (2012-11-20) 1 commit
54
+ (merged to 'next' on 2012-11-21 at ce6fbe5)
55
+ + compat/fnmatch: fix off-by-one character class's length check
56
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
57
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.
58
+* rr/submodule-diff-config (2012-11-18) 4 commits
59
+ (merged to 'next' on 2012-11-19 at 355319e)
60
+ + submodule: display summary header in bold
61
+ + diff: rename "set" variable
62
+ + diff: introduce diff.submodule configuration variable
63
+ + Documentation: move diff.wordRegex from config.txt to diff-config.txt
64
147
- Will merge to 'master' in the seventh batch.
65
+ Lets "git diff --submodule=log" become the default via configuration.
66
67
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
68
+* sg/complete-help-undup (2012-11-14) 1 commit
69
+ (merged to 'next' on 2012-11-18 at eadd0f3)
70
+ + completion: remove 'help' duplicate from porcelain commands
71
72
--------------------------------------------------
73
[Stalled]
@@ -478,44 +391,12 @@ repositories listed at
391
- pathspec: save the non-wildcard length part
392
393
481
-* sg/complete-help-undup (2012-11-14) 1 commit
482
- (merged to 'next' on 2012-11-18 at eadd0f3)
483
- + completion: remove 'help' duplicate from porcelain commands
484
-
485
- Will merge to 'master' in the seventh batch.
486
-
487
-
488
-* bc/do-not-recurse-in-die (2012-11-15) 1 commit
489
- (merged to 'next' on 2012-11-18 at 79d62a8)
490
- + usage.c: detect recursion in die routines and bail out immediately
491
-
492
- Will merge to 'master' in the seventh batch.
493
-
494
-
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
498
-
499
- Will merge to 'master' in the seventh batch.
500
-
501
-
394
* mm/status-push-pull-advise (2012-11-16) 1 commit
395
- status: add advice on how to push/pull to tracking branch
396
397
Will merge to 'next'.
398
399
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
511
-
512
- We failed to mention a file without any content change but whose
513
- permission bit was modified, or (worse yet) a new file without any
514
- content in the "git diff --stat" output.
515
-
516
- Will merge to 'master' in the seventh batch.
517
-
518
-
400
* fc/zsh-completion (2012-11-19) 2 commits
401
- completion: start moving to the new zsh completion
402
- completion: add new zsh completion
@@ -554,17 +435,6 @@ repositories listed at
435
Will cook in 'next'.
436
437
557
-* jh/update-ref-d-through-symref (2012-10-21) 2 commits
558
- (merged to 'next' on 2012-11-19 at 6bcca4c)
559
- + Fix failure to delete a packed ref through a symref
560
- + t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
561
-
562
- "update-ref -d --deref SYM" to delete a ref through a symbolic ref
563
- that points to it did not remove it correctly.
564
-
565
- Will merge to 'master' in the seventh batch.
566
-
567
-
438
* fc/completion-test-simplification (2012-11-16) 6 commits
439
- completion: simplify __gitcomp() test helper
440
- completion: refactor __gitcomp related tests
@@ -637,15 +507,3 @@ repositories listed at
507
- push: return reject reasons via a mask
508
509
Require "-f" for push to update a tag, even if it is a fast-forward.
640
-
641
-
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
645
- + diff: rename "set" variable
646
- + diff: introduce diff.submodule configuration variable
647
- + Documentation: move diff.wordRegex from config.txt to diff-config.txt
648
-
649
- Lets "git diff --submodule=log" become the default via configuration.
650
-
651
- Will merge to 'master' in the seventh batch.