What's cooking (2011/06 #02)
Junio C Hamano committed
Jun 11, 2011 at 23:46 UTC
d885a82c4ae8323c7f77fe02b24cb604b4f23cb8
1 file changed
+161
-109
whats-cooking.txt
+161
-109
@@ -1,70 +1,90 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2011, #01; Sun, 5)
3
-X-master-at: a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2
4
-X-next-at: 697f9d23c6a32d612282fa77d5a526ad9a9ae192
2
+Subject: What's cooking in git.git (Jun 2011, #02; Sat, 11)
3
+X-master-at: 2c162b56f370f5c33e6a945e6922d598006c5ec4
4
+X-next-at: 195f74cadbc9ad92fd15cd612a02206a4353fa30
5
6
-What's cooking in git.git (Jun 2011, #01; Sun, 5)
6
+What's cooking in git.git (Jun 2011, #02; Sat, 11)
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
-We will be in the feature freeze, and 1.7.6-rc1 will be tagged in a few
13
-days. Unless it is a very obviously correct fix to trivial bug (either
14
-code or documentation), nothing other than regression fixes will graduate
15
-to "master".
16
-
17
-Subsystem people are asked to kindly give pull requests to me.
12
+Will tag 1.7.6-rc2 sometime next week.
13
14
--------------------------------------------------
15
[New Topics]
16
22
-* js/ref-namespaces (2011-06-05) 4 commits
23
- - ref namespaces: documentation
24
- - ref namespaces: support remote repositories via upload-pack and receive-pack
25
- - ref namespaces: infrastructure
26
- - Fix prefix handling in ref iteration functions
27
-
28
-Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
29
-Not urgent. Will not merge before 1.7.6.
30
-
31
-* db/http-cookies (2011-06-03) 1 commit
32
- - http: pass http.cookiefile using CURLOPT_COOKIEFILE
33
-
34
-Fairly trivial enhancement.
35
-Not urgent. Will not merge before 1.7.6.
36
-
37
-* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
38
- - checkout -b <name>: correctly detect existing branch
39
-
40
-Fairly trivial bugfix.
41
-Not urgent. Will not merge before 1.7.6.
42
-
43
-* jk/clone-detached (2011-06-05) 4 commits
44
- - remote-testgit: short-term fix to allow t5800 pass
45
- - clone: always fetch remote HEAD
46
- - consider only branches in guess_remote_head
47
- - t: add tests for cloning remotes with detached HEAD
17
+* js/i18n-windows (2011-06-06) 3 commits
18
+ (merged to 'next' on 2011-06-06 at d8c4ba3)
19
+ + Windows: teach getenv to do a case-sensitive search
20
+ + mingw.c: move definition of mingw_getenv down
21
+ + sh-i18n--envsubst: do not crash when no arguments are given
22
49
-Somewhat involved bugfix.
23
+Looked sane but will wait for msysgit folks to take a look.
24
Not urgent. Will not merge before 1.7.6.
25
52
-* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
53
- (merged to 'next' on 2011-06-02 at 8626cc6)
54
- + git status --ignored: tests and docs
55
- + status: fix bug with missing --ignore files
26
+* an/shallow-doc (2011-06-08) 2 commits
27
+ - Document the underlying protocol used by shallow repositories and --depth commands.
28
+ - Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
29
+
30
+Waiting for a review, but looked sensible.
31
+
32
+* jc/legacy-loose-object (2011-06-08) 1 commit
33
+ - sha1_file.c: "legacy" is really the current format
34
+
35
+* jc/zlib-wrap (2011-06-10) 7 commits
36
+ - zlib: allow feeding more than 4GB in one go
37
+ - zlib: zlib can only process 4GB at a time
38
+ - zlib: wrap deflateBound() too
39
+ - zlib: wrap deflate side of the API
40
+ - zlib: wrap inflateInit2 used to accept only for gzip format
41
+ - zlib: wrap remaining calls to direct inflate/inflateEnd
42
+ - zlib wrapper: refactor error message formatter
43
+
44
+This replaces the earlier attempt to deal with the mismatch between our
45
+expectation and what zlib API actually offers piecemeal.
46
+
47
+* jk/clone-cmdline-config (2011-06-11) 10 commits
48
+ - clone: accept config options on the command line
49
+ - config: make git_config_parse_parameter a public function
50
+ - remote: use new OPT_STRING_LIST
51
+ - parse-options: add OPT_STRING_LIST helper
52
+ - config: use strbuf_split_str instead of a temporary strbuf
53
+ - strbuf: allow strbuf_split to work on non-strbufs
54
+ - config: avoid segfault when parsing command-line config
55
+ - config: die on error in command-line config
56
+ - fix "git -c" parsing of values with equals signs
57
+ - strbuf_split: add a max parameter
58
+
59
+* jk/tag-contains-ab (2011-06-11) 4 commits
60
+ - Why is "git tag --contains" so slow?
61
+ - default core.clockskew variable to one day
62
+ - limit "contains" traversals based on commit timestamp
63
+ - tag: speed up --contains calculation
64
57
-Fairly trivial bugfix.
58
-Not urgent. Will not merge before 1.7.6.
65
+* jk/transport-helper-fix (2011-06-07) 8 commits
66
+ - git_remote_helpers: push all refs during a non-local export
67
+ - transport-helper: don't feed bogus refs to export push
68
+ - teach remote-testgit to import multiple refs
69
+ - teach remote-testgit to import non-HEAD refs
70
+ - t5800: document some non-functional parts of remote helpers
71
+ - t5800: factor out some ref tests
72
+ - git-remote-testgit: exit gracefully after push
73
+ - transport-helper: fix minor leak in push_refs_with_export
74
60
-* jl/submodule-add-relurl-wo-upstream (2011-06-05) 1 commit
61
- - submodule add: improve message when resolving a relative url fails
75
+--------------------------------------------------
76
+[Graduated to "master"]
77
63
-This is just a message change without loosening a seemingly overtight
64
-restriction in the code. It might turn out to be a good idea to loosen
65
-the check.
78
+* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
79
+ (merged to 'next' on 2011-06-01 at 4f44a91)
80
+ + builtin/commit.c: set status_format _after_ option parsing
81
+ + t7508: demonstrate status's failure to use --porcelain format with -z
82
67
-Not urgent. Will not merge before 1.7.6.
83
+* jk/diff-not-so-quick (2011-05-31) 2 commits
84
+ (merged to 'next' on 2011-06-01 at 5f66784)
85
+ + diff: futureproof "stop feeding the backend early" logic
86
+ + diff_tree: disable QUICK optimization with diff filter
87
+ (this branch is used by jc/diff-index-quick-exit-early.)
88
89
* jn/gitweb-docs (2011-06-03) 3 commits
90
(merged to 'next' on 2011-06-05 at 691c7e6)
@@ -73,32 +93,29 @@ Not urgent. Will not merge before 1.7.6.
93
+ gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
94
+ gitweb: Move information about installation from README to INSTALL
95
76
-Should be safe.
77
-Will merge to "master" before 1.7.6-rc1.
78
-
96
* jn/mime-type-with-params (2011-06-05) 1 commit
97
(merged to 'next' on 2011-06-05 at 697f9d2)
98
+ gitweb: Fix usability of $prevent_xss
99
83
-Will merge to "master" before 1.7.6-rc1.
100
+--------------------------------------------------
101
+[Stalled]
102
85
-* rs/grep-color (2011-06-05) 3 commits
86
- - grep: add --heading
87
- - grep: add --break
88
- - grep: fix coloring of hunk marks between files
103
+* js/ref-namespaces (2011-06-07) 4 commits
104
+ . ref namespaces: documentation
105
+ . ref namespaces: support remote repositories via upload-pack and receive-pack
106
+ . ref namespaces: infrastructure
107
+ . Fix prefix handling in ref iteration functions
108
90
-Fairly straightforward feature enhancement.
109
+Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
110
Not urgent. Will not merge before 1.7.6.
111
93
---------------------------------------------------
94
-[Stalled]
95
-
112
* jk/maint-merge-rename-create (2011-03-25) 3 commits
113
- merge: turn on rewrite detection
114
- merge: handle renames with replacement content
115
- t3030: fix accidental success in symlink rename
116
101
-Peff wanted to reroll this.
117
+Peff wanted to reroll this. Perhaps will discard to make room for Elijah's
118
+merge-recursive series in the meantime.
119
120
* jc/index-pack (2011-06-05) 9 commits
121
- verify-pack: use index-pack --verify
@@ -131,59 +148,74 @@ Not urgent. Will not merge before 1.7.6.
148
Would need another round to separate per-pack and per-session limits.
149
Not urgent. Will not merge before 1.7.6.
150
134
-* jk/tag-contains (2010-07-05) 4 commits
135
- - Why is "git tag --contains" so slow?
136
- - default core.clockskew variable to one day
137
- - limit "contains" traversals based on commit timestamp
138
- - tag: speed up --contains calculation
139
-
140
-The idea of the bottom one is probably Ok, except that the use of object
141
-flags needs to be rethought, or at least the helper needs to be moved to
142
-builtin/tag.c to make it clear that it should not be used outside the
143
-current usage context.
144
-
151
--------------------------------------------------
152
[Cooking]
153
148
-* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
149
- (merged to 'next' on 2011-06-01 at 79d868a)
150
- + diff-index --quiet: learn the "stop feeding the backend early" logic
151
- + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
152
- (this branch uses jk/diff-not-so-quick.)
154
+* db/http-cookies (2011-06-03) 1 commit
155
+ (merged to 'next' on 2011-06-06 at 90d736a)
156
+ + http: pass http.cookiefile using CURLOPT_COOKIEFILE
157
158
+Fairly trivial enhancement.
159
Not urgent. Will not merge before 1.7.6.
160
156
-* jk/diff-not-so-quick (2011-05-31) 2 commits
157
- (merged to 'next' on 2011-06-01 at 5f66784)
158
- + diff: futureproof "stop feeding the backend early" logic
159
- + diff_tree: disable QUICK optimization with diff filter
160
- (this branch is used by jc/diff-index-quick-exit-early.)
161
+* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
162
+ (merged to 'next' on 2011-06-06 at 6a59bb7)
163
+ + checkout -b <name>: correctly detect existing branch
164
162
-Will merge to "master" before 1.7.6-rc1.
165
+Fairly trivial bugfix.
166
+Not urgent. Will not merge before 1.7.6.
167
164
-* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
165
- (merged to 'next' on 2011-06-01 at 4f44a91)
166
- + builtin/commit.c: set status_format _after_ option parsing
167
- + t7508: demonstrate status's failure to use --porcelain format with -z
168
+* jk/clone-detached (2011-06-07) 5 commits
169
+ . remote-testgit: short-term fix to allow t5800 pass
170
+ - clone: always fetch remote HEAD
171
+ - make copy_ref globally available
172
+ - consider only branches in guess_remote_head
173
+ - t: add tests for cloning remotes with detached HEAD
174
169
-Will merge to "master" before 1.7.6-rc1.
175
+Somewhat involved bugfix.
176
+Not urgent. Will not merge before 1.7.6.
177
171
-* ef/maint-win-verify-path (2011-05-27) 3 commits
178
+* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
179
+ (merged to 'next' on 2011-06-02 at 8626cc6)
180
+ + git status --ignored: tests and docs
181
+ + status: fix bug with missing --ignore files
182
+
183
+Fairly trivial bugfix.
184
+Not urgent. Will not merge before 1.7.6.
185
+
186
+* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
187
+ - submodule add: clean up duplicated code
188
+ - submodule add: allow relative repository path even when no url is set
189
+ - submodule add: test failure when url is not configured in superproject
190
+
191
+Not urgent. Will not merge before 1.7.6.
192
+
193
+* rs/grep-color (2011-06-05) 3 commits
194
+ (merged to 'next' on 2011-06-06 at fd6bae1)
195
+ + grep: add --heading
196
+ + grep: add --break
197
+ + grep: fix coloring of hunk marks between files
198
+
199
+Fairly straightforward feature enhancement.
200
+Not urgent. Will not merge before 1.7.6.
201
+
202
+* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
203
+ (merged to 'next' on 2011-06-01 at 79d868a)
204
+ + diff-index --quiet: learn the "stop feeding the backend early" logic
205
+ + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
206
+
207
+Not urgent. Will not merge before 1.7.6.
208
+
209
+* ef/maint-win-verify-path (2011-06-08) 5 commits
210
+ - verify_dotfile(): do not assume '/' is the path seperator
211
+ (merged to 'next' on 2011-06-07 at b418e05)
212
+ + verify_path(): simplify check at the directory boundary
213
(merged to 'next' on 2011-06-01 at f316f68)
214
+ verify_path: consider dos drive prefix
215
+ real_path: do not assume '/' is the path seperator
216
+ A Windows path starting with a backslash is absolute
217
177
-Will cook a bit longer.
178
-
179
-* jc/apply-nsbp (2011-05-27) 4 commits
180
- - War on nbsp: teach "git apply" to check and fix nbsp
181
- - War on nbsp: Add "nbsp" whitespace breakage class
182
- - War on nbsp: a bit of retreat
183
- - ws.c: add a helper to format comma separated messages
184
-
185
-Will probably drop.
186
-It was fun to write, though.
218
+Not urgent, but is sane. Will not merge before 1.7.6.
219
220
* jn/gitweb-js-blame (2011-05-27) 3 commits
221
(merged to 'next' on 2011-06-01 at a984a1b)
@@ -213,19 +245,19 @@ Not urgent. Will not merge before 1.7.6.
245
Not urgent. Will not merge before 1.7.6.
246
247
* jc/streaming-filter (2011-05-26) 8 commits
216
- - t0021: test application of both crlf and ident
217
- - t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
218
- - streaming: filter cascading
219
- - streaming filter: ident filter
220
- - Add LF-to-CRLF streaming conversion
221
- - stream filter: add "no more input" to the filters
222
- - Add streaming filter API
223
- - convert.h: move declarations for conversion from cache.h
248
+ (merged to 'next' on 2011-06-06 at 8ed6b3d)
249
+ + t0021: test application of both crlf and ident
250
+ + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
251
+ + streaming: filter cascading
252
+ + streaming filter: ident filter
253
+ + Add LF-to-CRLF streaming conversion
254
+ + stream filter: add "no more input" to the filters
255
+ + Add streaming filter API
256
+ + convert.h: move declarations for conversion from cache.h
257
(this branch uses jc/streaming.)
258
259
Trivial lf-to-crlf and ident conversions can be performed without reading
260
everything in-core first.
228
-
261
Not urgent. Will not merge before 1.7.6.
262
263
* jk/combine-diff-binary-etc (2011-05-24) 5 commits
@@ -318,3 +350,23 @@ Not urgent. Will not merge before 1.7.6.
350
351
Rerolled.
352
Will cook a bit longer.
353
+
354
+--------------------------------------------------
355
+[Discarded]
356
+
357
+* jc/apply-nsbp (2011-05-27) 4 commits
358
+ . War on nbsp: teach "git apply" to check and fix nbsp
359
+ . War on nbsp: Add "nbsp" whitespace breakage class
360
+ . War on nbsp: a bit of retreat
361
+ . ws.c: add a helper to format comma separated messages
362
+
363
+It was fun to write, though.
364
+
365
+* jk/tag-contains (2010-07-05) 4 commits
366
+ . Why is "git tag --contains" so slow?
367
+ . default core.clockskew variable to one day
368
+ . limit "contains" traversals based on commit timestamp
369
+ . tag: speed up --contains calculation
370
+
371
+This was re-rolled as jk/tag-contans-ab with help from Ævar.
372
+