a322462556 · matheusbsbs/matheus-bagliano

@@ -1,24 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2012, #01; Tue, 2)

4 -X-master-at: b65f30b6b3bf34831b32a1b209bc1955f2bf79df

5 -X-next-at: e57700a8bba97a7ca41f5703b8cd8de489f06c07

3 +Subject: What's cooking in git.git (Oct 2012, #02; Thu, 4)

4 +X-master-at: f84667def209e4a84e37e8488a08e9eca3f208c1

5 +X-next-at: dedcea6fbaf681acdfc05f123d5aac3c8749e6e1

6

7 -What's cooking in git.git (Oct 2012, #01; Tue, 2)

7 +What's cooking in git.git (Oct 2012, #02; Thu, 4)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The tip of 'master' is a bit past v1.8.0-rc0; we are more or less

15 -feature complete, except for a few topics marked as "Will merge to

16 -'master' in the list below.

17 -

18 -I do not expect the topics in the stalled category will be ready for

19 -the upcoming release; they may appear in the release after v1.8.0 if

20 -they are rerolled. Also some of the topics that have been cooking

21 -in 'next' have to be deferred to the next cycle.

14 +The tip of 'master' is a bit past v1.8.0-rc0, and I would expect no

15 +more feature topic merges to 'master' until v1.8.0 final.

16

17 I'm planning to keep this cycle reasonably short and aim for tagging

18 the result as 1.8.0 at the end of 9th week, on October 21st, after

@@ -33,84 +27,80 @@ repositories listed at

27 --------------------------------------------------

28 [New Topics]

29

36 -* bw/config-lift-variable-name-length-limit (2012-10-01) 1 commit

37 - - Remove the hard coded length limit on variable names in config files

38 -

39 - The configuration parser had an unnecessary hardcoded limit on

40 - variable names that was not checked consistently. Lift the limit.

41 -

42 - Will merge to 'next'.

43 -

30 +* jc/doc-long-options (2012-10-04) 1 commit

31 + - gitcli: parse-options lets you omit tail of long options

32

45 -* jc/maint-t1450-fsck-order-fix (2012-10-02) 1 commit

46 - - t1450: the order the objects are checked is undefined

47 -

48 - The fsck test assumed too much on what kind of error it will

49 - detect. The only important thing is the inconsistency is detected

50 - as an error.

33 + The end-user facing documentation claimed to be an "exhaustive"

34 + list of features of parse-options command line parser, but it

35 + didn't mention anything about abbreviating long option names to

36 + their unique prefixes. Mention it, warn against relying too much on

37 + it (as uniqueness may disappear in future versions of Git), and

38 + drop the claim to be exhaustive.

39

52 - Will merge to 'next'.

53 -

54 ---------------------------------------------------

55 -[Graduated to "master"]

40

57 -* da/mergetool-custom (2012-09-25) 1 commit

58 - (merged to 'next' on 2012-09-27 at f910851)

59 - + mergetool--lib: Allow custom commands to override built-ins

41 +* jc/grep-pcre-loose-ends (2012-10-04) 6 commits

42 + . log --grep: honor grep.patterntype etc. configuration variables

43 + . log: pass rev_info to git_log_config()

44 + . log --grep: accept --basic-regexp and --perl-regexp

45 + - log --grep: use the same helper to set -E/-F options as "git grep"

46 + - grep: move pattern-type bits support to top-level grep.[ch]

47 + - grep: move configuration support to top-level grep.[ch]

48

61 - The actual external command to run for mergetool backend can be

62 - specified with difftool/mergetool.$name.cmd configuration

63 - variables, but this mechanism was ignored for the backends we

64 - natively support.

49 + "git log -F -E --grep='<ere>'" failed to use the given <ere>

50 + pattern as extended regular expression, and instead looked for the

51 + string literally. The early part of this series is a fix for it.

52

53

67 -* ep/malloc-check-perturb (2012-09-26) 1 commit

68 - (merged to 'next' on 2012-09-27 at f115b8b)

69 - + MALLOC_CHECK: enable it, unless disabled explicitly

54 +* jc/merge-bases-paint-fix (2012-10-04) 1 commit

55 + - paint_down_to_common(): parse commit before relying on its timestamp

56

71 - Fixes a brown-paper bag bug.

57 + "git fmt-merge-msg" (actually an internal helper reduce_heads() it

58 + uses) had a severe performance regression; an empty "git pull" took

59 + forever to finish as the result.

60

61 + Need to be merged before 1.8.0 final.

62

74 -* jc/blame-follows-renames (2012-09-21) 1 commit

75 - (merged to 'next' on 2012-09-27 at 12634c1)

76 - + git blame: document that it always follows origin across whole-file renames

77 - (this branch is used by jc/blame-no-follow.)

63

79 - Clarify the "blame" documentation to tell the users that there is

80 - no need to ask for "--follow".

64 +* jk/peel-ref (2012-10-04) 4 commits

65 + - upload-pack: use peel_ref for ref advertisements

66 + - peel_ref: check object type before loading

67 + - peel_ref: do not return a null sha1

68 + - peel_ref: use faster deref_tag_noverify

69

70 + Speeds up "git upload-pack" (what is invoked by "git fetch" on the

71 + other side of the connection) by reducing the cost to advertise the

72 + branches and tags that are available in the repository.

73

83 -* jk/completion-tests (2012-09-27) 2 commits

84 - (merged to 'next' on 2012-09-27 at 5cd6968)

85 - + t9902: add completion tests for "odd" filenames

86 - + t9902: add a few basic completion tests

87 -

74 +--------------------------------------------------

75 +[Graduated to "master"]

76

89 -* jk/receive-pack-unpack-error-to-pusher (2012-09-21) 3 commits

90 - (merged to 'next' on 2012-09-27 at 90f0c6f)

91 - + receive-pack: drop "n/a" on unpacker errors

92 - + receive-pack: send pack-processing stderr over sideband

93 - + receive-pack: redirect unpack-objects stdout to /dev/null

77 +* lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit

78 + (merged to 'next' on 2012-10-01 at 2a1cecc)

79 + + mailinfo: don't require "text" mime type for attachments

80

95 - Send errors from "unpack-objects" and "index-pack" back to the "git

96 - push" over the git and smart-http protocols, just like it is done

97 - for a push over the ssh protocol.

81 + A patch attached as application/octet-stream (e.g. not text/*) were

82 + mishandled, not correctly honoring Content-Transfer-Encoding

83 + (e.g. base64).

84

85

100 -* os/commit-submodule-ignore (2012-09-24) 1 commit

101 - (merged to 'next' on 2012-09-27 at 9cd2cfd)

102 - + commit: pay attention to submodule.$name.ignore in .gitmodules

86 +* nd/grep-reflog (2012-09-29) 4 commits

87 + (merged to 'next' on 2012-10-01 at 57773a6)

88 + + revision: make --grep search in notes too if shown

89 + + log --grep-reflog: reject the option without -g

90 + + revision: add --grep-reflog to filter commits by reflog messages

91 + + grep: prepare for new header field filter

92

104 - "git status" honored the ignore=dirty settings in .gitmodules but

105 - "git commit" didn't.

93 + Teach the commands from the "log" family the "--grep-reflog" option

94 + to limit output by string that appears in the reflog entry when the

95 + "--walk-reflogs" option is in effect.

96

97

108 -* rt/maint-clone-single (2012-09-20) 1 commit

109 - (merged to 'next' on 2012-09-27 at a47d54d)

110 - + clone --single: limit the fetch refspec to fetched branch

98 +* tu/gc-auto-quiet (2012-09-27) 1 commit

99 + (merged to 'next' on 2012-10-01 at ad8b91b)

100 + + silence git gc --auto --quiet output

101

112 - Running "git fetch" in a repository made with "git clone --single"

113 - slurps all the branches, defeating the point of "--single".

102 + "gc --auto" notified the user that auto-packing has triggered even

103 + under the "--quiet" option.

104

105 --------------------------------------------------

106 [Stalled]

@@ -159,29 +149,6 @@ repositories listed at

149 Has the "is this really blue?" issue Peff raised resolved???

150

151

162 -* fa/remote-svn (2012-09-19) 16 commits

163 - - Add a test script for remote-svn

164 - - remote-svn: add marks-file regeneration

165 - - Add a svnrdump-simulator replaying a dump file for testing

166 - - remote-svn: add incremental import

167 - - remote-svn: Activate import/export-marks for fast-import

168 - - Create a note for every imported commit containing svn metadata

169 - - vcs-svn: add fast_export_note to create notes

170 - - Allow reading svn dumps from files via file:// urls

171 - - remote-svn, vcs-svn: Enable fetching to private refs

172 - - When debug==1, start fast-import with "--stats" instead of "--quiet"

173 - - Add documentation for the 'bidi-import' capability of remote-helpers

174 - - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability

175 - - Add argv_array_detach and argv_array_free_detached

176 - - Add svndump_init_fd to allow reading dumps from arbitrary FDs

177 - - Add git-remote-testsvn to Makefile

178 - - Implement a remote helper for svn in C

179 - (this branch is used by fa/vcs-svn.)

180 -

181 - A GSoC project.

182 - Waiting for comments from mentors and stakeholders.

183 -

184 -

152 * fa/vcs-svn (2012-09-19) 4 commits

153 - vcs-svn: remove repo_tree

154 - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()

@@ -361,6 +328,49 @@ repositories listed at

328 --------------------------------------------------

329 [Cooking]

330

331 +* fa/remote-svn (2012-09-19) 16 commits

332 + - Add a test script for remote-svn

333 + - remote-svn: add marks-file regeneration

334 + - Add a svnrdump-simulator replaying a dump file for testing

335 + - remote-svn: add incremental import

336 + - remote-svn: Activate import/export-marks for fast-import

337 + - Create a note for every imported commit containing svn metadata

338 + - vcs-svn: add fast_export_note to create notes

339 + - Allow reading svn dumps from files via file:// urls

340 + - remote-svn, vcs-svn: Enable fetching to private refs

341 + - When debug==1, start fast-import with "--stats" instead of "--quiet"

342 + - Add documentation for the 'bidi-import' capability of remote-helpers

343 + - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability

344 + - Add argv_array_detach and argv_array_free_detached

345 + - Add svndump_init_fd to allow reading dumps from arbitrary FDs

346 + - Add git-remote-testsvn to Makefile

347 + - Implement a remote helper for svn in C

348 + (this branch is used by fa/vcs-svn.)

349 +

350 + A GSoC project.

351 + Acked-by: David Michael Barr <b@rr-dav.id.au>

352 +

353 +

354 +* bw/config-lift-variable-name-length-limit (2012-10-01) 1 commit

355 + - Remove the hard coded length limit on variable names in config files

356 +

357 + The configuration parser had an unnecessary hardcoded limit on

358 + variable names that was not checked consistently. Lift the limit.

359 +

360 + Will merge to 'next'.

361 +

362 +

363 +* jc/maint-t1450-fsck-order-fix (2012-10-02) 1 commit

364 + (merged to 'next' on 2012-10-02 at cc1a62e)

365 + + t1450: the order the objects are checked is undefined

366 +

367 + The fsck test assumed too much on what kind of error it will

368 + detect. The only important thing is the inconsistency is detected

369 + as an error.

370 +

371 + Will merge to 'next'.

372 +

373 +

374 * jl/submodule-add-by-name (2012-09-30) 2 commits

375 - submodule add: Fail when .git/modules/<name> already exists unless forced

376 - Teach "git submodule add" the --name option

@@ -378,41 +388,6 @@ repositories listed at

388 Will merge to 'next'.

389

390

381 -* nd/grep-reflog (2012-09-29) 4 commits

382 - (merged to 'next' on 2012-10-01 at 57773a6)

383 - + revision: make --grep search in notes too if shown

384 - + log --grep-reflog: reject the option without -g

385 - + revision: add --grep-reflog to filter commits by reflog messages

386 - + grep: prepare for new header field filter

387 -

388 - Teach the commands from the "log" family the "--grep-reflog" option

389 - to limit output by string that appears in the reflog entry when the

390 - "--walk-reflogs" option is in effect.

391 -

392 - Will merge to 'master'.

393 -

394 -

395 -* lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit

396 - (merged to 'next' on 2012-10-01 at 2a1cecc)

397 - + mailinfo: don't require "text" mime type for attachments

398 -

399 - A patch attached as application/octet-stream (e.g. not text/*) were

400 - mishandled, not correctly honoring Content-Transfer-Encoding

401 - (e.g. base64).

402 -

403 - Will merge to 'master'.

404 -

405 -

406 -* tu/gc-auto-quiet (2012-09-27) 1 commit

407 - (merged to 'next' on 2012-10-01 at ad8b91b)

408 - + silence git gc --auto --quiet output

409 -

410 - "gc --auto" notified the user that auto-packing has triggered even

411 - under the "--quiet" option.

412 -

413 - Will merge to 'master'.

414 -

415 -

391 * jm/diff-context-config (2012-10-02) 2 commits

392 (merged to 'next' on 2012-10-02 at e57700a)

393 + t4055: avoid use of sed 'a' command

@@ -473,7 +448,7 @@ repositories listed at

448 It was pointed out that some symbols that do not have to be global

449 are left global. I think this reroll fixed most of them.

450

476 - Will merge to 'next'.

451 + Needs more design consideration.

452

453

454 * nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits

What's cooking (2012/10 #02)