d191614d66 · matheusbsbs/matheus-bagliano

@@ -1,29 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2011, #06; Sun, 30)

3 -X-master-at: 7ed863a85a6ce2c4ac4476848310b8f917ab41f9

4 -X-next-at: 705f25818b894adc974363c5f334dc99cf97c83f

2 +Subject: What's cooking in git.git (Feb 2011, #01; Thu, 3)

3 +X-master-at: 597a63054241c122515c93cbce45bc44eb231f18

4 +X-next-at: ccfc03dd6521ffd2cbd803a18b12c204fd5e54d0

5

6 -What's cooking in git.git (Jan 2011, #06; Sun, 30)

6 +What's cooking in git.git (Feb 2011, #01; Thu, 3)

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 -1.7.4 is out. I'd like to stop and calm the tree down for a few days

13 -so that we can catch any brown-paper-bag bugs before moving things

14 -forward, and then open the floodgate for the next cycle, which I am

15 -inclined to designate as "We would have done these differently if we

16 -were creating git from scratch with the experience we have and wisdom

17 -we have gained" cycle, allowing minor backward incompatibilities,

18 -somewhat like 1.6.0 but not so drastic. The result would probably

19 -be called 1.8.0--the details in a separate message.

20 -

21 ---------------------------------------------------

22 -[New Topics]

23 -

24 -* jc/fsck-fixes (2011-01-26) 2 commits

25 - - fsck: do not give up too early in fsck_dir()

26 - - fsck: drop unused parameter from traverse_one_object()

12 +The tip of 'next' has been rewound, as 1.7.4 is now out. A few topics

13 +that were merged to 'next' during 1.7.4 pre-release freeze period have

14 +been kicked back to 'pu' to make sure I didn't make silly mistakes while

15 +rebasing them on top of 1.7.4 to reduce future merge conflicts.

16

17 --------------------------------------------------

18 [Stalled]

@@ -130,86 +119,104 @@ Will be rerolled (Martin, Jan 28).

119 --------------------------------------------------

120 [Cooking]

121

133 -* jn/unpack-lstat-failure-report (2011-01-12) 2 commits

134 - (merged to 'next' on 2011-01-24 at 1245180)

135 - + unpack-trees: handle lstat failure for existing file

136 - + unpack-trees: handle lstat failure for existing directory

122 +* nd/struct-pathspec (2011-01-31) 22 commits

123 + - t6004: add pathspec globbing test for log family

124 + - t7810: overlapping pathspecs and depth limit

125 + - grep: drop pathspec_matches() in favor of tree_entry_interesting()

126 + - grep: use writable strbuf from caller for grep_tree()

127 + - grep: use match_pathspec_depth() for cache/worktree grepping

128 + - grep: convert to use struct pathspec

129 + - Convert ce_path_match() to use match_pathspec_depth()

130 + - Convert ce_path_match() to use struct pathspec

131 + - struct rev_info: convert prune_data to struct pathspec

132 + - pathspec: add match_pathspec_depth()

133 + - tree_entry_interesting(): optimize wildcard matching when base is matched

134 + - tree_entry_interesting(): support wildcard matching

135 + - tree_entry_interesting(): fix depth limit with overlapping pathspecs

136 + - tree_entry_interesting(): support depth limit

137 + - tree_entry_interesting(): refactor into separate smaller functions

138 + - diff-tree: convert base+baselen to writable strbuf

139 + - glossary: define pathspec

140 + - Move tree_entry_interesting() to tree-walk.c and export it

141 + - tree_entry_interesting(): remove dependency on struct diff_options

142 + - Convert struct diff_options to use struct pathspec

143 + - diff-no-index: use diff_tree_setup_paths()

144 + - Add struct pathspec

145 + (this branch is used by en/object-list-with-pathspec.)

146

138 -* rr/fi-import-marks-if-exists (2011-01-15) 1 commit

139 - - fast-import: Introduce --import-marks-if-exists

147 +* en/object-list-with-pathspec (2010-09-20) 2 commits

148 + - Add testcases showing how pathspecs are handled with rev-list --objects

149 + - Make rev-list --objects work together with pathspecs

150 + (this branch uses nd/struct-pathspec.)

151

141 -Looked reasonable.

152 +The above two were rebased on 1.7.4; I think the result is correct, but

153 +extra sets of eyeballs are always appreciated.

154 +

155 +* tr/merge-unborn-clobber (2010-08-22) 1 commit

156 + (merged to 'next' on 2011-02-03 at ccfc03d)

157 + + Exhibit merge bug that clobbers index&WT

158 +

159 +* jc/unpack-trees (2010-12-22) 2 commits

160 + (merged to 'next' on 2011-02-03 at 5bd48f8)

161 + + unpack_trees(): skip trees that are the same in all input

162 + + unpack-trees.c: cosmetic fix

163 +

164 +* jc/fsck-fixes (2011-01-26) 2 commits

165 + (merged to 'next' on 2011-02-03 at 98e1c63)

166 + + fsck: do not give up too early in fsck_dir()

167 + + fsck: drop unused parameter from traverse_one_object()

168

169 * tr/diff-words-test (2011-01-18) 4 commits

144 - - t4034 (diff --word-diff): add a minimum Perl drier test vector

145 - - t4034 (diff --word-diff): style suggestions

146 - - userdiff: simplify word-diff safeguard

147 - - t4034: bulk verify builtin word regex sanity

170 + (merged to 'next' on 2011-02-03 at d346665)

171 + + t4034 (diff --word-diff): add a minimum Perl drier test vector

172 + + t4034 (diff --word-diff): style suggestions

173 + + userdiff: simplify word-diff safeguard

174 + + t4034: bulk verify builtin word regex sanity

175

176 I thought this was Ok; further comments, anybody?

177

178 +* rr/fi-import-marks-if-exists (2011-01-15) 1 commit

179 + (merged to 'next' on 2011-02-03 at 8c9d4ce)

180 + + fast-import: Introduce --import-marks-if-exists

181 +

182 +Looked reasonable.

183 +

184 +* jn/unpack-lstat-failure-report (2011-01-12) 2 commits

185 + (merged to 'next' on 2011-02-03 at 76586d2)

186 + + unpack-trees: handle lstat failure for existing file

187 + + unpack-trees: handle lstat failure for existing directory

188 +

189 +Looked reasonable.

190 +

191 * ef/alias-via-run-command (2011-01-07) 1 commit

152 - (merged to 'next' on 2011-01-06 at 1fbd4a0)

192 + (merged to 'next' on 2011-02-03 at 4ce47ce)

193 + alias: use run_command api to execute aliases

194

195 +Will merge to 'master' shortly.

196 +

197 * uk/checkout-ambiguous-ref (2011-01-11) 1 commit

156 - (merged to 'next' on 2011-01-11 at 2aa30de)

198 + (merged to 'next' on 2011-02-03 at 9044724)

199 + checkout: fix bug with ambiguous refs

200

201 +Will merge to 'master' shortly.

202 +

203 * cb/setup (2010-12-27) 1 commit

160 - (merged to 'next' on 2011-01-05 at 790b288)

204 + (merged to 'next' on 2011-02-03 at 073980f)

205 + setup: translate symlinks in filename when using absolute paths

206

207 +Will merge to 'master' shortly.

208 +

209 * ae/better-template-failure-report (2010-12-18) 1 commit

164 - (merged to 'next' on 2011-01-05 at d3f9142)

210 + (merged to 'next' on 2011-02-03 at 3b269c9)

211 + Improve error messages when temporary file creation fails

212

167 -* jc/unpack-trees (2010-12-22) 2 commits

168 - - unpack_trees(): skip trees that are the same in all input

169 - - unpack-trees.c: cosmetic fix

213 +Will merge to 'master' shortly.

214

215 * jn/cherry-pick-strategy-option (2010-12-10) 1 commit

172 - (merged to 'next' on 2011-01-05 at 3ccc590)

216 + (merged to 'next' on 2011-02-03 at 1c10f16)

217 + cherry-pick/revert: add support for -X/--strategy-option

218

175 -* nd/struct-pathspec (2010-12-15) 21 commits

176 - (merged to 'next' on 2011-01-24 at 08f1774)

177 - + t7810: overlapping pathspecs and depth limit

178 - + grep: drop pathspec_matches() in favor of tree_entry_interesting()

179 - + grep: use writable strbuf from caller for grep_tree()

180 - + grep: use match_pathspec_depth() for cache/worktree grepping

181 - + grep: convert to use struct pathspec

182 - + Convert ce_path_match() to use match_pathspec_depth()

183 - + Convert ce_path_match() to use struct pathspec

184 - + struct rev_info: convert prune_data to struct pathspec

185 - + pathspec: add match_pathspec_depth()

186 - + tree_entry_interesting(): optimize wildcard matching when base is matched

187 - + tree_entry_interesting(): support wildcard matching

188 - + tree_entry_interesting(): fix depth limit with overlapping pathspecs

189 - + tree_entry_interesting(): support depth limit

190 - + tree_entry_interesting(): refactor into separate smaller functions

191 - + diff-tree: convert base+baselen to writable strbuf

192 - + glossary: define pathspec

193 - + Move tree_entry_interesting() to tree-walk.c and export it

194 - + tree_entry_interesting(): remove dependency on struct diff_options

195 - + Convert struct diff_options to use struct pathspec

196 - + diff-no-index: use diff_tree_setup_paths()

197 - + Add struct pathspec

198 - (this branch is used by en/object-list-with-pathspec.)

199 -

200 -* en/object-list-with-pathspec (2010-09-20) 2 commits

201 - (merged to 'next' on 2011-01-24 at 134f65c)

202 - + Add testcases showing how pathspecs are handled with rev-list --objects

203 - + Make rev-list --objects work together with pathspecs

204 - (this branch uses nd/struct-pathspec.)

205 -

206 -I've been toying with the above two topics and am reasonably happy.

207 -I suspect that there could be (and probably need to be) further

208 -consolidation of the two remaining pathspec API, but this seems to

209 -be already usable.

210 -

211 -* tr/merge-unborn-clobber (2010-08-22) 1 commit

212 - - Exhibit merge bug that clobbers index&WT

219 +Will merge to 'master' shortly.

220

221 * ab/i18n (2010-10-07) 161 commits

222 - po/de.po: complete German translation

What's cooking (2011/02 #01)