ac71d2b2f3 · matheusbsbs/matheus-bagliano

@@ -1,31 +1,29 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2011, #05; Mon, 24)

3 -X-master-at: 630fc7878b6fd1bc188d4916b64f4df37658df96

4 -X-next-at: c56cfa5dde233fbc2a459f8acd7743bae3060ba7

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

3 +X-master-at: 7ed863a85a6ce2c4ac4476848310b8f917ab41f9

4 +X-next-at: 705f25818b894adc974363c5f334dc99cf97c83f

5

6 -What's cooking in git.git (Jan 2011, #05; Mon, 24)

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

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 -I'll start paying much less attention to any new features and enhancements

13 -and shift the focus almost entirely on trivial fixes and regressions from

14 -now on. Hopefully lists will do the same and we can have a fairly short

15 -rc period this cycle. Please remind if there are patches that ought to be

16 -in 1.7.4 but are forgotten.

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 --------------------------------------------------

19 -[Graduated to "master"]

22 +[New Topics]

23

21 -* as/userdiff-pascal (2011-01-11) 1 commit

22 - (merged to 'next' on 2011-01-18 at 9060389)

23 - + userdiff: match Pascal class methods

24 -

25 -* js/test-windows (2011-01-11) 2 commits

26 - (merged to 'next' on 2011-01-11 at c8274ed)

27 - + t/README: hint about using $(pwd) rather than $PWD in tests

28 - + Fix expected values of setup tests on Windows

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()

27

28 --------------------------------------------------

29 [Stalled]

@@ -62,30 +60,37 @@ current usage context.

60 - diffcore-rename: record filepair for rename src

61 - diffcore-rename: refactor "too many candidates" logic

62

63 +IIRC, this was a weather-baloon "if you wanted to, this may be how you

64 +would do it" without test updates. People who care need to help moving

65 +things forward.

66 +

67 * jc/rerere-remaining (2011-01-06) 1 commit

68 - rerere "remaining"

69

70 Just a handful of weatherballoon patches without proper tests, in response

71 to feature/minor fix requests.

72

71 ---------------------------------------------------

72 -[Cooking]

73 +* ab/p4 (2011-01-11) 1 commit

74 + - git-p4: correct indenting and formatting

75

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

75 - - unpack-trees: handle lstat failure for existing file

76 - - unpack-trees: handle lstat failure for existing directory

76 +Lacks sign-off but is trivial.

77

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

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

78 +* tr/maint-branch-no-track-head (2010-12-14) 1 commit

79 + - branch: do not attempt to track HEAD implicitly

80

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

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

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

84 - - userdiff: simplify word-diff safeguard

85 - - t4034: bulk verify builtin word regex sanity

81 +Probably needs a re-roll to exclude either (1) any ref outside the

82 +hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs

83 +outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels

84 +safer and saner.

85

87 -* ab/p4 (2011-01-11) 1 commit

88 - - git-p4: correct indenting and formatting

86 +* hv/mingw-fs-funnies (2010-12-14) 5 commits

87 + - mingw_rmdir: set errno=ENOTEMPTY when appropriate

88 + - mingw: add fallback for rmdir in case directory is in use

89 + - mingw: make failures to unlink or move raise a question

90 + - mingw: work around irregular failures of unlink on windows

91 + - mingw: move unlink wrapper to mingw.c

92 +

93 +Will be rerolled (Heiko, 2010-12-23)

94

95 * mz/rebase (2010-12-28) 31 commits

96 - rebase -i: remove unnecessary state rebase-root

@@ -120,9 +125,28 @@ to feature/minor fix requests.

125 - rebase: refactor reading of state

126 - rebase: clearer names for directory variables

127

123 -The general direction of the series basically seemed sound, with nits here

124 -and there. Hopefully we will see a re-roll of this series sometime soon,

125 -but we are not in a hurry.

128 +Will be rerolled (Martin, Jan 28).

129 +

130 +--------------------------------------------------

131 +[Cooking]

132 +

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

137 +

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

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

140 +

141 +Looked reasonable.

142 +

143 +* 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

148 +

149 +I thought this was Ok; further comments, anybody?

150

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

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

@@ -148,55 +172,41 @@ but we are not in a hurry.

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

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

174

151 -* tr/maint-branch-no-track-head (2010-12-14) 1 commit

152 - - branch: do not attempt to track HEAD implicitly

153 -

154 -Probably needs a re-roll to exclude either (1) any ref outside the

155 -hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs

156 -outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels

157 -safer and saner.

158 -

159 -* hv/mingw-fs-funnies (2010-12-14) 5 commits

160 - - mingw_rmdir: set errno=ENOTEMPTY when appropriate

161 - - mingw: add fallback for rmdir in case directory is in use

162 - - mingw: make failures to unlink or move raise a question

163 - - mingw: work around irregular failures of unlink on windows

164 - - mingw: move unlink wrapper to mingw.c

165 -

166 -Will be rerolled (Heiko, 2010-12-23)

167 -

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

169 - - t7810: overlapping pathspecs and depth limit

170 - - grep: drop pathspec_matches() in favor of tree_entry_interesting()

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

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

173 - - grep: convert to use struct pathspec

174 - - Convert ce_path_match() to use match_pathspec_depth()

175 - - Convert ce_path_match() to use struct pathspec

176 - - struct rev_info: convert prune_data to struct pathspec

177 - - pathspec: add match_pathspec_depth()

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

179 - - tree_entry_interesting(): support wildcard matching

180 - - tree_entry_interesting(): fix depth limit with overlapping pathspecs

181 - - tree_entry_interesting(): support depth limit

182 - - tree_entry_interesting(): refactor into separate smaller functions

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

184 - - glossary: define pathspec

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

186 - - tree_entry_interesting(): remove dependency on struct diff_options

187 - - Convert struct diff_options to use struct pathspec

188 - - diff-no-index: use diff_tree_setup_paths()

189 - - Add struct pathspec

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

192 -On hold, perhaps in 'next', til 1.7.4 final.

193 -

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

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

196 - - Make rev-list --objects work together with pathspecs

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

199 -On hold, perhaps in 'next', til 1.7.4 final.

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

What's cooking (2011/01 #06)