What's cooking (2011/01 #02)
Junio C Hamano committed
Jan 7, 2011 at 15:53 UTC
02516f289e59d0c8f17da1ca3b6882bc214c338f
1 file changed
+115
-39
whats-cooking.txt
+115
-39
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2011, #01; Tue, 4)
3
-X-master-at: f2665ec9fa42b75d92d0301cff85362836c5729a
4
-X-next-at: a5d186c925798fa5bd9318fd00f282ad564b1138
2
+Subject: What's cooking in git.git (Jan 2011, #02; Fri, 7)
3
+X-master-at: e17aa8a9dca972ca278dd91a097873101066e964
4
+X-next-at: 600460d4cecafb34f969eb58852adfcb96bc9732
5
6
-What's cooking in git.git (Jan 2011, #01; Tue, 4)
6
+What's cooking in git.git (Jan 2011, #02; Fri, 7)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -16,18 +16,91 @@ 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
-[New Topics]
19
+[Graduated to "master"]
20
21
-* jn/gitweb-no-logo (2010-09-03) 1 commit
22
- (merged to 'next' on 2011-01-04 at a5d186c)
23
- + gitweb: make logo optional
21
+* ao/t9001-fix (2011-01-04) 1 commit
22
+ + t/t9001-send-email.sh: fix '&&' chain in some tests
23
25
-Seemed trivial but came a bit too late for the cycle.
24
+* mg/cvsimport (2010-12-29) 2 commits
25
+ + cvsimport: handle the parsing of uppercase config options
26
+ + cvsimport: partial whitespace cleanup
27
27
-* cb/setup (2010-12-27) 1 commit
28
- - setup: translate symlinks in filename when using absolute paths
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
31
30
-Seemed trivial but came a bit too late for the cycle.
32
+--------------------------------------------------
33
+[New Topics]
34
+
35
+* rj/svn-test (2010-12-30) 1 commit
36
+ (merged to 'next' on 2011-01-05 at ff38429)
37
+ + lib-git-svn.sh: Move web-server handling code into separate function
38
+
39
+Looked low-impact and trivial. Might merge to 'master' sometime before
40
+1.7.4, but we are in no hurry.
41
+
42
+* sr/gitweb-hilite-more (2010-12-30) 2 commits
43
+ (merged to 'next' on 2011-01-05 at 6b52e7e)
44
+ + gitweb: remove unnecessary test when closing file descriptor
45
+ + gitweb: add extensions to highlight feature map
46
+
47
+Looked low-impact and trivial. Might merge to 'master' sometime before
48
+1.7.4, especially highlighting itself is a new feature.
49
+
50
+* mz/rebase (2010-12-28) 31 commits
51
+ - rebase -i: remove unnecessary state rebase-root
52
+ - rebase -i: don't read unused variable preserve_merges
53
+ - git-rebase--am: remove unnecessary --3way option
54
+ - rebase -m: don't print exit code 2 when merge fails
55
+ - rebase -m: remember allow_rerere_autoupdate option
56
+ - rebase: remember strategy and strategy options
57
+ - rebase: remember verbose option
58
+ - rebase: extract code for writing basic state
59
+ - rebase: factor out sub command handling
60
+ - rebase: make -v a tiny bit more verbose
61
+ - rebase -i: align variable names
62
+ - rebase: show consistent conflict resolution hint
63
+ - rebase: extract am code to new source file
64
+ - rebase: extract merge code to new source file
65
+ - rebase: remove $branch as synonym for $orig_head
66
+ - rebase -i: support --stat
67
+ - rebase: factor out call to pre-rebase hook
68
+ - rebase: factor out clean work tree check
69
+ - rebase: factor out reference parsing
70
+ - rebase: reorder validation steps
71
+ - rebase -i: remove now unnecessary directory checks
72
+ - rebase: factor out command line option processing
73
+ - rebase: align variable content
74
+ - rebase: align variable names
75
+ - rebase: stricter check of standalone sub command
76
+ - rebase: act on command line outside parsing loop
77
+ - rebase: improve detection of rebase in progress
78
+ - rebase: remove unused rebase state 'prev_head'
79
+ - rebase: read state outside loop
80
+ - rebase: refactor reading of state
81
+ - rebase: clearer names for directory variables
82
+
83
+I personally haven't finished reading this one yet; Thomas said the
84
+general direction of the series basically seemed sound (with nits here
85
+and there), which I trust. Hopefully we will see a re-roll of this
86
+series sometime soon, but we are not in a hurry.
87
+
88
+* ef/alias-via-run-command (2011-01-07) 1 commit
89
+ (merged to 'next' on 2011-01-06 at 1fbd4a0)
90
+ + alias: use run_command api to execute aliases
91
+
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]
@@ -59,44 +132,49 @@ 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]
146
65
-* mg/cvsimport (2010-12-29) 2 commits
66
- - cvsimport: handle the parsing of uppercase config options
67
- - cvsimport: partial whitespace cleanup
147
+* jn/gitweb-no-logo (2010-09-03) 1 commit
148
+ (merged to 'next' on 2011-01-04 at a5d186c)
149
+ + gitweb: make logo optional
150
+
151
+Seems trivial but came a bit too late for the cycle.
152
+
153
+* cb/setup (2010-12-27) 1 commit
154
+ (merged to 'next' on 2011-01-05 at 790b288)
155
+ + setup: translate symlinks in filename when using absolute paths
156
69
-Reviewed twice in the past and seemed sane. Will merge to 'next' and then
70
-to 'master' before -rc1.
157
+Seems trivial but came a bit too late for the cycle.
158
159
* ae/better-template-failure-report (2010-12-18) 1 commit
73
- - Improve error messages when temporary file creation fails
160
+ (merged to 'next' on 2011-01-05 at d3f9142)
161
+ + Improve error messages when temporary file creation fails
162
163
* jc/unpack-trees (2010-12-22) 2 commits
164
- unpack_trees(): skip trees that are the same in all input
165
- unpack-trees.c: cosmetic fix
166
167
* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
80
- - cherry-pick/revert: add support for -X/--strategy-option
168
+ (merged to 'next' on 2011-01-05 at 3ccc590)
169
+ + cherry-pick/revert: add support for -X/--strategy-option
170
171
* jn/perl-funcname (2010-12-27) 2 commits
83
- - userdiff/perl: catch BEGIN/END/... and POD as headers
84
- - diff: funcname and word patterns for perl
172
+ (merged to 'next' on 2011-01-05 at 20542ed)
173
+ + userdiff/perl: catch BEGIN/END/... and POD as headers
174
+ + diff: funcname and word patterns for perl
175
86
-* pw/convert-pathname-substitution (2010-12-22) 2 commits
87
- - t0021: avoid getting filter killed with SIGPIPE
88
- - convert filter: supply path to external driver
89
-
90
-Trivial. Will merge to 'next' and then to 'master' before -rc1.
91
-
92
-* rj/test-fixes (2010-12-14) 4 commits
93
- - t4135-*.sh: Skip the "backslash" tests on cygwin
94
- - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
95
- - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
96
- - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
97
-
98
-I don't think people on different vintage of Cygwin agreed they are good
99
-workarounds---please correct me if I am mistaken.
176
+Looked low-impact and trivial. Might merge to 'master' sometime before
177
+1.7.4, but we are in no hurry.
178
179
* tr/maint-branch-no-track-head (2010-12-14) 1 commit
180
- branch: do not attempt to track HEAD implicitly
@@ -115,7 +193,7 @@ safer and saner.
193
194
Will be rerolled (Heiko, 2010-12-23)
195
118
-* jn/svn-fe (2010-12-06) 18 commits
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
@@ -133,10 +211,8 @@ Will be rerolled (Heiko, 2010-12-23)
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)
136
- - vcs-svn: Error out for v3 dumps
214
138
-Some RFC patches, to give them early and wider exposure. Perhaps drop
139
-these during the -rc period?
215
+Some RFC patches, to give them early and wider exposure.
216
217
* nd/struct-pathspec (2010-12-15) 21 commits
218
- t7810: overlapping pathspecs and depth limit