5be8d38af2 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2009, #02; Sun, 17)

3 -X-master-at: 55524fcf9d6676ca3840227092bf3a14ba404615

4 -X-next-at: 540caa5c275c0ad44c1bc979c37075f58e3459de

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

3 +X-master-at: 9619ff14159ab3401636b9883a715b0f20b051df

4 +X-next-at: 2435664148ab70c34750a9f1339d4ca898bd289e

5

6 -What's cooking in git.git (May 2009, #02; Sun, 17)

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

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

8

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

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

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

18 [New Topics]

19

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

21 - - mktree: validate entry type in input

22 - - mktree --batch: build more than one tree object

23 - - mktree --missing: updated usage message and man page

24 - - mktree --missing: allow missing objects

25 - - t1010: add mktree test

26 - - mktree: do not barf on a submodule commit

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

28 - input

29 - - mktree: use parse-options

30 - - build-in git-mktree

31 -

32 -* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits

33 - - Fix for a merge where a branch has an F->D transition

34 - - Add a reminder test case for a merge with F/D transition

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

29 +

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.

34 +

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

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

37 +

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?

41 +

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

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

44 +

45 +* mm/apply-double-slash (Thu May 21 14:25:11 2009 +0200) 1 commit

46 + + apply: handle filenames with double slashes better

47 +

48 +* bc/old-iconv (Fri May 22 18:47:06 2009 -0500) 10 commits

49 + + t8005: convert CP1251 character set to ISO8859-5

50 + + t8005: use more portable character encoding names

51 + + t5100: use ancient encoding syntax for backwards compatibility

52 + + t9301: use ISO8859-1 rather than ISO-8859-1

53 + + t3901: Use ISO8859-1 instead of ISO-8859-1 for backward

54 + compatibility

55 + + t3901: avoid negation on right hand side of '|'

56 + + builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as

57 + fallback encoding

58 + + builtin-mailinfo.c: compare character encodings case insensitively

59 + + Use 'UTF-8' rather than 'utf-8' everywhere for backward

60 + compatibility

61 + + t3900: use ancient iconv names for backward compatibility

62 +

63 +* sb/show-branch-parse-options (Thu May 21 00:33:18 2009 -0700) 3 commits

64 + + show-branch: migrate to parse-options API

65 + + Merge branch 'mh/show-branch-color' into sb/show-branch-parse-

66 + options

67 + + parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated

68 + argh's

69 +

70 +* sb/maint-1.6.2-opt-filename-fix (Sat May 23 11:53:11 2009 -0700) 2 commits

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

72 + + commit: -F overrides -t

73 +

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 +

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

83 + - OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV

84 + - Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6

85 +

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

36 -Although the reported breakage is covered with the patch, Alex feels the

37 -solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive

38 -may be long overdue but seems to be a hard problem.

94 +----------------------------------------------------------------

95 +[Graduated to "master"]

96

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

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

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

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

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

45 - - format-patch: migrate to parse-options API

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

@@ -67,43 +145,15 @@ may be long overdue but seems to be a hard problem.

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

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

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

72 - - Add an expensive test for git-notes

73 - - Speed up git notes lookup

74 - - Add a script to edit/inspect notes

75 - - Introduce commit notes

76 -

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

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

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

82 - - read_directory(): infrastructure for pathname character set

83 - conversion

84 - - Add 'fill_directory()' helper function for directory traversal

85 -

86 -----------------------------------------------------------------

87 -[Will merge to "master" soon]

88 -

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

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

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

92 - + send-email: Handle "GIT:" rather than "GIT: " during --compose

93 - + Docs: send-email: --smtp-server-port can take symbolic ports

94 - + Docs: send-email: Refer to CONFIGURATION section for

95 - sendemail.multiedit

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

97 -

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

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

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

106 -

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

@@ -118,12 +168,6 @@ may be long overdue but seems to be a hard problem.

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

121 -When you say "git add ." in an empty directory, you get "No path matches

122 -''", instead of "No path matches '.'", and this "fixes" it by hiding the

123 -error and making the command silently succeed. Strictly speaking it

124 -introduces inconsistency, but I think an empty directory is so

125 -uninteresting special case that not signalling it as an error is Ok.

126 -

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

@@ -154,9 +198,6 @@ uninteresting special case that not signalling it as an error is Ok.

198 + parseopt: add OPT_NEGBIT

199 + parseopt: add OPT_NEGBIT

200

157 -I somehow botched the commit log message of the top one; it is about

158 -fixing "ls-files --no-empty-directory".

159 -

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

@@ -166,10 +207,6 @@ fixing "ls-files --no-empty-directory".

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

208 + Disallow '\' in ref names

209

169 -This retroactively forbids use of what people could have been using

170 -happily, which, strictly speaking, is a no-no, but makes sense in the

171 -longer term.

172 -

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

@@ -180,37 +217,51 @@ longer term.

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

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

219

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

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

185 - function

186 - + bisect: add "check_good_are_ancestors_of_bad" function

187 - + bisect: implement the "check_merge_bases" function

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

189 - + bisect: make skipped array functions more generic

190 - + bisect: remove too much function nesting

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

192 - "setup_revisions"

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

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

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

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

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

198 - function

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

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

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

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

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

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

205 - + rev-list: refactor printing bisect vars

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

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

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

209 -seem to be reasonably clean.

223 +----------------------------------------------------------------

224 +[Will merge to "master" soon]

225 +

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

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

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

229 + + send-email: Handle "GIT:" rather than "GIT: " during --compose

230 + + Docs: send-email: --smtp-server-port can take symbolic ports

231 + + Docs: send-email: Refer to CONFIGURATION section for

232 + sendemail.multiedit

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

234 +

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

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

237 +

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

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

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

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

242 + reusable

243

244 ----------------------------------------------------------------

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

246

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

248 + - Add initial support for pathname conversion to UTF-8

249 + - read_directory(): infrastructure for pathname character set

250 + conversion

251 + - Add 'fill_directory()' helper function for directory traversal

252 +

253 +Before adding the real "conversion", this needs a few real fixups, I

254 +think. For example there is one hardcoded array that is used without

255 +bounds check.

256 +

257 +* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits

258 + - Fix for a merge where a branch has an F->D transition

259 + - Add a reminder test case for a merge with F/D transition

260 +

261 +Although the reported breakage is covered with the patch, Alex feels the

262 +solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive

263 +may be long overdue but seems to be a hard problem.

264 +

265 * ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit

266 - blame.c: start libifying the blame infrastructure

267

@@ -263,13 +314,36 @@ in binary mode as well.

314 ----------------------------------------------------------------

315 [Actively cooking]

316

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

267 - - mergetool--lib: specialize diff options for emerge and ecmerge

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

328 +

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"

332 +

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

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

335

269 -Can somebody tell me what the current status of this is? I thought there

270 -was some objection, but I lost track...

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

342

272 -* rc/http-push (Sat May 16 11:51:52 2009 +0800) 12 commits

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

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

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

346 + - http*: add helper methods for fetching packs

347 - http*: add fetch_http_pack_index

348 - http: create function end_url_with_slash

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

@@ -284,8 +358,7 @@ was some objection, but I lost track...

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

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

360

287 -There was an 11-patch updates but in the middle there were some

288 -compilation breakage issues; only early part of that series is queued.

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

362

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

364 - Documentation: add documentation for "git replace"

@@ -318,26 +391,3 @@ command line would not work very well with this series.

391

392 These are for 1.7.0, but the messages when they trigger together may need

393 to be rethought.

321 -

322 -----------------------------------------------------------------

323 -[Discarded]

324 -

325 -* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits

326 - . Documentation: fix 'linkgit' macro in "git-notes.txt"

327 - . tests: fix "export var=val"

328 - . notes: refuse to edit notes outside refs/notes/

329 - . t3301: use test_must_fail instead of !

330 - . t3301: fix confusing quoting in test for valid notes ref

331 - . notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR

332 - . notes: only clean up message file when editing

333 - . handle empty notes gracefully

334 - . git notes show: test empty notes

335 - . git-notes: fix printing of multi-line notes

336 - . notes: fix core.notesRef documentation

337 - . Add an expensive test for git-notes

338 - . Speed up git notes lookup

339 - . Add a script to edit/inspect notes

340 - . Introduce commit notes

341 -

342 -This has been replaced by jh/notes series.

343 -

What's cooking (2009/05 #03)