fb37a6c50c · matheusbsbs/matheus-bagliano

@@ -1,19 +1,17 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2012, #03; Sun, 7)

4 -X-master-at: dc01f880a53e56d4a5c6f30cb2d7b9412e17bfe7

5 -X-next-at: 9fa34dc2edd1285517772f315bf1d7edbcfbfee6

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

4 +X-master-at: cd46259ebf2e624bcee2aaae05c36663d414e1a2

5 +X-next-at: 639036db058fbb54865ae729c26c689777a96550

6

7 -What's cooking in git.git (Oct 2012, #03; Sun, 7)

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

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 -I'll merge the regression fix jc/merge-bases-paint-fix to 'master'

15 -and will tag 1.8.0-rc1 tomorrow. It would be nice if we can have

16 -pull requests for subsystem updates before then.

14 +The tip of 'master' is 1.8.0-rc2.

15

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

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

@@ -28,50 +26,99 @@ repositories listed at

26 --------------------------------------------------

27 [New Topics]

28

31 -* jc/doc-default-format (2012-10-07) 2 commits

32 - - [SQAUSH] allow "cd Doc* && make DEFAULT_DOC_TARGET=..."

33 - - Allow generating a non-default set of documentation

29 +* js/format-2047 (2012-10-09) 5 commits

30 + - format-patch: tests: check rfc822+rfc2047 in to+cc headers

31 + - format-patch: fix rfc2047 address encoding with respect to rfc822 specials

32 + - format-patch: introduce helper function last_line_length()

33 + - format-patch: do not wrap rfc2047 encoded headers too late

34 + - format-patch: do not wrap non-rfc2047 headers too early

35

35 - Will merge to 'next', but it is a bit too late for 1.8.0.

36 + Fixes many rfc2047 quoting issues in the output from format-patch.

37

38

38 -* jk/lua-hackery (2012-10-07) 6 commits

39 - - pretty: fix up one-off format_commit_message calls

40 - - Minimum compilation fixup

41 - - Makefile: make "lua" a bit more configurable

42 - - add a "lua" pretty format

43 - - add basic lua infrastructure

44 - - pretty: make some commit-parsing helpers more public

39 +* km/send-email-compose-encoding (2012-10-10) 1 commit

40 + (merged to 'next' on 2012-10-11 at d94bd05)

41 + + git-send-email: introduce compose-encoding

42

46 - Interesting exercise. When we do this for real, we probably would want

47 - to wrap a commit to make it more like an "object" with methods like

48 - "parents", etc.

43 + "git send-email --compose" can let the user create a non-ascii

44 + cover letter message, but there was not a way to mark it with

45 + appropriate content type before sending it out.

46

47

51 -* nd/attr-match-optim (2012-10-05) 2 commits

52 - - attr: avoid searching for basename on every match

53 - - attr: avoid strlen() on every match

54 - (this branch is used by nd/attr-match-optim-more.)

48 +* so/prompt-command (2012-10-11) 2 commits

49 + (merged to 'next' on 2012-10-11 at 1a14825)

50 + + show color hints based on state of the git tree

51 + + Allow __git_ps1 to be used in PROMPT_COMMAND

52

56 - Will merge to 'next', but it is a bit too late for 1.8.0.

53 + Updates __git_ps1 so that it can be used as $PROMPT_COMMAND,

54 + instead of being used for command substitution in $PS1, to embed

55 + color escape sequences in its output.

56

57

59 -* nd/attr-match-optim-more (2012-10-05) 3 commits

60 - - attr: more matching optimizations from .gitignore

61 - - gitignore: make pattern parsing code a separate function

62 - - Merge commit 'f9f6e2c' into nd/attr-match-optim-more

63 - (this branch uses nd/attr-match-optim.)

58 +* jc/test-say-color-avoid-echo-escape (2012-10-11) 1 commit

59 + (merged to 'next' on 2012-10-11 at 639036d)

60 + + test-lib: Fix say_color () not to interpret \a\b\c in the message

61 +

62 + Recent nd/wildmatch series was the first to reveal this ancient bug

63 + in the test scaffolding.

64 +

65 +

66 +* aw/rebase-am-failure-detection (2012-10-11) 1 commit

67 + - rebase: Handle cases where format-patch fails

68 +

69 +

70 +* da/mergetools-p4 (2012-10-11) 1 commit

71 + - mergetools/p4merge: Handle "/dev/null"

72 +

73 +--------------------------------------------------

74 +[Graduated to "master"]

75 +

76 +* bw/cp-a-is-gnuism (2012-10-08) 1 commit

77 + (merged to 'next' on 2012-10-08 at 6ddb60d)

78 + + tests: "cp -a" is a GNUism

79 +

80 +

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

82 + (merged to 'next' on 2012-10-08 at 7183dc0)

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

84 +

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

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

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

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

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

90 + drop the claim to be exhaustive.

91 +

92 +

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

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

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

96 +

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

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

99 + as an error.

100

65 - Start laying the foundation to build the "wildmatch" after we can

66 - agree on its desired semantics.

101 +

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

103 + (merged to 'next' on 2012-10-07 at 9fa34dc)

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

105 +

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

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

108 + forever to finish as the result.

109

110

111 * nd/doc-ignore (2012-10-07) 1 commit

70 - - gitignore.txt: suggestions how to get literal # or ! at the beginning

112 + (merged to 'next' on 2012-10-08 at 7b46836)

113 + + gitignore.txt: suggestions how to get literal # or ! at the beginning

114

72 - Will merge to 'next', but it may be a bit too late for 1.8.0.

115 + Documentation updates for excluding path whose name begin with # or !.

116

117

118 +* rr/git-uri-doc (2012-10-08) 1 commit

119 + (merged to 'next' on 2012-10-08 at a28ae12)

120 + + Git url doc: mark ftp/ftps as read-only and deprecate them

121 +

122 --------------------------------------------------

123 [Stalled]

124

@@ -173,6 +220,13 @@ repositories listed at

220 Stalled mostly due to lack of responses.

221

222

223 +* jc/doc-default-format (2012-10-07) 2 commits

224 + - [SQAUSH] allow "cd Doc* && make DEFAULT_DOC_TARGET=..."

225 + - Allow generating a non-default set of documentation

226 +

227 + Need to address the installation half if this is to be any useful.

228 +

229 +

230 * mk/maint-graph-infinity-loop (2012-09-25) 1 commit

231 - graph.c: infinite loop in git whatchanged --graph -m

232

@@ -224,7 +278,8 @@ repositories listed at

278

279

280 * jc/add-delete-default (2012-08-13) 1 commit

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

281 + (merged to 'next' on 2012-10-11 at bd9e5cb)

282 + + git add: notice removal of tracked paths by default

283

284 "git add dir/" updated modified files and added new files, but does

285 not notice removed files, which may be "Huh?" to some users. They

@@ -285,7 +340,7 @@ repositories listed at

340 Given that I heard a lot of noise that people want large files, and

341 that I was asked by somebody at GitTogether'11 privately for an

342 advice on how to pay developers (not me) to help adding necessary

288 - support, I am somewhat dissapointed that the original patch series

343 + support, I am somewhat disappointed that the original patch series

344 that was sent long time ago still remains here without much comments

345 and updates from the developer community. I even made the interface

346 to the logic that decides where to split chunks easily replaceable,

@@ -298,58 +353,87 @@ repositories listed at

353 --------------------------------------------------

354 [Cooking]

355

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

302 - - gitcli: parse-options lets you omit tail of long options

356 +* nd/wildmatch (2012-10-11) 12 commits

357 + - t3070: disable two fnmatch tests that have different results on different libc

358 + - Support "**" wildcard in .gitignore and .gitattributes

359 + - wildmatch: make /**/ match zero or more directories

360 + - wildmatch: adjust "**" behavior

361 + - wildmatch: fix case-insensitive matching

362 + - wildmatch: remove static variable force_lower_case

363 + - wildmatch: make wildmatch's return value compatible with fnmatch

364 + - Integrate wildmatch to git

365 + - wildmatch: remove unnecessary functions

366 + - Import wildmatch from rsync

367 + - ctype: support iscntrl, ispunct, isxdigit and isprint

368 + - ctype: make sane_ctype[] const array

369

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

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

306 - didn't mention anything about abbreviating long option names to

307 - their unique prefixes. Mention it, warn against relying too much on

308 - it (as uniqueness may disappear in future versions of Git), and

309 - drop the claim to be exhaustive.

370 + Allows pathname patterns in .gitignore and .gitattributes files

371 + with double-asterisks "foo/**/bar" to match any number of directory

372 + hiearchies.

373 +

374 + This might be missing some off-by-one fix posted on the list, and

375 + needs to be checked.

376

311 - Will merge to 'next', but it is a bit too late for 1.8.0.

377

378 +* jk/lua-hackery (2012-10-07) 6 commits

379 + - pretty: fix up one-off format_commit_message calls

380 + - Minimum compilation fixup

381 + - Makefile: make "lua" a bit more configurable

382 + - add a "lua" pretty format

383 + - add basic lua infrastructure

384 + - pretty: make some commit-parsing helpers more public

385

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

315 - . log --grep: honor grep.patterntype etc. configuration variables

316 - . log: pass rev_info to git_log_config()

317 - - log --grep: accept --basic-regexp and --perl-regexp

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

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

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

386 + Interesting exercise. When we do this for real, we probably would want

387 + to wrap a commit to make it more like an "object" with methods like

388 + "parents", etc.

389

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

323 - pattern as extended regular expression, and instead looked for the

324 - string literally. The early part of this series is a fix for it.

390

326 - The last two are very wrong and need to be redone by refactoring

327 - the configuration handling of "grep.*" part.

391 +* nd/attr-match-optim (2012-10-05) 2 commits

392 + (merged to 'next' on 2012-10-08 at bfbdd8a)

393 + + attr: avoid searching for basename on every match

394 + + attr: avoid strlen() on every match

395 + (this branch is used by nd/attr-match-optim-more.)

396

397 + Trivial and obvious optimization for finding attributes that match

398 + a given path.

399

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

331 - (merged to 'next' on 2012-10-07 at 9fa34dc)

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

400

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

335 - uses) had a severe performance regression; an empty "git pull" took

336 - forever to finish as the result.

401 +* nd/attr-match-optim-more (2012-10-11) 3 commits

402 + - attr: more matching optimizations from .gitignore

403 + - gitignore: make pattern parsing code a separate function

404 + - Merge commit 'f9f6e2c' into nd/attr-match-optim-more

405 + (this branch uses nd/attr-match-optim.)

406 +

407 + Start laying the foundation to build the "wildmatch" after we can

408 + agree on its desired semantics.

409 +

410 +

411 +* jc/grep-pcre-loose-ends (2012-10-09) 7 commits

412 + (merged to 'next' on 2012-10-11 at fec8530)

413 + + log: honor grep.* configuration

414 + + log --grep: accept --basic-regexp and --perl-regexp

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

416 + + revisions: initialize revs->grep_filter using grep_init()

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

418 + + grep: move the configuration parsing logic to grep.[ch]

419 + + builtin/grep.c: make configuration callback more reusable

420

338 - Need to be merged before 1.8.0 final.

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

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

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

424

425

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

342 - - upload-pack: use peel_ref for ref advertisements

343 - - peel_ref: check object type before loading

344 - - peel_ref: do not return a null sha1

345 - - peel_ref: use faster deref_tag_noverify

427 + (merged to 'next' on 2012-10-08 at 4adfa2f)

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

429 + + peel_ref: check object type before loading

430 + + peel_ref: do not return a null sha1

431 + + peel_ref: use faster deref_tag_noverify

432

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

434 other side of the connection) by reducing the cost to advertise the

435 branches and tags that are available in the repository.

436

351 - Will merge to 'next', but it is a bit too late for 1.8.0.

352 -

437

438 * fa/remote-svn (2012-10-07) 16 commits

439 (merged to 'next' on 2012-10-07 at 7b90cf4)

@@ -375,28 +459,17 @@ repositories listed at

459

460

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

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

462 + (merged to 'next' on 2012-10-08 at 69f54f4)

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

464

465 The configuration parser had an unnecessary hardcoded limit on

466 variable names that was not checked consistently. Lift the limit.

467

383 - Will merge to 'next'.

384 -

385 -

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

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

388 - + t1450: the order the objects are checked is undefined

389 -

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

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

392 - as an error.

393 -

394 - Will merge to 'next'.

395 -

468

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

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

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

470 + (merged to 'next' on 2012-10-08 at 9408d8d)

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

472 + + Teach "git submodule add" the --name option

473

474 If you remove a submodule, in order to keep the repository so that

475 "git checkout" to an older commit in the superproject history can

@@ -408,8 +481,6 @@ repositories listed at

481 place in $GIT_DIR of the superproject that does not conflict with

482 the original submodule.

483

411 - Will merge to 'next'.

412 -

484

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

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

@@ -475,20 +546,3 @@ repositories listed at

546 (Originally merged to 'next' on 2012-07-23)

547

548 Will defer to the next cycle.

478 -

479 ---------------------------------------------------

480 -[Discarded]

481 -

482 -* nd/wildmatch (2012-09-27) 5 commits

483 - . Support "**" in .gitignore and .gitattributes patterns using wildmatch()

484 - . Integrate wildmatch to git

485 - . compat/wildmatch: fix case-insensitive matching

486 - . compat/wildmatch: remove static variable force_lower_case

487 - . Import wildmatch from rsync

488 -

489 - Allows pathname patterns in .gitignore and .gitattributes files

490 - with double-asterisks "foo/**/bar" to match any number of directory

491 - hiearchies.

492 -

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

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

What's cooking (2012/10 #04)