What's cooking (2011/01 #04)
Junio C Hamano committed
Jan 18, 2011 at 10:55 UTC
33613b8c9928bd695c91f43cfca1b20be7ba904a
1 file changed
+53
-76
whats-cooking.txt
+53
-76
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2011, #03; Wed, 12)
3
-X-master-at: d2f15e29a6161b40dbc0142eb59f82092268e1d6
4
-X-next-at: b7420fc6b7d092b9cf75d0f348d4ea29ccad866a
2
+Subject: What's cooking in git.git (Jan 2011, #04; Tue, 18)
3
+X-master-at: 60a2e3320f3030d7c1f453a8cadafad7012fd820
4
+X-next-at: f3988f86f5368178f7bfc023cb75c0f3524745ba
5
6
-What's cooking in git.git (Jan 2011, #03; Wed, 12)
6
+What's cooking in git.git (Jan 2011, #04; Tue, 18)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -18,30 +18,58 @@ in 1.7.4 but are forgotten.
18
--------------------------------------------------
19
[New Topics]
20
21
+* jn/unpack-lstat-failure-report (2011-01-12) 2 commits
22
+ - unpack-trees: handle lstat failure for existing file
23
+ - unpack-trees: handle lstat failure for existing directory
24
+
25
+* rr/fi-import-marks-if-exists (2011-01-15) 1 commit
26
+ - fast-import: Introduce --import-marks-if-exists
27
+
28
+* tr/diff-words-test (2011-01-18) 4 commits
29
+ - t4034 (diff --word-diff): add a minimum Perl drier test vector
30
+ - t4034 (diff --word-diff): style suggestions
31
+ - userdiff: simplify word-diff safeguard
32
+ - t4034: bulk verify builtin word regex sanity
33
+
34
+--------------------------------------------------
35
+[Graduated to "master"]
36
+
37
* jk/diff-driver-binary-doc (2011-01-09) 1 commit
38
(merged to 'next' on 2011-01-10 at 1aa4c70)
39
+ docs: explain diff.*.binary option
40
41
+* jn/gitweb-no-logo (2010-09-03) 1 commit
42
+ (merged to 'next' on 2011-01-04 at a5d186c)
43
+ + gitweb: make logo optional
44
+
45
+* jn/perl-funcname (2010-12-27) 2 commits
46
+ (merged to 'next' on 2011-01-05 at 20542ed)
47
+ + userdiff/perl: catch BEGIN/END/... and POD as headers
48
+ + diff: funcname and word patterns for perl
49
+
50
* jn/t9010-work-around-broken-svnadmin (2011-01-06) 1 commit
51
(merged to 'next' on 2011-01-10 at bd2f619)
52
+ t9010: svnadmin can fail even if available
53
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
-
33
-The above three should all be 1.7.4 material.
54
+* rj/svn-test (2010-12-30) 1 commit
55
+ (merged to 'next' on 2011-01-05 at ff38429)
56
+ + lib-git-svn.sh: Move web-server handling code into separate function
57
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
58
+* rj/test-fixes (2010-12-14) 4 commits
59
+ (merged to 'next' on 2011-01-08 at 37ef456)
60
+ + t4135-*.sh: Skip the "backslash" tests on cygwin
61
+ + t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
62
+ + t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
63
+ + t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
64
40
-* ab/p4 (2011-01-11) 1 commit
41
- - git-p4: correct indenting and formatting
65
+* sr/gitweb-hilite-more (2010-12-30) 2 commits
66
+ (merged to 'next' on 2011-01-05 at 6b52e7e)
67
+ + gitweb: remove unnecessary test when closing file descriptor
68
+ + gitweb: add extensions to highlight feature map
69
43
-* as/userdiff-pascal (2011-01-11) 1 commit
44
- - userdiff: match Pascal class methods
70
+* tr/submodule-relative-scp-url (2011-01-10) 1 commit
71
+ (merged to 'next' on 2011-01-10 at 895f887)
72
+ + submodule: fix relative url parsing for scp-style origin
73
74
--------------------------------------------------
75
[Stalled]
@@ -87,29 +115,16 @@ to feature/minor fix requests.
115
--------------------------------------------------
116
[Cooking]
117
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)
101
- + lib-git-svn.sh: Move web-server handling code into separate function
102
-
103
-Looked low-impact and trivial. Might merge to 'master' sometime before
104
-1.7.4, but we are in no hurry.
118
+* js/test-windows (2011-01-11) 2 commits
119
+ (merged to 'next' on 2011-01-11 at c8274ed)
120
+ + t/README: hint about using $(pwd) rather than $PWD in tests
121
+ + Fix expected values of setup tests on Windows
122
106
-* sr/gitweb-hilite-more (2010-12-30) 2 commits
107
- (merged to 'next' on 2011-01-05 at 6b52e7e)
108
- + gitweb: remove unnecessary test when closing file descriptor
109
- + gitweb: add extensions to highlight feature map
123
+* ab/p4 (2011-01-11) 1 commit
124
+ - git-p4: correct indenting and formatting
125
111
-Looked low-impact and trivial. Might merge to 'master' sometime before
112
-1.7.4, especially highlighting itself is a new feature.
126
+* as/userdiff-pascal (2011-01-11) 1 commit
127
+ - userdiff: match Pascal class methods
128
129
* mz/rebase (2010-12-28) 31 commits
130
- rebase -i: remove unnecessary state rebase-root
@@ -157,12 +172,6 @@ series sometime soon, but we are not in a hurry.
172
(merged to 'next' on 2011-01-11 at 2aa30de)
173
+ checkout: fix bug with ambiguous refs
174
160
-* jn/gitweb-no-logo (2010-09-03) 1 commit
161
- (merged to 'next' on 2011-01-04 at a5d186c)
162
- + gitweb: make logo optional
163
-
164
-Seems trivial but came a bit too late for the cycle.
165
-
175
* cb/setup (2010-12-27) 1 commit
176
(merged to 'next' on 2011-01-05 at 790b288)
177
+ setup: translate symlinks in filename when using absolute paths
@@ -181,14 +190,6 @@ Seems trivial but came a bit too late for the cycle.
190
(merged to 'next' on 2011-01-05 at 3ccc590)
191
+ cherry-pick/revert: add support for -X/--strategy-option
192
184
-* jn/perl-funcname (2010-12-27) 2 commits
185
- (merged to 'next' on 2011-01-05 at 20542ed)
186
- + userdiff/perl: catch BEGIN/END/... and POD as headers
187
- + diff: funcname and word patterns for perl
188
-
189
-Looked low-impact and trivial. Might merge to 'master' sometime before
190
-1.7.4, but we are in no hurry.
191
-
193
* tr/maint-branch-no-track-head (2010-12-14) 1 commit
194
- branch: do not attempt to track HEAD implicitly
195
@@ -409,27 +410,3 @@ It is getting ridiculously painful to keep re-resolving the conflicts with
410
other topics in flight, even with the help with rerere.
411
412
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.