392dc53866 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2009, #03; Mon, 25)

3 -X-master-at: 9619ff14159ab3401636b9883a715b0f20b051df

4 -X-next-at: 2435664148ab70c34750a9f1339d4ca898bd289e

2 +Subject: What's cooking in git.git (May 2009, #04; Sun, 31)

3 +X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a

4 +X-next-at: 426b5a935392df623347be0aea16bca045d44b52

5

6 -What's cooking in git.git (May 2009, #03; Mon, 25)

6 +What's cooking in git.git (May 2009, #04; Sun, 31)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -17,27 +17,49 @@ meant to be merged to the maintenance series have "maint-" in their names.

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

18 [New Topics]

19

20 -* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 5 commits

21 - - parse-opts: add OPT_FILENAME and transition builtins

22 - - parse-opts: prepare for OPT_FILENAME

23 - - Merge branch 'jc/mktree' into sb/opt-filename

24 - - Merge branch 'sb/format-patch-parseopt' into sb/opt-filename

25 - - Merge branch 'sb/show-branch-parse-options' into sb/opt-filename

26 - - Merge branch 'master' into sb/opt-filename

27 - + apply, fmt-merge-msg: use relative filenames

28 - + commit: -F overrides -t

20 +All of these are soon to be in 'next'.

21

30 -There are quite a few new callers to parse_options() in 'next' and 'pu'

31 -that are more likely to graduate before this series, so for now I merged a

32 -few of them and adjusted the commit "prepare for OPT_FILENAME". I tried

33 -to be careful but extra sets of eyeballs would be helpful.

22 +* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits

23 + - Makefile: introduce SANE_TOOL_PATH for prepending required

24 + elements to PATH

25 + - Makefile: add section for SunOS 5.7

26 + - Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile

27 + arguments

28 + - Makefile: use /usr/ucb/install on SunOS platforms rather than

29 + ginstall

30

35 -* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit

36 - + mergetool--lib: add support for araxis merge

31 +* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit

32 + - git-cvsexportcommit can't commit files which have been removed

33 + from CVS

34 +

35 +* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit

36 + - Documentation: teach stash/pop workflow instead of stash/apply

37 +

38 +* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits

39 + - diff: generate pretty filenames in prep_temp_blob()

40 + - compat: add a basename() compatibility function

41 + - compat: add a mkstemps() compatibility function

42 +

43 +* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit

44 + - for-each-ref: Do not lookup objects when they will not be used

45 +

46 +* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit

47 + - match_refs: search ref list tail internally

48 +

49 +I need to replace this with the new iteration...

50 +

51 +* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits

52 + - git-am: refactor 'cleaning up and aborting'

53 + - git-am foreign patch support: StGIT support

54 + - git-am foreign patch support: autodetect some patch formats

55 + - git-am foreign patch support: introduce patch_format

56 +

57 +----------------------------------------------------------------

58 +[Graduated to "master"]

59

38 -I admit that I feel certain distaste in supporting a closed tool, but we

39 -already make things bearable for people on Windows; Araxis is no worse,

40 -right?

60 +* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits

61 + + parse-opts: add OPT_FILENAME and transition builtins

62 + + parse-opts: prepare for OPT_FILENAME

63

64 * rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit

65 + grep: fix word-regexp at the beginning of lines

@@ -71,158 +93,10 @@ right?

93 + apply, fmt-merge-msg: use relative filenames

94 + commit: -F overrides -t

95

74 -* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits

75 - - Avoid "diff-index --cached" optimization under --find-copies-

76 - harder

77 - - Optimize "diff-index --cached" using cache-tree

78 - - t4007: modernize the style

79 - - cache-tree.c::cache_tree_find(): simplify inernal API

80 - - write-tree --ignore-cache-tree

81 -

96 * jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits

97 - OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV

98 - Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6

99

86 -* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits

87 - - Change xdl_merge to generate output even for null merges

88 - - t6023: merge-file fails to output anything for a degenerate merge

89 -

90 -* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

91 - - diff: Rename QUIET internal option to QUICK

92 - - diff: change semantics of "ignore whitespace" options

93 -

94 -----------------------------------------------------------------

95 -[Graduated to "master"]

96 -

97 -* cc/bisect (Sat May 9 17:55:47 2009 +0200) 20 commits

98 - + bisect: make "git bisect" use new "--next-all" bisect-helper

99 - function

100 - + bisect: add "check_good_are_ancestors_of_bad" function

101 - + bisect: implement the "check_merge_bases" function

102 - + bisect: automatically sort sha1_array if needed when looking it up

103 - + bisect: make skipped array functions more generic

104 - + bisect: remove too much function nesting

105 - + bisect: use new "struct argv_array" to prepare argv for

106 - "setup_revisions"

107 - + bisect: store good revisions in a "sha1_array"

108 - + bisect: implement "rev_argv_push" to fill an argv with revs

109 - + bisect: use "sha1_array" to store skipped revisions

110 - + am: simplify "sq" function by using "git rev-parse --sq-quote"

111 - + bisect: use "git rev-parse --sq-quote" instead of a custom "sq"

112 - function

113 - + rev-parse: add --sq-quote to shell quote arguments

114 - + rev-list: remove stringed output flag from "show_bisect_vars"

115 - + bisect--helper: remove "--next-vars" option as it is now useless

116 - + bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"

117 - + bisect--helper: add "--next-exit" to output bisect results

118 - + bisect: move common bisect functionality to "bisect_common"

119 - + rev-list: refactor printing bisect vars

120 - + rev-list: make "estimate_bisect_steps" non static

121 -

122 -Rewriting major part of "git-bisect" shell script continues. The patches

123 -seem to be reasonably clean.

124 -

125 -* fc/decorate-tag (Thu May 14 00:32:53 2009 +0300) 2 commits

126 - + Prettify log decorations even more

127 - + Change prettify_ref to prettify_refname

128 -

129 -* mg/track (Mon May 11 16:42:54 2009 +0200) 2 commits

130 - + Fix behavior with non-commit upstream references

131 - + Test tracking of non-commit upstreams

132 -

133 -* jn/gitweb-cleanup (Mon May 11 19:45:11 2009 +0200) 8 commits

134 - + gitweb: Remove unused $hash_base parameter from

135 - normalize_link_target

136 - + gitweb: Simplify snapshot format detection logic in

137 - evaluate_path_info

138 - + gitweb: Use capturing parentheses only when you intend to capture

139 - + gitweb: Replace wrongly added tabs with spaces

140 - + gitweb: Use block form of map/grep in a few cases more

141 - + gitweb: Always use three argument form of open

142 - + gitweb: Always use three argument form of open

143 - + gitweb: Do not use bareword filehandles

144 -

145 -* js/maint-no-ln-across-libexec-and-bin (Mon May 11 13:02:18 2009 +0200) 1 commit

146 - + Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

147 -

148 -* tp/send-email-from-config (Tue May 12 15:48:56 2009 -0700) 1 commit

149 - + send-email: Add config option for sender address

150 -

151 -* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit

152 - + fetch: Strip usernames from url's before storing them

153 -

154 -* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit

155 - + graph API: Use horizontal lines for more compact graphs

156 -

157 -* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits

158 - + bash completion: show-branch color support

159 - + show-branch: color the commit status signs

160 -

161 -* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit

162 - + diff: do not color --stat output like patch context

163 -

164 -* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits

165 - + t3702: fix reliance on SHELL_PATH being '/bin/sh'

166 - + git-add: introduce --edit (to edit the diff vs. the index)

167 -

168 -* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit

169 - + add: don't complain when adding empty project root

170 -

171 -* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits

172 - + print unlink(2) errno in copy_or_link_directory

173 - + replace direct calls to unlink(2) with unlink_or_warn

174 - + Introduce an unlink(2) wrapper which gives warning if unlink

175 - failed

176 -

177 -* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit

178 - + Clarify kind of conflict in merge-one-file helper

179 -

180 -* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit

181 - + allow OFS_DELTA objects during a push

182 -

183 -* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit

184 - + Add --reference option to git submodule.

185 -

186 -* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits

187 - + Git.pm: Always set Repository to absolute path if autodetecting

188 - + Git.pm: Set GIT_WORK_TREE if we set GIT_DIR

189 -

190 -* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits

191 - + grep: use parseopt

192 - + grep: remove global variable builtin_grep

193 - + parseopt: add PARSE_OPT_NODASH

194 - + parseopt: add OPT_NUMBER_CALLBACK

195 - + parseopt: add OPT_NEGBIT

196 -

197 -* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits

198 - + parseopt: add OPT_NEGBIT

199 - + parseopt: add OPT_NEGBIT

200 -

201 -* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit

202 - + fix GIT_TRACE segfault with shell-quoted aliases

203 -

204 -* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit

205 - + Extend sample update hook, disable modifying of existing tags

206 -

207 -* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit

208 - + Disallow '\' in ref names

209 -

210 -* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit

211 - + merge-recursive: never leave index unmerged while recursing

212 -

213 -* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit

214 - + format-patch let -k override a config-specified format.numbered

215 -

216 -* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits

217 - + Teach 'git checkout' to preload the index contents

218 - + Avoid unnecessary 'lstat()' calls in 'get_stat_data()'

219 -

220 -* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit

221 - + mergetool--lib: specialize diff options for emerge and ecmerge

222 -

223 -----------------------------------------------------------------

224 -[Will merge to "master" soon]

225 -

100 * mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits

101 + send-email: Remove superfluous `my $editor = ...'

102 + send-email: 'References:' should only reference what is sent

@@ -232,10 +106,26 @@ seem to be reasonably clean.

106 sendemail.multiedit

107 + Docs: send-email: Put options back into alphabetical order

108

235 -* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit

236 - + git-submodule: add support for --rebase.

109 +* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits

110 + + mktree: validate entry type in input

111 + + mktree --batch: build more than one tree object

112 + + mktree --missing: updated usage message and man page

113 + + mktree --missing: allow missing objects

114 + + t1010: add mktree test

115 + + mktree: do not barf on a submodule commit

116 + + builtin-mktree.c: use a helper function to handle one line of

117 + input

118 + + mktree: use parse-options

119 + + build-in git-mktree

120 +

121 +* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits

122 + + Revert "git-add--interactive: remove hunk coalescing"

123 + + Splitting a hunk that adds a line at the top fails in "add -p"

124

238 -* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits

125 +* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit

126 + + format-patch: migrate to parse-options API

127 +

128 +* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part)

129 + bisect: check ancestors without forking a "git rev-list" process

130 + commit: add function to unparse a commit and its parents

131 + bisect: rework some rev related functions to make them more

@@ -244,6 +134,22 @@ seem to be reasonably clean.

134 ----------------------------------------------------------------

135 [Stalled and may need help and prodding to go forward]

136

137 +* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits

138 + - Teach "-m <msg>" and "-F <file>" to "git notes edit"

139 + - Add an expensive test for git-notes

140 + - Speed up git notes lookup

141 + - Add a script to edit/inspect notes

142 + - Introduce commit notes

143 +

144 +Dscho asked about the performance implications of this; I do not think I

145 +saw any progress on that yet...

146 +

147 +* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit

148 + + git-submodule: add support for --rebase.

149 +

150 +There was a discussion on --rebase vs --merge and needs for unified

151 +configuration variable handling for this patch...

152 +

153 * lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits

154 - Add initial support for pathname conversion to UTF-8

155 - read_directory(): infrastructure for pathname character set

@@ -314,53 +220,61 @@ in binary mode as well.

220 ----------------------------------------------------------------

221 [Actively cooking]

222

317 -* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits

318 - + mktree: validate entry type in input

319 - + mktree --batch: build more than one tree object

320 - + mktree --missing: updated usage message and man page

321 - + mktree --missing: allow missing objects

322 - + t1010: add mktree test

323 - + mktree: do not barf on a submodule commit

324 - + builtin-mktree.c: use a helper function to handle one line of

325 - input

326 - + mktree: use parse-options

327 - + build-in git-mktree

223 +* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit

224 + + mergetool--lib: add support for araxis merge

225

329 -* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits

330 - + Revert "git-add--interactive: remove hunk coalescing"

331 - + Splitting a hunk that adds a line at the top fails in "add -p"

226 +* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits

227 + + Avoid "diff-index --cached" optimization under --find-copies-

228 + harder

229 + + Optimize "diff-index --cached" using cache-tree

230 + + t4007: modernize the style

231 + + cache-tree.c::cache_tree_find(): simplify internal API

232 + + write-tree --ignore-cache-tree

233

333 -* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit

334 - + format-patch: migrate to parse-options API

234 +* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits

235 + - Change xdl_merge to generate output even for null merges

236 + - t6023: merge-file fails to output anything for a degenerate merge

237

336 -* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits

337 - - Teach "-m <msg>" and "-F <file>" to "git notes edit"

338 - - Add an expensive test for git-notes

339 - - Speed up git notes lookup

340 - - Add a script to edit/inspect notes

341 - - Introduce commit notes

238 +Soon in 'next';

239 +

240 +* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

241 + - diff: Rename QUIET internal option to QUICK

242 + - diff: change semantics of "ignore whitespace" options

243 +

244 +* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits

245 + - bisect: display first bad commit without forking a new process

246 + - bisect: drop unparse_commit() and use clear_commit_marks()

247 +

248 +Soon in 'next';

249

343 -* rc/http-push (Mon May 18 16:14:24 2009 +0800) 15 commits

250 +* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits

251 - http*: add helper methods for fetching objects (loose)

345 - - http*: add helper methods for fetching objects/info/packs

252 - http*: add helper methods for fetching packs

347 - - http*: add fetch_http_pack_index

253 + - http: use new http API in fetch_index()

254 + - http*: add http_get_info_packs

255 + - Use the new http API in fetch_symref()

256 + - Use the new http API in update_remote_info_refs()

257 + - Use the new http API in http_fetch_ref()

258 + - Use the new http API in get_refs_via_curl()

259 + - Two new functions for the http API

260 - http: create function end_url_with_slash

261 - http*: move common variables and macros to http.[ch]

262 + - Some cleanup in get_refs_via_curl()

263 + - Don't expect verify_pack() callers to set pack_size

264 - http-push: do not SEGV after fetching a bad pack idx file

265 - http*: copy string returned by sha1_to_hex

266 - http-walker: verify remote packs

267 - http-push, http-walker: style fixes

354 - - t5550-http-fetch: test fetching of packed objects

268 - http-push: fix missing "#ifdef USE_CURL_MULTI" around

269 "is_running_queue"

270 - http-push: send out fetch requests on queue

271 - t5540-http-push: test fetching of packed objects

272 - t5540-http-push: test fetching of loose objects

273

361 -This is not the re-rolled 18-patch series we discussed yesterday.

274 +Updated (but not yet with the "slot->local = NULL" patch)

275

363 -* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits

276 +* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits

277 + - t6050: check pushing something based on a replaced commit

278 - Documentation: add documentation for "git replace"

279 - Add git-replace to .gitignore

280 - builtin-replace: use "usage_msg_opt" to give better error messages

@@ -376,8 +290,7 @@ This is not the re-rolled 18-patch series we discussed yesterday.

290 "refs/replace/"

291 - refs: add a "for_each_replace_ref" function

292

379 -I suspect an attempt to replace an object that is directly listed on the

380 -command line would not work very well with this series.

293 +Rebased to master.

294

295 ----------------------------------------------------------------

296 [On Hold]

What's cooking (2009/05 #04)