What's cooking (2011/01 #03)
Junio C Hamano committed
Jan 12, 2011 at 21:50 UTC
2692c359c5a067e3cb236a7df8817ff72da38fdd
1 file changed
+105
-89
whats-cooking.txt
+105
-89
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2011, #02; Fri, 7)
3
-X-master-at: e17aa8a9dca972ca278dd91a097873101066e964
4
-X-next-at: 600460d4cecafb34f969eb58852adfcb96bc9732
2
+Subject: What's cooking in git.git (Jan 2011, #03; Wed, 12)
3
+X-master-at: d2f15e29a6161b40dbc0142eb59f82092268e1d6
4
+X-next-at: b7420fc6b7d092b9cf75d0f348d4ea29ccad866a
5
6
-What's cooking in git.git (Jan 2011, #02; Fri, 7)
6
+What's cooking in git.git (Jan 2011, #03; Wed, 12)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -16,21 +16,85 @@ rc period this cycle. Please remind if there are patches that ought to be
16
in 1.7.4 but are forgotten.
17
18
--------------------------------------------------
19
-[Graduated to "master"]
19
+[New Topics]
20
+
21
+* jk/diff-driver-binary-doc (2011-01-09) 1 commit
22
+ (merged to 'next' on 2011-01-10 at 1aa4c70)
23
+ + docs: explain diff.*.binary option
24
+
25
+* jn/t9010-work-around-broken-svnadmin (2011-01-06) 1 commit
26
+ (merged to 'next' on 2011-01-10 at bd2f619)
27
+ + t9010: svnadmin can fail even if available
28
+
29
+* tr/submodule-relative-scp-url (2011-01-10) 1 commit
30
+ (merged to 'next' on 2011-01-10 at 895f887)
31
+ + submodule: fix relative url parsing for scp-style origin
32
21
-* ao/t9001-fix (2011-01-04) 1 commit
22
- + t/t9001-send-email.sh: fix '&&' chain in some tests
33
+The above three should all be 1.7.4 material.
34
24
-* mg/cvsimport (2010-12-29) 2 commits
25
- + cvsimport: handle the parsing of uppercase config options
26
- + cvsimport: partial whitespace cleanup
35
+* js/test-windows (2011-01-11) 2 commits
36
+ (merged to 'next' on 2011-01-11 at c8274ed)
37
+ + t/README: hint about using $(pwd) rather than $PWD in tests
38
+ + Fix expected values of setup tests on Windows
39
28
-* pw/convert-pathname-substitution (2010-12-22) 2 commits
29
- + t0021: avoid getting filter killed with SIGPIPE
30
- + convert filter: supply path to external driver
40
+* ab/p4 (2011-01-11) 1 commit
41
+ - git-p4: correct indenting and formatting
42
+
43
+* as/userdiff-pascal (2011-01-11) 1 commit
44
+ - userdiff: match Pascal class methods
45
46
--------------------------------------------------
33
-[New Topics]
47
+[Stalled]
48
+
49
+* nd/index-doc (2010-09-06) 1 commit
50
+ - doc: technical details about the index file format
51
+
52
+Half-written but it is a good start. I may need to give some help in
53
+describing more recent index extensions.
54
+
55
+* cb/ignored-paths-are-precious (2010-08-21) 1 commit
56
+ - checkout/merge: optionally fail operation when ignored files need to be overwritten
57
+
58
+This needs tests; also we know of longstanding bugs in related area that
59
+needs to be addressed---they do not have to be part of this series but
60
+their reproduction recipe would belong to the test script for this topic.
61
+
62
+It would hurt users to make the new feature on by default, especially the
63
+ones with subdirectories that come and go.
64
+
65
+* jk/tag-contains (2010-07-05) 4 commits
66
+ - Why is "git tag --contains" so slow?
67
+ - default core.clockskew variable to one day
68
+ - limit "contains" traversals based on commit timestamp
69
+ - tag: speed up --contains calculation
70
+
71
+The idea of the bottom one is probably Ok, except that the use of object
72
+flags needs to be rethought, or at least the helper needs to be moved to
73
+builtin/tag.c to make it clear that it should not be used outside the
74
+current usage context.
75
+
76
+* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
77
+ - diffcore-rename: fall back to -C when -C -C busts the rename limit
78
+ - diffcore-rename: record filepair for rename src
79
+ - diffcore-rename: refactor "too many candidates" logic
80
+
81
+* jc/rerere-remaining (2011-01-06) 1 commit
82
+ - rerere "remaining"
83
+
84
+Just a handful of weatherballoon patches without proper tests, in response
85
+to feature/minor fix requests.
86
+
87
+--------------------------------------------------
88
+[Cooking]
89
+
90
+* rj/test-fixes (2010-12-14) 4 commits
91
+ (merged to 'next' on 2011-01-08 at 37ef456)
92
+ + t4135-*.sh: Skip the "backslash" tests on cygwin
93
+ + t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
94
+ + t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
95
+ + t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
96
+
97
+Will merge to 'master' soonish.
98
99
* rj/svn-test (2010-12-30) 1 commit
100
(merged to 'next' on 2011-01-05 at ff38429)
@@ -89,60 +153,9 @@ series sometime soon, but we are not in a hurry.
153
(merged to 'next' on 2011-01-06 at 1fbd4a0)
154
+ alias: use run_command api to execute aliases
155
92
-* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
93
- - diffcore-rename: fall back to -C when -C -C busts the rename limit
94
- - diffcore-rename: record filepair for rename src
95
- - diffcore-rename: refactor "too many candidates" logic
96
-
97
-* jc/rerere-remaining (2011-01-06) 1 commit
98
- - rerere "remaining"
99
-
100
-* uk/checkout-ambiguous-ref (2011-01-07) 3 commits
101
- - checkout $branch: really favor branch over tag
102
- - checkout $branch: favor branch over tag
103
- - bug? in checkout with ambiguous refnames
104
-
105
---------------------------------------------------
106
-[Stalled]
107
-
108
-* nd/index-doc (2010-09-06) 1 commit
109
- - doc: technical details about the index file format
110
-
111
-Half-written but it is a good start. I may need to give some help in
112
-describing more recent index extensions.
113
-
114
-* cb/ignored-paths-are-precious (2010-08-21) 1 commit
115
- - checkout/merge: optionally fail operation when ignored files need to be overwritten
116
-
117
-This needs tests; also we know of longstanding bugs in related area that
118
-needs to be addressed---they do not have to be part of this series but
119
-their reproduction recipe would belong to the test script for this topic.
120
-
121
-It would hurt users to make the new feature on by default, especially the
122
-ones with subdirectories that come and go.
123
-
124
-* jk/tag-contains (2010-07-05) 4 commits
125
- - Why is "git tag --contains" so slow?
126
- - default core.clockskew variable to one day
127
- - limit "contains" traversals based on commit timestamp
128
- - tag: speed up --contains calculation
129
-
130
-The idea of the bottom one is probably Ok, except that the use of object
131
-flags needs to be rethought, or at least the helper needs to be moved to
132
-builtin/tag.c to make it clear that it should not be used outside the
133
-current usage context.
134
-
135
-* rj/test-fixes (2010-12-14) 4 commits
136
- . t4135-*.sh: Skip the "backslash" tests on cygwin
137
- . t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
138
- . t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
139
- . t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
140
-
141
-I don't think people on different vintage of Cygwin agreed they are good
142
-workarounds---please correct me if I am mistaken.
143
-
144
---------------------------------------------------
145
-[Cooking]
156
+* uk/checkout-ambiguous-ref (2011-01-11) 1 commit
157
+ (merged to 'next' on 2011-01-11 at 2aa30de)
158
+ + checkout: fix bug with ambiguous refs
159
160
* jn/gitweb-no-logo (2010-09-03) 1 commit
161
(merged to 'next' on 2011-01-04 at a5d186c)
@@ -193,27 +206,6 @@ safer and saner.
206
207
Will be rerolled (Heiko, 2010-12-23)
208
196
-* jn/svn-fe (2010-12-06) 17 commits
197
- - vcs-svn: Allow change nodes for root of tree (/)
198
- - vcs-svn: Implement Prop-delta handling
199
- - vcs-svn: Sharpen parsing of property lines
200
- - vcs-svn: Split off function for handling of individual properties
201
- - vcs-svn: Make source easier to read on small screens
202
- - vcs-svn: More dump format sanity checks
203
- - vcs-svn: Reject path nodes without Node-action
204
- - vcs-svn: Delay read of per-path properties
205
- - vcs-svn: Combine repo_replace and repo_modify functions
206
- - vcs-svn: Replace = Delete + Add
207
- - vcs-svn: handle_node: Handle deletion case early
208
- - vcs-svn: Use mark to indicate nodes with included text
209
- - vcs-svn: Unclutter handle_node by introducing have_props var
210
- - vcs-svn: Eliminate node_ctx.mark global
211
- - vcs-svn: Eliminate node_ctx.srcRev global
212
- - vcs-svn: Check for errors from open()
213
- - vcs-svn: Allow simple v3 dumps (no deltas yet)
214
-
215
-Some RFC patches, to give them early and wider exposure.
216
-
209
* nd/struct-pathspec (2010-12-15) 21 commits
210
- t7810: overlapping pathspecs and depth limit
211
- grep: drop pathspec_matches() in favor of tree_entry_interesting()
@@ -417,3 +409,27 @@ It is getting ridiculously painful to keep re-resolving the conflicts with
409
other topics in flight, even with the help with rerere.
410
411
Needs a bit more minor work to get the basic code structure right.
412
+
413
+--------------------------------------------------
414
+[Ejected]
415
+
416
+* jn/svn-fe (2010-12-06) 17 commits
417
+ . vcs-svn: Allow change nodes for root of tree (/)
418
+ . vcs-svn: Implement Prop-delta handling
419
+ . vcs-svn: Sharpen parsing of property lines
420
+ . vcs-svn: Split off function for handling of individual properties
421
+ . vcs-svn: Make source easier to read on small screens
422
+ . vcs-svn: More dump format sanity checks
423
+ . vcs-svn: Reject path nodes without Node-action
424
+ . vcs-svn: Delay read of per-path properties
425
+ . vcs-svn: Combine repo_replace and repo_modify functions
426
+ . vcs-svn: Replace = Delete + Add
427
+ . vcs-svn: handle_node: Handle deletion case early
428
+ . vcs-svn: Use mark to indicate nodes with included text
429
+ . vcs-svn: Unclutter handle_node by introducing have_props var
430
+ . vcs-svn: Eliminate node_ctx.mark global
431
+ . vcs-svn: Eliminate node_ctx.srcRev global
432
+ . vcs-svn: Check for errors from open()
433
+ . vcs-svn: Allow simple v3 dumps (no deltas yet)
434
+
435
+Some RFC patches, to give them early and wider exposure. Ejected for now.