edeae1fbd6 · matheusbsbs/matheus-bagliano

@@ -1,143 +1,109 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2009, #01; Mon, 06)

3 -X-master-at: f581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4

4 -X-next-at: 8586bb07b181c75e65a39d88128e40a1c3e88e2c

2 +Subject: What's cooking in git.git (Jul 2009, #02; Sun, 26)

3 +X-master-at: d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17

4 +X-next-at: 2b05f9bd0a9944bbaab9f24d305932a57e4735d4

5

6 -What's cooking in git.git (Jul 2009, #01; Mon, 06)

6 +What's cooking in git.git (Jul 2009, #02; Sun, 26)

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'. The ones

11 -marked with '.' do not appear in any of the branches, but I am still

12 -holding onto them.

9 +These topics in 'next' (ones prefixed with '+') and 'pu' (ones prefixed

10 +with '.') will not be in 1.6.4 final, and are subject to be rewound once

11 +it happens.

12

14 -The topics list the commits in reverse chronological order. The topics

15 -meant to be merged to the maintenance series have "maint-" in their names.

16 -

17 -It has been relatively quiet for the past few weeks. The 'next' branch is

18 -getting quite thin, and it would be a good time to declare -rc0. I'll do

19 -so by my Wednesday.

13 +We have quite a few solid topics in 'next', so hopefully the next cycle

14 +would be shorter than usual. I'd propose to call it 1.6.5, and then make

15 +the one after that 1.7.0, which means that during the 1.6.5 cycle, 'next'

16 +will have the two incompatible "push" (actually, receive-pack) changes

17 +hitherto kept on hold in 'pu'.

18

19 ----------------------------------------------------------------

20 [New Topics]

21

24 -* ld/push-porcelain-output-format (Mon Jun 22 21:10:01 2009 -0400) 1 commit

25 - + add --porcelain option to git-push

26 -

27 -* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 7 commits

28 - - receive-pack: remove unnecessary run_status report

29 - - run_command: report failure to execute the program, but optionally

30 - don't

31 - - run_command: encode deadly signal number in the return value

32 - - run_command: report system call errors instead of returning error

33 - codes

34 - - run_command: return exit code as positive value

35 - - MinGW: simplify waitpid() emulation macros

36 - - MinGW: truncate exit()'s argument to lowest 8 bits

37 -

38 -A few replacement/squash updates came in before it hit 'pu'; this should

39 -be the latest version.

40 -

41 -* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits

42 - - rebase -i: use "git sequencer--helper --make-patch"

43 - - sequencer: free memory used in "make_patch" function

44 - - sequencer: add "make_patch" function to save a patch

45 - - sequencer: add "builtin-sequencer--helper.c"

46 -

47 -* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit

48 - - mailinfo: Remove only one set of square brackets

49 -

50 -The change needed to the test vector shows the extent of the damage this

51 -change may cause in the real world. A handcrafted "Subject: [area] [PATCH] title"

52 -will be turned into "[PATCH] title".

53 -

54 -* rs/grep-p (Thu Jul 2 00:06:34 2009 +0200) 7 commits

55 - + grep: simplify -p output

56 - + grep -p: support user defined regular expressions

57 - + grep: add option -p/--show-function

58 - + grep: handle pre context lines on demand

59 - + grep: print context hunk marks between files

60 - + grep: move context hunk mark handling into show_line()

61 - + userdiff: add xdiff_clear_find_func()

62 -

63 -----------------------------------------------------------------

64 -[Graduated to "master"]

65 -

66 -* cf/maint-remote-uploadpack-useconfig-fix (Thu Jun 25 17:21:35 2009 -0400) 1 commit

67 - + git-remote: fix missing .uploadpack usage for show command

68 -

69 -* sb/show-ref-parse-options (Sat Jun 20 21:40:46 2009 -0700) 1 commit

70 - + show-ref: migrate to parse-options

71 -

72 -* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit

73 - + diff-tree -r -t: include added/removed directories in the output

74 -

75 -This changes the output from "diff-tree -r -t"; it brings more consistency

76 -to it, but it is a change and could break scripts.

77 -

78 -* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits

79 - + parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-

80 - parse

81 - + more tests for git rev-parse --parse-opt

82 -

83 -* js/daemon-log (Sun Jun 21 23:16:09 2009 +0200) 3 commits

84 - + receive-pack: do not send error details to the client

85 - + upload-pack: squelch progress indicator if client cannot see it

86 - + daemon: send stderr of service programs to the syslog

87 -

88 -* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits

89 - + stash: teach quiet option

90 - + am, rebase: teach quiet option

91 - + submodule, repack: migrate to git-sh-setup's say()

92 - + git-sh-setup: introduce say() for quiet options

93 - + am: suppress apply errors when using 3-way

94 - + t4150: test applying with a newline in subject

95 -

96 -* jk/use-our-regexp (Fri Jun 19 10:10:39 2009 -0500) 3 commits

97 - + Makefile: Solaris needs HAVE_ALLOCA_H for alloca()

98 - + Makefile: use compat regex on Solaris

99 - + Makefile: refactor regex compat support

100 -

101 -* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit

102 - - fetch: do not create ref from empty name

103 -

104 -* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits

105 - + Documentation: remove warning saying that "git bisect skip" may

106 - slow bisection

107 - + bisect: use a PRNG with a bias when skipping away from untestable

108 - commits

109 -

110 -* tr/die_errno (Sat Jun 27 17:58:47 2009 +0200) 4 commits

111 - - Use die_errno() instead of die() when checking syscalls

112 - - Convert existing die(..., strerror(errno)) to die_errno()

113 - - die_errno(): double % in strerror() output just in case

114 - - Introduce die_errno() that appends strerror(errno) to die()

115 -

116 -I didn't check the individual conversion from die() to die_errno()

117 -in this latest round; comments?

118 -

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

120 - - git-am: refactor 'cleaning up and aborting'

121 - - git-am foreign patch support: StGIT support

122 - - git-am foreign patch support: autodetect some patch formats

123 - - git-am foreign patch support: introduce patch_format

124 -

125 -Will be in 'next' shortly.

22 +* jk/show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits

23 + + show: add space between multiple items

24 + + show: suppress extra newline when showing annotated tag

25 +

26 +Didn't look bad at all, but is not pressing either.

27 +

28 +* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits

29 + + prune-packed: migrate to parse-options

30 + + verify-pack: migrate to parse-options

31 + + verify-tag: migrate to parse-options

32 + + write-tree: migrate to parse-options

33 +

34 +* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit

35 + + grep: Add --max-depth option.

36 +

37 +* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits

38 + - gitweb: Create links leading to 'blame_incremental' using

39 + JavaScript

40 + - gitweb: Incremental blame (proof of concept)

41 + - gitweb: Add optional "time to generate page" info in footer

42 + - gitweb: Add -partial_query option to href() subroutine

43 + - gitweb: Use light/dark for class names also in 'blame' view

44 + - gitweb: Add author initials in 'blame' view, a la "git gui blame"

45 + - gitweb: Mark commits with no "previous" in 'blame' view

46 + - gitweb: Use "previous" header of git-blame -p in 'blame' view

47 + - gitweb: Mark boundary commits in 'blame' view

48 + - gitweb: Make .error style generic

49 +

50 +Still in flux/rfc.

51 +

52 +* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit

53 + + git init: optionally allow a directory argument

54 +

55 +Didn't look bad, but is not pressing either.

56 +

57 +* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit

58 + + apply: notice creation/removal patches produced by GNU diff

59 +

60 +* sb/pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits

61 + + pull: support rebased upstream + fetch + pull --rebase

62 + + t5520-pull: Test for rebased upstream + fetch + pull --rebase

63 +

64 +* db/transport-shim (Sat Jul 25 13:51:40 2009 -0400) 3 commits

65 + - git-http-fetch: not a builtin

66 + - Use an external program to implement fetching with curl

67 + - Add support for external programs for handling native fetches

68 +

69 +Interesting as a concept. I saw its ls-remote segfault on me, though.

70 +Hopefully will mature by 1.6.5 final.

71 +

72 +* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits

73 + + branch.c: if remote is not config'd for branch, don't try delete

74 + push config

75 + + branch, checkout: introduce autosetuppush

76 + + move deletion of merge configuration to branch.c

77 + + remote: add per-remote autosetupmerge and autosetuprebase

78 + configuration

79 + + introduce a struct tracking_config

80 + + branch: install_branch_config and struct tracking refactoring

81 + + config: allow false and true values for branch.autosetuprebase

82 +

83 +After some discussion, I suspect we may want to rewind this out of 'next'

84 +and start over with a fresh design.

85 +

86 +* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit

87 + + init-db: migrate to parse-options

88 +

89 +* tr/reset-checkout-patch (Sat Jul 25 23:29:34 2009 +0200) 5 commits

90 + - Implement 'git stash save --patch'

91 + - Implement 'git checkout --patch'

92 + - Implement 'git reset --patch'

93 + - builtin-add: refactor the meat of interactive_add()

94 + - git-apply--interactive: Refactor patch mode code

95 +

96 +Still in flux/rfc.

97

98 ----------------------------------------------------------------

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

100

130 -* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits

131 - - http.c: add http.sslCertPasswordProtected option

132 - - http.c: prompt for SSL client certificate password

133 -

134 -I've rewritten these two to (1) move the #ifdef out of the main codepath,

135 -and (2) use configuration/environment to make the misfeature of always

136 -asking for a passphrase even a key/cert is unencrypted optional. I tried

137 -to be careful but extra sets of eyeballs would be nice to check the result.

101 +* gp/maint-rebase-p-onto (Wed Jul 22 12:38:58 2009 -0400) 1 commit

102 + . Fix rebase -p --onto

103

139 -Nobody seems to be jumping up-and-down asking for this or helping to push

140 -this forward. Perhaps it's time to drop it?

104 +I'd say we should take this even if it means Dscho needs his rebase -p

105 +rewrite. It is not very pressing, so perhaps do so immediately after

106 +1.6.4 final.

107

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

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

@@ -149,15 +115,7 @@ this forward. Perhaps it's time to drop it?

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

116 saw any progress on that yet...

117

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

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

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

155 - conversion

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

157 -

158 -Before adding the real "conversion", this needs a few real fixups, I

159 -think. For example there is one hardcoded array that is used without

160 -bounds check.

118 +Will drop after 1.6.4 unless any further progress is seen.

119

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

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

@@ -172,6 +130,8 @@ may be long overdue but seems to be a hard problem.

130

131 A few minor point remains in this initial one.

132

133 +Will drop after 1.6.4 unless any further progress is seen.

134 +

135 * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

136 - Allow --date=local --date=other-format to work as expected

137

@@ -179,6 +139,8 @@ The one I posted had a few corner-case bugs that was caught with the test

139 suite; this one has them fixed. People did not like the UI so it is kept

140 out of 'next'

141

142 +Will drop after 1.6.4 unless any further progress is seen.

143 +

144 * jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit

145 - git-merge-file: allow converting the results for the work tree

146

@@ -199,11 +161,16 @@ canonical representation and possibly add conflict markers, and then write

161 the results out after convert_to_working_tree(). It also needs to write

162 in binary mode as well.

163

164 +Will drop after 1.6.4 unless any further progress is seen.

165 +

166 * db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits

167 - Add option for using a foreign VCS

168 - Document details of transport function APIs

169 - Allow late reporting of fetched hashes

170

171 +I have a feeling that the recent transport-shim series from the same

172 +author could supersede this one.

173 +

174 * hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits

175 - t/t9600: remove exit after test_done

176 - cvsimport: extend testcase about patchset order to contain

@@ -216,72 +183,74 @@ in binary mode as well.

183 - Start a library for cvsimport-related tests

184

185 ----------------------------------------------------------------

219 -[Actively cooking]

186 +[Not actively cooking]

187

221 -* gb/gitweb-avatar (Tue Jun 30 00:00:54 2009 +0200) 7 commits

222 - - gitweb: add empty alt text to avatar img

223 - - gitweb: picon avatar provider

224 - - gitweb: gravatar url cache

225 - - gitweb: (gr)avatar support

226 - - gitweb: use git_print_authorship_rows in 'tag' view too

227 - - gitweb: uniform author info for commit and commitdiff

228 - - gitweb: refactor author name insertion

188 +* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits

189 + + receive-pack: remove unnecessary run_status report

190 + + run_command: report failure to execute the program, but optionally

191 + don't

192 + + run_command: encode deadly signal number in the return value

193 + + run_command: report system call errors instead of returning error

194 + codes

195 + + run_command: return exit code as positive value

196 + + MinGW: simplify waitpid() emulation macros

197

230 -This should be the latest one posted to the list, and I think it is

231 -reasonable, and Jakub seemed to concur. Will be in 'next'

198 +Will merge after 1.6.4

199 +

200 +* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits

201 + - rebase -i: use "git sequencer--helper --make-patch"

202 + - sequencer: free memory used in "make_patch" function

203 + - sequencer: add "make_patch" function to save a patch

204 + - sequencer: add "builtin-sequencer--helper.c"

205

206 * en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits

234 - - fast-export: Document the fact that git-rev-list arguments are

207 + + fast-export: Document the fact that git-rev-list arguments are

208 accepted

236 - - Add new fast-export testcases

237 - - fast-export: Add a --tag-of-filtered-object option for newly

209 + + Add new fast-export testcases

210 + + fast-export: Add a --tag-of-filtered-object option for newly

211 dangling tags

239 - - fast-export: Do parent rewriting to avoid dropping relevant

212 + + fast-export: Do parent rewriting to avoid dropping relevant

213 commits

241 - - fast-export: Make sure we show actual ref names instead of

214 + + fast-export: Make sure we show actual ref names instead of

215 "(null)"

243 - - fast-export: Omit tags that tag trees

244 - - fast-export: Set revs.topo_order before calling setup_revisions

216 + + fast-export: Omit tags that tag trees

217 + + fast-export: Set revs.topo_order before calling setup_revisions

218

219 Shawn? Dscho?

220

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

249 - - diff: Rename QUIET internal option to QUICK

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

251 -

252 -I am not sure if it should wait for a major version bump but this is a

253 -good semantics change. Perhaps merge to 'next' soonish, but I am

254 -undecided. Comments?

222 + + diff: Rename QUIET internal option to QUICK

223 + + diff: change semantics of "ignore whitespace" options

224

256 -For the following three series, I have not managed to convince myself if

257 -these changes have real-world needs.

225 +Possibly merge during 1.6.5, or 1.7.0 since this is a semantics change.

226

227 * sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits

260 - - read-tree: migrate to parse-options

261 - - read-tree: convert unhelpful usage()'s to helpful die()'s

228 + + read-tree: migrate to parse-options

229 + + read-tree: convert unhelpful usage()'s to helpful die()'s

230 +

231 +Will merge after 1.6.4

232

233 * ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit

264 - - Shift object enumeration out of upload-pack

234 + + Shift object enumeration out of upload-pack

235 +

236 +Will merge after 1.6.4

237

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

267 - - t6050: check pushing something based on a replaced commit

268 - - Documentation: add documentation for "git replace"

269 - - Add git-replace to .gitignore

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

271 - - parse-options: add new function "usage_msg_opt"

272 - - builtin-replace: teach "git replace" to actually replace

273 - - Add new "git replace" command

274 - - environment: add global variable to disable replacement

275 - - mktag: call "check_sha1_signature" with the replacement sha1

276 - - replace_object: add a test case

277 - - object: call "check_sha1_signature" with the replacement sha1

278 - - sha1_file: add a "read_sha1_file_repl" function

279 - - replace_object: add mechanism to replace objects found in

239 + + t6050: check pushing something based on a replaced commit

240 + + Documentation: add documentation for "git replace"

241 + + Add git-replace to .gitignore

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

243 + + parse-options: add new function "usage_msg_opt"

244 + + builtin-replace: teach "git replace" to actually replace

245 + + Add new "git replace" command

246 + + environment: add global variable to disable replacement

247 + + mktag: call "check_sha1_signature" with the replacement sha1

248 + + replace_object: add a test case

249 + + object: call "check_sha1_signature" with the replacement sha1

250 + + sha1_file: add a "read_sha1_file_repl" function

251 + + replace_object: add mechanism to replace objects found in

252 "refs/replace/"

281 - - refs: add a "for_each_replace_ref" function

282 -

283 -----------------------------------------------------------------

284 -[On Hold]

253 + + refs: add a "for_each_replace_ref" function

254

255 * jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit

256 - receive-pack: default receive.denyDeleteCurrent to refuse

@@ -291,4 +260,19 @@ these changes have real-world needs.

260 push

261

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

294 -to be rethought.

263 +to be rethought. Will be kept in 'next' during 1.6.5 cycle.

264 +

265 +----------------------------------------------------------------

266 +[Dropped]

267 +

268 +* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit

269 + - mailinfo: Remove only one set of square brackets

270 +

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

272 + . Add initial support for pathname conversion to UTF-8

273 + . read_directory(): infrastructure for pathname character set

274 + conversion

275 + . Add 'fill_directory()' helper function for directory traversal

276 +

277 +It appears that we may want to settle with a MacOS X specific conversion,

278 +if somebody really cares enough.

What's cooking (2009/07 #02)