d45cde1e4c · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2011, #12; Thu, 26)

3 -X-master-at: 5cfe4256d98af22a570c78c5e3048391a90f5f98

4 -X-next-at: 9f46ca0aec6956294992cda67b91c2fc82a8efa6

2 +Subject: What's cooking in git.git (May 2011, #13; Mon, 30)

3 +X-master-at: fb674d767180354d9ad3e69f1d41bee98df6bfe9

4 +X-next-at: 35b875275a07d8eae7e77225fb415fea6f2c0be7

5

6 -What's cooking in git.git (May 2011, #12; Thu, 26)

6 +What's cooking in git.git (May 2011, #13; Mon, 30)

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

8

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

@@ -12,54 +12,198 @@ only in 'pu' while commits prefixed with '+' are in 'next'.

12 The main part of this cycle is expected to run thru May, aiming for a

13 feature freeze in early June.

14

15 -We are in the middle of week #5 of this cycle. Let's plan to tag -rc0 with

16 -what is in 'master' at the end of the month.

15 +Week #6 of this cycle is just about to begin.

16

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

18 [New Topics]

19

21 -* jc/fmt-req-fix (2011-05-25) 1 commit

22 - (merged to 'next' on 2011-05-25 at 9f46ca0)

23 - + userformat_find_requirements(): find requirement for the correct format

20 +* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits

21 + - builtin/commit.c: set status_format _after_ option parsing

22 + - t7508: demonstrate status's failure to use --porcelain format with -z

23

25 -* jk/maint-config-alias-fix (2011-05-24) 4 commits

26 - (merged to 'next' on 2011-05-25 at 25b86e4)

27 - + handle_options(): do not miscount how many arguments were used

28 - + config: always parse GIT_CONFIG_PARAMETERS during git_config

29 - + git_config: don't peek at global config_parameters

30 - + config: make environment parsing routines static

24 +Will cook a bit longer.

25 +

26 +* jk/format-patch-am (2011-05-26) 5 commits

27 + (merged to 'next' on 2011-05-30 at 29d5dac)

28 + + format-patch: preserve subject newlines with -k

29 + + clean up calling conventions for pretty.c functions

30 + + pretty: add pp_commit_easy function for simple callers

31 + + mailinfo: always clean up rfc822 header folding

32 + + t: test subject handling in format-patch / am pipeline

33 +

34 +Will cook a bit longer.

35 +

36 +* jk/maint-remote-mirror-safer (2011-05-26) 1 commit

37 + (merged to 'next' on 2011-05-30 at dc260ff)

38 + + remote: allow "-t" with fetch mirrors

39 +

40 +Will merge to "master".

41 +

42 +* jk/read-in-full-stops-on-error (2011-05-26) 1 commit

43 + (merged to 'next' on 2011-05-30 at 102a220)

44 + + read_in_full: always report errors

45 +

46 +Will merge to "master".

47 +

48 +* ef/maint-win-verify-path (2011-05-27) 3 commits

49 + - verify_path: consider dos drive prefix

50 + - real_path: do not assume '/' is the path seperator

51 + - A Windows path starting with a backslash is absolute

52 +

53 +J6t had a reasonable question in the discussion.

54 +

55 +* jc/apply-nsbp (2011-05-27) 4 commits

56 + - War on nbsp: teach "git apply" to check and fix nbsp

57 + - War on nbsp: Add "nbsp" whitespace breakage class

58 + - War on nbsp: a bit of retreat

59 + - ws.c: add a helper to format comma separated messages

60 +

61 +Will probably drop.

62 +It was fun to write, though.

63 +

64 +* jc/log-quiet-fix (2011-05-28) 1 commit

65 + (merged to 'next' on 2011-05-30 at dcbdbc0)

66 + + log: --quiet should serve as synonym to -s

67 +

68 +Will merge to "master".

69 +

70 +* jk/maint-docs (2011-05-26) 4 commits

71 + (merged to 'next' on 2011-05-30 at 0ed19d6)

72 + + docs: fix some antique example output

73 + + docs: make sure literal "->" isn't converted to arrow

74 + + docs: update status --porcelain format

75 + + docs: minor grammar fixes to git-status

76 +

77 +Will merge to "master".

78 +

79 +* jk/rebase-head-reflog (2011-05-27) 2 commits

80 + (merged to 'next' on 2011-05-30 at 97f02df)

81 + + rebase: write a reflog entry when finishing

82 + + rebase: create HEAD reflog entry when aborting

83 +

84 +Will merge to "master".

85 +

86 +* jn/gitweb-js-blame (2011-05-27) 3 commits

87 + - gitweb.js: use setTimeout rather than setInterval in blame_incremental.js

88 + - gitweb.js: No need for loop in blame_incremental's handleResponse()

89 + - gitweb.js: No need for inProgress in blame_incremental.js

90 +

91 +Will cook a bit longer.

92 +

93 +* kk/maint-prefix-in-config-mak (2011-05-27) 1 commit

94 + (merged to 'next' on 2011-05-30 at 35b8752)

95 + + config.mak.in: allow "configure --sysconfdir=/else/where"

96 +

97 +Will merge to "master".

98 +

99 +* ab/i18n-envsubst-doc-fix (2011-05-30) 1 commit

100 + - git-sh-i18n--envsubst: add SYNOPSIS section to the documentation

101 +

102 +Will merge to "next" and then soon to "master".

103

104 --------------------------------------------------

105 [Graduated to "master"]

106

35 -* jc/bigfile (2011-05-13) 3 commits

36 - (merged to 'next' on 2011-05-15 at 0ee7144)

37 - + Bigfile: teach "git add" to send a large file straight to a pack

38 - + index_fd(): split into two helper functions

39 - + index_fd(): turn write_object and format_check arguments into one flag

40 - (this branch is used by jc/streaming and jc/streaming-filter.)

41 -

42 -This covers the entry point for a big file to the system. Other parts that

43 -need to know about them are the exit point (i.e. write_entry()), packing

44 -and repacking (as long as bigfilethreshold is sane this should work),

45 -diffs and status (avoid slurping large binary in core only to do nothing,

46 -which we already should), and transport (receive-pack/fetch-pack call

47 -either unpack-objects or index-pack, which still want to hold the full

48 -object in-core and need to be fixed).

49 -

50 -* js/log-abbrev-commit-config (2011-05-18) 2 commits

51 - (merged to 'next' on 2011-05-23 at 4e7e932)

52 - + Add log.abbrevCommit config variable

53 - + "git log -h": typofix misspelled 'suppress'

107 +* bc/maint-api-doc-parked (2011-05-26) 1 commit

108 + + Documentation/technical/api-diff.txt: correct name of diff_unmerge()

109

55 ---------------------------------------------------

56 -[Stalled]

110 +* bc/maint-submodule-fix-parked (2011-05-26) 1 commit

111 + + git-submodule.sh: separate parens by a space to avoid confusing some shells

112

58 -* mg/diff-stat-count (2011-05-03) 2 commits

59 - - diff-options.txt: describe --stat-{width,name-width,count}

60 - - diff: introduce --stat-count to limit the stat lines

113 +* jc/notes-batch-removal (2011-05-19) 4 commits

114 + (merged to 'next' on 2011-05-23 at 5bd78a6)

115 + + show: --ignore-missing

116 + + notes remove: --stdin reads from the standard input

117 + + notes remove: --ignore-missing

118 + + notes remove: allow removing more than one

119

62 -There was a miscounting spotted. Needs another round.

120 +* jc/require-work-tree-exists (2011-05-24) 1 commit

121 + (merged to 'next' on 2011-05-24 at 6dbbf00)

122 + + require-work-tree wants more than what its name says

123 +

124 +Rerolled _without_ any in-tree users, just to make sure that we can easily

125 +adapt scripts when necessary in the future.

126 +

127 +* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit

128 + (merged to 'next' on 2011-05-23 at b56fb81)

129 + + fetch: avoid repeated commits in mark_complete

130 +

131 +Trivially correct.

132 +

133 +* jk/haves-from-alternate-odb (2011-05-19) 3 commits

134 + (merged to 'next' on 2011-05-23 at 53b4735)

135 + + receive-pack: eliminate duplicate .have refs

136 + + bisect: refactor sha1_array into a generic sha1 list

137 + + refactor refs_from_alternate_cb to allow passing extra data

138 +

139 +* jm/maint-misc-fix (2011-05-26) 3 commits

140 + + read_gitfile_gently: use ssize_t to hold read result

141 + + remove tests of always-false condition

142 + + rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'

143 +

144 +* jn/ctags-more (2011-04-29) 3 commits

145 + (merged to 'next' on 2011-05-24 at 41b50be)

146 + + gitweb: Optional grouping of projects by category

147 + + gitweb: Modularized git_get_project_description to be more generic

148 + + gitweb: Split git_project_list_body in two functions

149 +

150 +* jn/gitweb-js (2011-05-24) 11 commits

151 + (merged to 'next' on 2011-05-24 at c385b9d)

152 + + gitweb: Make JavaScript ability to adjust timezones configurable

153 + + gitweb.js: Add UI for selecting common timezone to display dates

154 + + gitweb: JavaScript ability to adjust time based on timezone

155 + + gitweb: Unify the way long timestamp is displayed

156 + + gitweb: Refactor generating of long dates into format_timestamp_html

157 + + gitweb.js: Provide getElementsByClassName method (if it not exists)

158 + + gitweb.js: Introduce code to handle cookies from JavaScript

159 + + gitweb.js: Extract and improve datetime handling

160 + + gitweb.js: Provide default values for padding in padLeftStr and padLeft

161 + + gitweb.js: Update and improve comments in JavaScript files

162 + + gitweb: Split JavaScript for maintability, combining on build

163 +

164 +Rebased on top of a more recent "master" that already has the two bottom

165 +commits in the previous round of series.

166 +

167 +As nobody seems to be helping gitweb maintenance, I'll merge the above two

168 +series to "master" and see if anybody screams. That seems to be the only

169 +way to make any progress.

170 +

171 +* jn/userdiff-perl-updates (2011-05-23) 8 commits

172 + (merged to 'next' on 2011-05-23 at 2595ae1)

173 + + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters

174 + + tests: make test_expect_code quieter on success

175 + + userdiff/perl: catch sub with brace on second line

176 + + userdiff/perl: match full line of POD headers

177 + + userdiff/perl: anchor "sub" and "package" patterns on the left

178 + + t4018 (funcname patterns): minor cleanups

179 + + t4018 (funcname patterns): make configuration easier to track

180 + + t4018 (funcname patterns): make .gitattributes state easier to track

181 +

182 +* mk/grep-pcre (2011-05-23) 13 commits

183 + (merged to 'next' on 2011-05-23 at fbd4877)

184 + + git-grep: Update tests (mainly for -P)

185 + (merged to 'next' on 2011-05-16 at 0c6c25e)

186 + + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

187 + + git-grep: update tests now regexp type is "last one wins"

188 + (merged to 'next' on 2011-05-15 at d110135)

189 + + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.

190 + + git-grep: Bail out when -P is used with -F or -E

191 + + grep: Add basic tests

192 + + configure: Check for libpcre

193 + + git-grep: Learn PCRE

194 + + grep: Extract compile_regexp_failed() from compile_regexp()

195 + + grep: Fix a typo in a comment

196 + (merged to 'next' on 2011-05-08 at 5d3bede)

197 + + grep: Put calls to fixmatch() and regmatch() into patmatch()

198 + + contrib/completion: --line-number to git grep

199 + + Documentation: Add --line-number to git-grep synopsis

200 +

201 +* rg/no-gecos-in-pwent (2011-05-19) 1 commit

202 + (merged to 'next' on 2011-05-23 at d2c4c33)

203 + + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd

204 +

205 +--------------------------------------------------

206 +[Stalled]

207

208 * jk/maint-merge-rename-create (2011-03-25) 3 commits

209 - merge: turn on rewrite detection

@@ -92,19 +236,43 @@ current usage context.

236 --------------------------------------------------

237 [Cooking]

238

239 +* mg/diff-stat-count (2011-05-27) 4 commits

240 + - diff --stat-count: finishing touches

241 + - diff-options.txt: describe --stat-{width,name-width,count}

242 + - diff: introduce --stat-lines to limit the stat lines

243 + - diff.c: omit hidden entries from namelen calculation with --stat

244 +

245 +Will cook a bit longer.

246 +

247 +* jc/fmt-req-fix (2011-05-25) 1 commit

248 + (merged to 'next' on 2011-05-25 at 9f46ca0)

249 + + userformat_find_requirements(): find requirement for the correct format

250 +

251 +Will merge to "master".

252 +

253 +* jk/maint-config-alias-fix (2011-05-24) 4 commits

254 + (merged to 'next' on 2011-05-25 at 25b86e4)

255 + + handle_options(): do not miscount how many arguments were used

256 + + config: always parse GIT_CONFIG_PARAMETERS during git_config

257 + + git_config: don't peek at global config_parameters

258 + + config: make environment parsing routines static

259 +

260 +Will merge to "master".

261 +

262 * jl/read-tree-m-dry-run (2011-05-25) 2 commits

96 - - Teach read-tree the -n|--dry-run option

97 - - unpack-trees: add the dry_run flag to unpack_trees_options

263 + (merged to 'next' on 2011-05-30 at 42febaf)

264 + + Teach read-tree the -n|--dry-run option

265 + + unpack-trees: add the dry_run flag to unpack_trees_options

266

99 -Will merge to "next".

267 +Will merge to "master".

268

101 -* da/git-prefix-everywhere (2011-05-23) 3 commits

102 - - git-mergetool--lib: Make vimdiff retain the current directory

103 - - git: Remove handling for GIT_PREFIX

104 - - setup: Provide GIT_PREFIX to built-ins

269 +* da/git-prefix-everywhere (2011-05-26) 3 commits

270 + (merged to 'next' on 2011-05-30 at 9480900)

271 + + git-mergetool--lib: Make vimdiff retain the current directory

272 + + git: Remove handling for GIT_PREFIX

273 + + setup: Provide GIT_PREFIX to built-ins

274

106 -Is everybody happy with this?

107 -Will merge to "next".

275 +Will cook a bit longer.

276

277 * jh/receive-count-limit (2011-05-23) 10 commits

278 - receive-pack: Allow server to refuse pushes with too many objects

@@ -119,79 +287,9 @@ Will merge to "next".

287 - Update technical docs to reflect side-band-64k capability in receive-pack

288

289 Would need another round to separate per-pack and per-session limits.

290 +Not urgent. Will not merge before 1.7.6.

291

123 -* jc/require-work-tree-exists (2011-05-24) 1 commit

124 - (merged to 'next' on 2011-05-24 at 6dbbf00)

125 - + require-work-tree wants more than what its name says

126 -

127 -Rerolled _without_ any in-tree users, just to make sure that we can easily

128 -adapt scripts when necessary in the future.

129 -

130 -Will merge to "master" by the end of week #5.

131 -

132 -* jn/gitweb-js (2011-05-24) 11 commits

133 - (merged to 'next' on 2011-05-24 at c385b9d)

134 - + gitweb: Make JavaScript ability to adjust timezones configurable

135 - + gitweb.js: Add UI for selecting common timezone to display dates

136 - + gitweb: JavaScript ability to adjust time based on timezone

137 - + gitweb: Unify the way long timestamp is displayed

138 - + gitweb: Refactor generating of long dates into format_timestamp_html

139 - + gitweb.js: Provide getElementsByClassName method (if it not exists)

140 - + gitweb.js: Introduce code to handle cookies from JavaScript

141 - + gitweb.js: Extract and improve datetime handling

142 - + gitweb.js: Provide default values for padding in padLeftStr and padLeft

143 - + gitweb.js: Update and improve comments in JavaScript files

144 - + gitweb: Split JavaScript for maintability, combining on build

145 -

146 -Rebased on top of a more recent "master" that already has the two bottom

147 -commits in the previous round of series.

148 -

149 -Will merge to "master" by the end of week #5.

150 -

151 -* jn/ctags-more (2011-04-29) 3 commits

152 - (merged to 'next' on 2011-05-24 at 41b50be)

153 - + gitweb: Optional grouping of projects by category

154 - + gitweb: Modularized git_get_project_description to be more generic

155 - + gitweb: Split git_project_list_body in two functions

156 -

157 -As nobody seems to be helping gitweb maintenance, I'll merge the above two

158 -series to "master" and see if anybody screams. That seems to be the only

159 -way to make any progress.

160 -

161 -Will merge to "master" by the end of week #5.

162 -

163 -* jc/notes-batch-removal (2011-05-19) 4 commits

164 - (merged to 'next' on 2011-05-23 at 5bd78a6)

165 - + show: --ignore-missing

166 - + notes remove: --stdin reads from the standard input

167 - + notes remove: --ignore-missing

168 - + notes remove: allow removing more than one

169 -

170 -Will merge to "master" by the end of week #5.

171 -

172 -* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit

173 - (merged to 'next' on 2011-05-23 at b56fb81)

174 - + fetch: avoid repeated commits in mark_complete

175 -

176 -Trivially correct.

177 -Will merge to "master" by the end of week #5.

178 -

179 -* jk/haves-from-alternate-odb (2011-05-19) 3 commits

180 - (merged to 'next' on 2011-05-23 at 53b4735)

181 - + receive-pack: eliminate duplicate .have refs

182 - + bisect: refactor sha1_array into a generic sha1 list

183 - + refactor refs_from_alternate_cb to allow passing extra data

184 -

185 -Will merge to "master" by the end of week #5.

186 -

187 -* rg/no-gecos-in-pwent (2011-05-19) 1 commit

188 - (merged to 'next' on 2011-05-23 at d2c4c33)

189 - + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd

190 -

191 -Trivially correct and not intrusive, but the real value unknown.

192 -Will merge to "master" by the end of week #5.

193 -

194 -* jc/streaming-filter (2011-05-24) 8 commits

292 +* jc/streaming-filter (2011-05-26) 8 commits

293 - t0021: test application of both crlf and ident

294 - t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test

295 - streaming: filter cascading

@@ -204,20 +302,8 @@ Will merge to "master" by the end of week #5.

302

303 Trivial lf-to-crlf and ident conversions can be performed without reading

304 everything in-core first.

207 -Not urgent. Will not merge before 1.7.6.

305

209 -* jn/userdiff-perl-updates (2011-05-23) 8 commits

210 - (merged to 'next' on 2011-05-23 at 2595ae1)

211 - + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters

212 - + tests: make test_expect_code quieter on success

213 - + userdiff/perl: catch sub with brace on second line

214 - + userdiff/perl: match full line of POD headers

215 - + userdiff/perl: anchor "sub" and "package" patterns on the left

216 - + t4018 (funcname patterns): minor cleanups

217 - + t4018 (funcname patterns): make configuration easier to track

218 - + t4018 (funcname patterns): make .gitattributes state easier to track

219 -

220 -Will merge to "master" by the end of week #5.

306 +Not urgent. Will not merge before 1.7.6.

307

308 * jk/combine-diff-binary-etc (2011-05-24) 5 commits

309 (merged to 'next' on 2011-05-24 at 07cf180)

@@ -227,15 +313,17 @@ Will merge to "master" by the end of week #5.

313 + combine-diff: calculate mode_differs earlier

314 + combine-diff: split header printing into its own function

315

230 -Will merge to "master" by the end of month.

316 +Not urgent. Will not merge before 1.7.6.

317

318 * jc/advice-about-to-lose-commit (2011-05-24) 1 commit

233 - - checkout: make advice when reattaching the HEAD less loud

319 + (merged to 'next' on 2011-05-30 at 42385cc)

320 + + checkout: make advice when reattaching the HEAD less loud

321

235 -Re-rolled and resurrected from "Stalled" status.

236 -Will merge to "next".

322 +Not urgent. Will not merge before 1.7.6.

323

238 -* jc/streaming (2011-05-20) 13 commits

324 +* jc/streaming (2011-05-26) 14 commits

325 + (merged to 'next' on 2011-05-26 at 7fdda8d)

326 + + sha1_file: use the correct type (ssize_t, not size_t) for read-style function

327 (merged to 'next' on 2011-05-23 at 7fd0b52)

328 + streaming: read loose objects incrementally

329 + sha1_file.c: expose helpers to read loose objects

@@ -306,56 +394,4 @@ Not urgent. Will not merge before 1.7.6.

394 + i18n: git-am add git-sh-i18n

395

396 Rerolled.

309 -

310 -* mk/grep-pcre (2011-05-23) 13 commits

311 - (merged to 'next' on 2011-05-23 at fbd4877)

312 - + git-grep: Update tests (mainly for -P)

313 - (merged to 'next' on 2011-05-16 at 0c6c25e)

314 - + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

315 - + git-grep: update tests now regexp type is "last one wins"

316 - (merged to 'next' on 2011-05-15 at d110135)

317 - + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.

318 - + git-grep: Bail out when -P is used with -F or -E

319 - + grep: Add basic tests

320 - + configure: Check for libpcre

321 - + git-grep: Learn PCRE

322 - + grep: Extract compile_regexp_failed() from compile_regexp()

323 - + grep: Fix a typo in a comment

324 - (merged to 'next' on 2011-05-08 at 5d3bede)

325 - + grep: Put calls to fixmatch() and regmatch() into patmatch()

326 - + contrib/completion: --line-number to git grep

327 - + Documentation: Add --line-number to git-grep synopsis

328 -

329 -There was a confused test around BRE caused by GNU extension people so

330 -used to use without even realizing it is GNU extension.

331 -

332 -Will merge to "master" by the middle of week #5.

333 -

334 ---------------------------------------------------

335 -[Discarded]

336 -

337 -* hg/add-i-qq (2011-05-17) 1 commit

338 - . add-interactive: add 'Quit' shortcut to add hunk and quit

339 -

340 -The question "why is y+q any more deserving for a short-cut than d+q" was

341 -raised late in the discussion, and I think it a very valid concern.

342 -

343 -* jc/add-delete-default (2011-04-27) 1 commit

344 - . git add: notice removal of tracked paths by default

345 -

346 -This is ill-thought out. When the user does want to say "take all changes

347 -into account, not just addition", they can easily say "add -u" (update).

348 -

349 -* jc/dotdot-is-parent-directory (2011-05-04) 1 commit

350 - . specifying ranges: we did not mean to make ".." an empty set

351 -

352 -Updated documentation, but I do not feel a strong enough annoyance to push

353 -this forward.

354 -

355 -* jc/fix-config-environment-passing (2011-05-24) 1 commit

356 - . Allow built-ins to also use -c var=val via alias

357 -

358 -* jc/git-handle-options-miscount (2011-05-24) 1 commit

359 - . handle_options(): do not miscount how many arguments were used

360 -

361 -These two have been discarded; jk/maint-config-alias-fix replaces them.

397 +Will cook a bit longer.

What's cooking (2011/05 #13)