What's cooking (2011/05 #12)
Junio C Hamano committed
May 26, 2011 at 09:00 UTC
aa1d99cfd5470009d75522ac06c12505e5a9613b
1 file changed
+64
-48
whats-cooking.txt
+64
-48
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #11; Tue, 24)
3
-X-master-at: 5df3e2b3ca5ebe8123927a81d682993ad597a584
4
-X-next-at: 6dbbf00d8c08050a919971f0006f4045e4fec9f1
2
+Subject: What's cooking in git.git (May 2011, #12; Thu, 26)
3
+X-master-at: 5cfe4256d98af22a570c78c5e3048391a90f5f98
4
+X-next-at: 9f46ca0aec6956294992cda67b91c2fc82a8efa6
5
6
-What's cooking in git.git (May 2011, #11; Tue, 24)
6
+What's cooking in git.git (May 2011, #12; Thu, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,28 +12,54 @@ only in 'pu' while commits prefixed with '+' are in 'next'.
12
The main part of this cycle is expected to run thru May, aiming for a
13
feature freeze in early June.
14
15
-We are at the beginning of week #5 of this cycle. Let's plan to tag -rc0
16
-with what is in 'master' at the end of the month.
15
+We are in the middle of week #5 of this cycle. Let's plan to tag -rc0 with
16
+what is in 'master' at the end of the month.
17
18
--------------------------------------------------
19
[New Topics]
20
21
-* jc/fix-config-environment-passing (2011-05-24) 1 commit
22
- - Allow built-ins to also use -c var=val via alias
21
+* jc/fmt-req-fix (2011-05-25) 1 commit
22
+ (merged to 'next' on 2011-05-25 at 9f46ca0)
23
+ + userformat_find_requirements(): find requirement for the correct format
24
+
25
+* jk/maint-config-alias-fix (2011-05-24) 4 commits
26
+ (merged to 'next' on 2011-05-25 at 25b86e4)
27
+ + handle_options(): do not miscount how many arguments were used
28
+ + config: always parse GIT_CONFIG_PARAMETERS during git_config
29
+ + git_config: don't peek at global config_parameters
30
+ + config: make environment parsing routines static
31
32
--------------------------------------------------
25
-[Stalled]
33
+[Graduated to "master"]
34
27
-* jl/read-tree-m-dry-run (2011-05-11) 1 commit
28
- - Teach read-tree the -n|--dry-run option
35
+* jc/bigfile (2011-05-13) 3 commits
36
+ (merged to 'next' on 2011-05-15 at 0ee7144)
37
+ + Bigfile: teach "git add" to send a large file straight to a pack
38
+ + index_fd(): split into two helper functions
39
+ + index_fd(): turn write_object and format_check arguments into one flag
40
+ (this branch is used by jc/streaming and jc/streaming-filter.)
41
30
-Waiting for a reroll.
42
+This covers the entry point for a big file to the system. Other parts that
43
+need to know about them are the exit point (i.e. write_entry()), packing
44
+and repacking (as long as bigfilethreshold is sane this should work),
45
+diffs and status (avoid slurping large binary in core only to do nothing,
46
+which we already should), and transport (receive-pack/fetch-pack call
47
+either unpack-objects or index-pack, which still want to hold the full
48
+object in-core and need to be fixed).
49
+
50
+* js/log-abbrev-commit-config (2011-05-18) 2 commits
51
+ (merged to 'next' on 2011-05-23 at 4e7e932)
52
+ + Add log.abbrevCommit config variable
53
+ + "git log -h": typofix misspelled 'suppress'
54
+
55
+--------------------------------------------------
56
+[Stalled]
57
58
* mg/diff-stat-count (2011-05-03) 2 commits
59
- diff-options.txt: describe --stat-{width,name-width,count}
60
- diff: introduce --stat-count to limit the stat lines
61
36
-There was a miscounting spotted. Need another round.
62
+There was a miscounting spotted. Needs another round.
63
64
* jk/maint-merge-rename-create (2011-03-25) 3 commits
65
- merge: turn on rewrite detection
@@ -66,6 +92,12 @@ current usage context.
92
--------------------------------------------------
93
[Cooking]
94
95
+* jl/read-tree-m-dry-run (2011-05-25) 2 commits
96
+ - Teach read-tree the -n|--dry-run option
97
+ - unpack-trees: add the dry_run flag to unpack_trees_options
98
+
99
+Will merge to "next".
100
+
101
* da/git-prefix-everywhere (2011-05-23) 3 commits
102
- git-mergetool--lib: Make vimdiff retain the current directory
103
- git: Remove handling for GIT_PREFIX
@@ -159,18 +191,20 @@ Will merge to "master" by the end of week #5.
191
Trivially correct and not intrusive, but the real value unknown.
192
Will merge to "master" by the end of week #5.
193
162
-* jc/streaming-filter (2011-05-21) 6 commits
194
+* jc/streaming-filter (2011-05-24) 8 commits
195
+ - t0021: test application of both crlf and ident
196
+ - t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
197
- streaming: filter cascading
198
- streaming filter: ident filter
199
- Add LF-to-CRLF streaming conversion
200
- stream filter: add "no more input" to the filters
201
- Add streaming filter API
202
- convert.h: move declarations for conversion from cache.h
169
- (this branch uses jc/bigfile, jc/streaming and jc/streaming.)
203
+ (this branch uses jc/streaming.)
204
205
Trivial lf-to-crlf and ident conversions can be performed without reading
172
-everything in-core first. Cascading is probably still broken. Will not
173
-merge before 1.7.6.
206
+everything in-core first.
207
+Not urgent. Will not merge before 1.7.6.
208
209
* jn/userdiff-perl-updates (2011-05-23) 8 commits
210
(merged to 'next' on 2011-05-23 at 2595ae1)
@@ -185,12 +219,6 @@ merge before 1.7.6.
219
220
Will merge to "master" by the end of week #5.
221
188
-* jc/git-handle-options-miscount (2011-05-24) 1 commit
189
- - handle_options(): do not miscount how many arguments were used
190
-
191
-Updated with a trivial test, which turned out to uncover an unrelated bug
192
-(see jc/fix-config-environment-passing topic).
193
-
222
* jk/combine-diff-binary-etc (2011-05-24) 5 commits
223
(merged to 'next' on 2011-05-24 at 07cf180)
224
+ combine-diff: respect textconv attributes
@@ -207,14 +235,6 @@ Will merge to "master" by the end of month.
235
Re-rolled and resurrected from "Stalled" status.
236
Will merge to "next".
237
210
-* js/log-abbrev-commit-config (2011-05-18) 2 commits
211
- (merged to 'next' on 2011-05-23 at 4e7e932)
212
- + Add log.abbrevCommit config variable
213
- + "git log -h": typofix misspelled 'suppress'
214
-
215
-Should be fine after several rounds of reviews.
216
-Will merge to "master" by the middle of week #5.
217
-
238
* jc/streaming (2011-05-20) 13 commits
239
(merged to 'next' on 2011-05-23 at 7fd0b52)
240
+ streaming: read loose objects incrementally
@@ -230,24 +250,9 @@ Will merge to "master" by the middle of week #5.
250
+ sha1_object_info_extended(): expose a bit more info
251
+ packed_object_info_detail(): do not return a string
252
+ Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
233
- (this branch is used by jc/streaming-filter and jc/streaming-filter; uses jc/bigfile.)
234
-
235
-* jc/bigfile (2011-05-13) 3 commits
236
- (merged to 'next' on 2011-05-15 at 0ee7144)
237
- + Bigfile: teach "git add" to send a large file straight to a pack
238
- + index_fd(): split into two helper functions
239
- + index_fd(): turn write_object and format_check arguments into one flag
240
- (this branch is used by jc/streaming and jc/streaming-filter.)
253
+ (this branch is used by jc/streaming-filter.)
254
242
-This covers the entry point for a big file to the system. Other parts that
243
-need to know about them are the exit point (i.e. write_entry()), packing
244
-and repacking (as long as bigfilethreshold is sane this should work),
245
-diffs and status (avoid slurping large binary in core only to do nothing,
246
-which we already should), and transport (receive-pack/fetch-pack call
247
-either unpack-objects or index-pack, which still want to hold the full
248
-object in-core and need to be fixed).
249
-
250
-Will merge to "master" by the middle of week #5.
255
+Not urgent. Will not merge before 1.7.6.
256
257
* ab/i18n-scripts (2011-05-21) 48 commits
258
(merged to 'next' on 2011-05-23 at 69164a3)
@@ -321,6 +326,9 @@ Rerolled.
326
+ contrib/completion: --line-number to git grep
327
+ Documentation: Add --line-number to git-grep synopsis
328
329
+There was a confused test around BRE caused by GNU extension people so
330
+used to use without even realizing it is GNU extension.
331
+
332
Will merge to "master" by the middle of week #5.
333
334
--------------------------------------------------
@@ -343,3 +351,11 @@ into account, not just addition", they can easily say "add -u" (update).
351
352
Updated documentation, but I do not feel a strong enough annoyance to push
353
this forward.
354
+
355
+* jc/fix-config-environment-passing (2011-05-24) 1 commit
356
+ . Allow built-ins to also use -c var=val via alias
357
+
358
+* jc/git-handle-options-miscount (2011-05-24) 1 commit
359
+ . handle_options(): do not miscount how many arguments were used
360
+
361
+These two have been discarded; jk/maint-config-alias-fix replaces them.