ceb2b86a81 · matheusbsbs/matheus-bagliano

@@ -1,115 +1,113 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2011, #05; Wed, 11)

3 -X-master-at: dbe9c5adf95e99c35dd728af2114fccfb9117c65

4 -X-next-at: 5aaf5cf1a3addf544db48634fb8abc1aec4e8174

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

3 +X-master-at: 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427

4 +X-next-at: fcbf71a2ac7af454bec14832c8dfba57e793dda7

5

6 -What's cooking in git.git (May 2011, #05; Wed, 11)

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

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 am somewhat frustrated that I so almost no reviews on gitweb

13 +patches. Does this mean nobody is interested in viewing the projects

14 +on gitweb? How can we improve this lack of review bandwidth situation?

15 +

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

17 feature freeze in early June.

18

15 -We are in the middle of week #3.

19 +We are about to finish the week #3 of this cycle.

20

21 --------------------------------------------------

22 [Graduated to "master"]

23

20 -* dm/http-cleanup (2011-05-04) 4 commits

21 - (merged to 'next' on 2011-05-06 at 711ff78)

22 - + t5541-http-push: add test for chunked

23 - + http-push: refactor curl_easy_setup madness

24 - + http-push: use const for strings in signatures

25 - + http: make curl callbacks match contracts from curl header

26 -

27 -* jc/maint-add-p-overlapping-hunks (2011-05-08) 5 commits

28 - (merged to 'next' on 2011-05-08 at bcf9228)

29 - + t3701: add-p-fix makes the last test to pass

30 - (merged to 'next' on 2011-05-02 at e57b66f)

31 - + "add -p": work-around an old laziness that does not coalesce hunks

32 - + add--interactive.perl: factor out repeated --recount option

33 - + t3701: Editing a split hunk in an "add -p" session

34 - + add -p: 'q' should really quit

35 -

36 -* jc/maint-branch-mergeoptions (2011-05-06) 1 commit

37 - (merged to 'next' on 2011-05-08 at fa6b154)

38 - + merge: make branch.<name>.mergeoptions correctly override merge.<option>

39 - (this branch is used by mg/merge-ff-config.)

40 -

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

42 - (merged to 'next' on 2011-05-06 at 5c574ff)

43 - + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)

44 - + gitweb: Change the way "content tags" ('ctags') are handled

45 - + gitweb: Restructure projects list generation

46 - (this branch is used by jn/ctags-more.)

47 -

48 -* jn/gitweb-dependency (2011-05-08) 2 commits

49 - (merged to 'next' on 2011-05-08 at 9101342)

50 - + Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

51 - + git-instaweb: Simplify build dependency on gitweb

52 -

53 -* jn/maint-test-merge-verify-parents (2011-05-06) 2 commits

54 - (merged to 'next' on 2011-05-08 at 35a7c66)

55 - + tests: teach verify_parents to check for extra parents

56 - + tests: eliminate unnecessary setup test assertions

57 -

58 -* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit

59 - (merged to 'next' on 2011-05-08 at 367b148)

60 - + fast-import: fix option parser for no-arg options

61 -

62 -* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits

63 - (merged to 'next' on 2011-05-06 at 46b522c)

64 - + git-reset.txt: better docs for '--patch'

65 - + git-checkout.txt: better docs for '--patch'

66 - + git-stash.txt: better docs for '--patch'

67 - + git-add.txt: document 'interactive.singlekey'

68 - + config.txt: 'interactive.singlekey; is used by...

69 - (this branch is used by ci/commit--interactive-atomic.)

24 +* bf/commit-template-no-cleanup (2011-05-11) 1 commit

25 + (merged to 'next' on 2011-05-11 at 01fde0d)

26 + + Do not strip empty lines / trailing spaces from a commit message template

27 +

28 +* cn/log-parse-opt (2011-04-14) 1 commit

29 + (merged to 'next' on 2011-04-28 at 02f2eac)

30 + + log: convert to parse-options

31 +

32 +* jc/fix-add-u-unmerged (2011-04-23) 1 commit

33 + (merged to 'next' on 2011-04-28 at f7ed821)

34 + + Fix "add -u" that sometimes fails to resolve unmerged paths

35 + (this branch is used by jc/add-delete-default.)

36 +

37 +* jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit

38 + (merged to 'next' on 2011-05-11 at 6c8619e)

39 + + t1507: avoid "${parameter<op>'word'}" inside double-quotes

40 +

41 +* jh/dirstat-lines (2011-04-29) 8 commits

42 + (merged to 'next' on 2011-04-29 at a302674)

43 + + Mark dirstat error messages for translation

44 + + Improve error handling when parsing dirstat parameters

45 + + New --dirstat=lines mode, doing dirstat analysis based on diffstat

46 + + Allow specifying --dirstat cut-off percentage as a floating point number

47 + + Add config variable for specifying default --dirstat behavior

48 + + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file

49 + + Make --dirstat=0 output directories that contribute < 0.1% of changes

50 + + Add several testcases for --dirstat and friends

51 +

52 +* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits

53 + (merged to 'next' on 2011-04-28 at 6006cc4)

54 + + revisions: allow --glob and friends in parse_options-enabled commands

55 + + revisions: split out handle_revision_pseudo_opt function

56 +

57 +* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

58 + + send-pack: unbreak push over stateless rpc

59 + + send-pack: avoid deadlock when pack-object dies early

60 + (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)

61 +

62 +* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

63 + (merged to 'next' on 2011-05-05 at 3f4ffb9)

64 + + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

65 + (merged to 'next' on 2011-04-28 at db7e04a)

66 + + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

67 + (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)

68 +

69 +* rr/rerere-libify-clear-gc (2011-05-08) 1 commit

70 + (merged to 'next' on 2011-05-11 at b1d8c88)

71 + + rerere: libify rerere_clear() and rerere_gc()

72 +

73 +This is pure code movement. Changing them to suit the need of other

74 +callers can be built on it as separate patches.

75

76 --------------------------------------------------

77 [New Topics]

78

74 -* jc/bigfile (2011-05-09) 3 commits

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

76 - - index_fd(): split into two helper functions

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

79 +* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

80 + + setup_revisions(): take pathspec from command line and --stdin correctly

81 + (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)

82

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

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

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

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

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

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

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

83 +* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit

84 + - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

85 + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)

86

87 -* jc/convert (2011-05-09) 4 commits

88 - - convert: make it harder to screw up adding a conversion attribute

89 - - convert: make it safer to add conversion attributes

90 - - convert: give saner names to crlf/eol variables, types and functions

91 - - convert: rename the "eol" global variable to "core_eol"

92 -

93 -Just a clean-up.

94 -Will merge to "next" by the end of week #3.

87 +* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits

88 + - Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

89 + - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

90 + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)

91

96 -* jk/blame-line-porcelain (2011-05-09) 3 commits

97 - - blame: add --line-porcelain output format

98 - - blame: refactor porcelain output

99 - - add tests for various blame formats

92 +These are to fix an ancient bug where feeding "git log --stdin path" with

93 +an input that also has additional pathspec corrupted memory.

94

101 -* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit

102 - - tag: disallow '-' as tag name

95 +* jl/read-tree-m-dry-run (2011-05-11) 1 commit

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

97

104 -Will merge to "next" by the end of week #3.

98 +Looked good. We _might_ want to make -n simply ignore -u, though.

99

106 -* fc/completion-zsh (2011-05-10) 1 commit

107 - + git-completion: fix regression in zsh support

108 - (this branch is used by sg/completion-updates.)

100 +* jc/streaming (2011-05-12) 5 commits

101 + - write_entry(): use streaming API for writing working tree files

102 + - stream: a streaming interface to read from the object store

103 + - sha1_object_info_extended(): expose a bit more information from object-info

104 + - write_entry(): separate two helper functions out

105 + - packed_object_info_detail(): do not return a string

106 + (this branch uses jc/convert.)

107

110 -* nd/sparse-co-fix (2011-05-10) 2 commits

111 - - sparse checkout: do not eagerly decide the fate for whole directory

112 - - t1011: fix sparse-checkout initialization and add new file

108 +The counterpart to jc/bigfile to cover the write-out codepath. This does

109 +not yet have "read directly from pack or loose object without slurping the

110 +whole thing in memory" yet, which is still work in progress.

111

112 --------------------------------------------------

113 [Stalled]

@@ -153,7 +151,6 @@ is a sane use case, though. May drop.

151

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

153 - git add: notice removal of tracked paths by default

156 - (this branch uses jc/fix-add-u-unmerged.)

154

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

156 - merge: turn on rewrite detection

@@ -197,6 +194,47 @@ Needs to tighten the advice to only govern the generic How-to part.

194 --------------------------------------------------

195 [Cooking]

196

197 +* jc/bigfile (2011-05-12) 3 commits

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

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

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

201 +

202 +This covers the entry point for a big file to the system. Other parts that

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

204 +and repacking (as long as bigfilethreshold is sane this should work),

205 +diffs and status (avoid slurping large binary in core only to do nothing,

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

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

208 +object in-core and need to be fixed).

209 +

210 +* jc/convert (2011-05-09) 4 commits

211 + - convert: make it harder to screw up adding a conversion attribute

212 + - convert: make it safer to add conversion attributes

213 + - convert: give saner names to crlf/eol variables, types and functions

214 + - convert: rename the "eol" global variable to "core_eol"

215 + (this branch is used by jc/streaming.)

216 +

217 +Just a clean-up.

218 +Will merge to "next" by the end of week #3.

219 +

220 +* jk/blame-line-porcelain (2011-05-09) 3 commits

221 + - blame: add --line-porcelain output format

222 + - blame: refactor porcelain output

223 + - add tests for various blame formats

224 +

225 +* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit

226 + - tag: disallow '-' as tag name

227 +

228 +Will merge to "next" by the end of week #3.

229 +

230 +* fc/completion-zsh (2011-05-10) 1 commit

231 + + git-completion: fix regression in zsh support

232 + (this branch is used by sg/completion-updates.)

233 +

234 +* nd/sparse-co-fix (2011-05-10) 2 commits

235 + - sparse checkout: do not eagerly decide the fate for whole directory

236 + - t1011: fix sparse-checkout initialization and add new file

237 +

238 * kk/maint-prefix-in-config-mak (2011-05-09) 3 commits

239 (merged to 'next' on 2011-05-09 at 267a3aa)

240 + Honor $(prefix) set in config.mak* when defining ETC_GIT*

@@ -209,12 +247,6 @@ reasonable.

247

248 Will merge to "master" by the end of week #4.

249

212 -* bf/commit-template-no-cleanup (2011-05-11) 1 commit

213 - (merged to 'next' on 2011-05-11 at 01fde0d)

214 - + Do not strip empty lines / trailing spaces from a commit message template

215 -

216 -Will merge to "master" by the end of week #3.

217 -

250 * ci/commit--interactive-atomic (2011-05-10) 6 commits

251 (merged to 'next' on 2011-05-11 at 7f36fd8)

252 + Test atomic git-commit --interactive

@@ -226,15 +258,6 @@ Will merge to "master" by the end of week #3.

258

259 Will merge to "master" by the end of week #4.

260

229 -* rr/rerere-libify-clear-gc (2011-05-08) 1 commit

230 - (merged to 'next' on 2011-05-11 at b1d8c88)

231 - + rerere: libify rerere_clear() and rerere_gc()

232 -

233 -This is pure code movement. Changing them to suit the need of other

234 -callers can be built on it as separate patches.

235 -

236 -Will merge to "master" by the end of week #3.

237 -

261 * ab/i18n-scripts (2011-05-08) 48 commits

262 - i18n: git-bisect bisect_next_check "You need to" message

263 - i18n: git-bisect [Y/n] messages

@@ -293,13 +316,8 @@ Will merge to "master" by the end of week #3.

316 - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

317 (this branch is used by ab/i18n-scripts.)

318

296 -Will merge to "next" by the end of week #4.

297 -

298 -* jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit

299 - (merged to 'next' on 2011-05-11 at 6c8619e)

300 - + t1507: avoid "${parameter<op>'word'}" inside double-quotes

301 -

302 -Will merge to "master" by the end of week #3.

319 +Will be re-rolled to work around systems whose environment variable names

320 +are case insensitive.

321

322 * mg/merge-ff-config (2011-05-06) 3 commits

323 (merged to 'next' on 2011-05-08 at 977b432)

@@ -322,8 +340,6 @@ Will merge to "master" by the end of week #4.

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

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

342

325 -The tip is my "how about this" fix-up for the "Bail out" one.

326 -

343 Will merge to "next" by the end of week #3.

344

345 * sg/completion-updates (2011-05-10) 4 commits

@@ -350,56 +366,12 @@ Will merge to "master" by the end of week #4.

366

367 The tip one will be re-rolled.

368

353 -* jh/dirstat-lines (2011-04-29) 8 commits

354 - (merged to 'next' on 2011-04-29 at a302674)

355 - + Mark dirstat error messages for translation

356 - + Improve error handling when parsing dirstat parameters

357 - + New --dirstat=lines mode, doing dirstat analysis based on diffstat

358 - + Allow specifying --dirstat cut-off percentage as a floating point number

359 - + Add config variable for specifying default --dirstat behavior

360 - + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file

361 - + Make --dirstat=0 output directories that contribute < 0.1% of changes

362 - + Add several testcases for --dirstat and friends

363 -

364 -Will merge to "master" by the end of week #3.

365 -

366 -* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits

367 - (merged to 'next' on 2011-04-28 at 6006cc4)

368 - + revisions: allow --glob and friends in parse_options-enabled commands

369 - + revisions: split out handle_revision_pseudo_opt function

370 -

371 -Will merge to "master" by the end of week #3.

372 -

373 -* cn/log-parse-opt (2011-04-14) 1 commit

374 - (merged to 'next' on 2011-04-28 at 02f2eac)

375 - + log: convert to parse-options

376 -

377 -Will merge to "master" by the end of week #3.

378 -

379 -* jc/fix-add-u-unmerged (2011-04-23) 1 commit

380 - (merged to 'next' on 2011-04-28 at f7ed821)

381 - + Fix "add -u" that sometimes fails to resolve unmerged paths

382 - (this branch is used by jc/add-delete-default.)

383 -

384 -Will merge to "master" by the end of week #3.

385 -

386 -* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

387 - + send-pack: unbreak push over stateless rpc

388 - + send-pack: avoid deadlock when pack-object dies early

389 - (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)

390 -

391 -Will merge to "master" by the end of week #3.

392 -

393 -* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits

394 - (merged to 'next' on 2011-05-05 at 3f4ffb9)

395 - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

396 - (merged to 'next' on 2011-04-28 at db7e04a)

397 - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

398 - (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)

399 -

400 -Will merge to "master" by the end of week #3.

401 -

402 -* jc/magic-pathspec (2011-05-10) 10 commits

369 +* jc/magic-pathspec (2011-05-12) 13 commits

370 + (merged to 'next' on 2011-05-12 at 656c8b5)

371 + + t3703: Skip tests using directory name ":" on Windows

372 + (merged to 'next' on 2011-05-11 at 86d1d6d)

373 + + revision.c: leave a note for "a lone :" enhancement

374 + + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

375 (merged to 'next' on 2011-05-11 at aaad95e)

376 + t3703, t4208: add test cases for magic pathspec

377 + rev/path disambiguation: further restrict "misspelled index entry" diag

@@ -412,5 +384,6 @@ Will merge to "master" by the end of week #3.

384 + magic pathspec: add ":(icase)path" to match case insensitively

385 + magic pathspec: futureproof shorthand form

386 + magic pathspec: add tentative ":/path/from/top/level" pathspec support

387 + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)

388

389 This seems to need more time to mature than I expected.

What's cooking (2011/05 #06)