8c6f71f884 · matheusbsbs/matheus-bagliano

@@ -1,23 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 4a182f6174e1b958777ba6fbc6262e5457151049

5 -X-next-at: 8a75ac8ee22538d824252e6f2aa1c01a120ced77

3 +Subject: What's cooking in git.git (Oct 2012, #06; Fri, 19)

4 +X-master-at: 8ead1bfe111085ef1ad7759e67340f074996b244

5 +X-next-at: 5b9a629a33877c671b6ebea47248afda0dc32545

6

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

7 +What's cooking in git.git (Oct 2012, #06; Fri, 19)

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 -We are almost there for 1.8.0-rc3. The final is expected to be

15 -tagged this weekend.

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

19 -which I'd disappear for a few weeks. http://tinyurl.com/gitCal is

20 -where you can always find my rough tagging schedule at.

14 +The 1.8.0 release is expected to be tagged this weekend, after which

15 +I'd disappear for a few weeks, and Git will be in steady and good

16 +hands of Jeff King (thanks) in the meantime.

17

18 You can find the changes described here in the integration branches of the

19 repositories listed at

@@ -25,91 +21,138 @@ repositories listed at

21 http://git-blame.blogspot.com/p/git-public-repositories.html

22

23 --------------------------------------------------

28 -[Graduated to "master"]

24 +[New Topics]

25

30 -* jk/maint-http-half-auth-push (2012-10-12) 1 commit

31 - (merged to 'next' on 2012-10-12 at 838ab48)

32 - + http: fix segfault in handle_curl_result

33 - (this branch is used by jk/maint-http-init-not-in-result-handler.)

26 +* js/mingw-fflush-errno (2012-10-17) 1 commit

27 + (merged to 'next' on 2012-10-18 at 43d6ebb)

28 + + maybe_flush_or_die: move a too-loose Windows specific error

29

35 - Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)

36 - and master (v1.8.0-rc0).

30 + Will merge to 'master' in the first batch after 1.8.0 ships.

31

38 ---------------------------------------------------

39 -[New Topics]

32

41 -* jk/maint-http-init-not-in-result-handler (2012-10-12) 2 commits

42 - (merged to 'next' on 2012-10-16 at cc88829)

43 - + http: do not set up curl auth after a 401

44 - + remote-curl: do not call run_slot repeatedly

33 +* mo/cvs-server-cleanup (2012-10-16) 10 commits

34 + (merged to 'next' on 2012-10-18 at 5a60da1)

35 + + cvsserver status: provide real sticky info

36 + + cvsserver: cvs add: do not expand directory arguments

37 + + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix

38 + + cvsserver: split up long lines in req_{status,diff,log}

39 + + cvsserver: clean up client request handler map comments

40 + + cvsserver: remove unused functions _headrev and gethistory

41 + + cvsserver update: comment about how we shouldn't remove a user-modified file

42 + + cvsserver: add comments about database schema/usage

43 + + cvsserver: removed unused sha1Or-k mode from kopts_from_path

44 + + cvsserver t9400: add basic 'cvs log' test

45 + (this branch is used by mo/cvs-server-updates.)

46

46 - Further clean-up to the http codepath that picks up results after

47 - cURL library is done with one request slot.

47

49 - Will merge to 'master' in the second batch after 1.8.0 ships.

48 +* mo/cvs-server-updates (2012-10-16) 10 commits

49 + - cvsserver Documentation: new cvs ... -r support

50 + - cvsserver: add t9402 to test branch and tag refs

51 + - cvsserver: support -r and sticky tags for most operations

52 + - cvsserver: Add version awareness to argsfromdir

53 + - cvsserver: generalize getmeta() to recognize commit refs

54 + - cvsserver: implement req_Sticky and related utilities

55 + - cvsserver: add misc commit lookup, file meta data, and file listing functions

56 + - cvsserver: define a tag name character escape mechanism

57 + - cvsserver: cleanup extra slashes in filename arguments

58 + - cvsserver: factor out git-log parsing logic

59 + (this branch uses mo/cvs-server-cleanup.)

60

61

52 -* nd/grep-true-path (2012-10-12) 1 commit

53 - (merged to 'next' on 2012-10-16 at 8a75ac8)

54 - + grep: stop looking at random places for .gitattributes

62 +* ta/doc-cleanup (2012-10-18) 5 commits

63 + - Documentation/howto: convert plain text files to asciidoc

64 + - Documentation/technical: convert plain text files to asciidoc

65 + - Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt

66 + - Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1

67 + - Split over-long synopsis in git-fetch-pack.txt into several lines

68

56 - "git grep -e pattern <tree>" asked the attribute system to read

57 - "<tree>:.gitattributes" file in the working tree, which was

58 - nonsense.

69 + Misapplication of a patch fixed; the ones near the tip needs to

70 + update the links to point at the html files, though.

71 +

72 +

73 +* lt/diff-stat-show-0-lines (2012-10-17) 1 commit

74 + - Fix "git diff --stat" for interesting - but empty - file changes

75 +

76 + We failed to mention a file without any content change but whose

77 + permission bit was modified, or (worse yet) a new file without any

78 + content in the "git diff --stat" output.

79 +

80 +

81 +* jc/prettier-pretty-note (2012-10-19) 7 commits

82 + - Documentation: decribe format-patch --notes

83 + - format-patch --notes: show notes after three-dashes

84 + - format-patch: append --signature after notes

85 + - pretty_print_commit(): do not append notes message

86 + - pretty: prepare notes message at a centralized place

87 + - format_note(): simplify API

88 + - pretty: remove reencode_commit_message()

89 +

90 + Needs updates to the placeholder documentation.

91 +

92 +

93 +* jk/sh-setup-in-filter-branch (2012-10-18) 2 commits

94 + (merged to 'next' on 2012-10-18 at 3864adc)

95 + + filter-branch: use git-sh-setup's ident parsing functions

96 + + git-sh-setup: refactor ident-parsing functions

97

98 Will merge to 'master' in the second batch after 1.8.0 ships.

99

100

63 -* cr/cvsimport-local-zone (2012-10-15) 1 commit

64 - - git-cvsimport: allow author-specific timezones

101 +* jk/strbuf-detach-always-non-null (2012-10-18) 1 commit

102 + (merged to 'next' on 2012-10-18 at 54561c7)

103 + + strbuf: always return a non-NULL value from strbuf_detach

104

66 - Allows "cvsimport" to read per-author timezone from the author info

67 - file.

105 + Will merge to 'master' in the first batch after 1.8.0 ships.

106

107

70 -* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit

71 - - completion: add format-patch options to send-email

108 +* nd/status-long (2012-10-18) 1 commit

109 + (merged to 'next' on 2012-10-18 at 53940a1)

110 + + status: add --long output format option

111

112 + Allow an earlier "--short" option on the command line to be

113 + countermanded with the "--long" option for "git status" and "git

114 + commit".

115

74 -* fc/zsh-completion (2012-10-15) 3 commits

75 - - completion: add new zsh completion

76 - - tests: use __gitcompadd to simplify completion tests

77 - - completion: add new __gitcompadd helper

116 + Will merge to 'master' in the second batch after 1.8.0 ships.

117

118

80 -* jc/apply-trailing-blank-removal (2012-10-12) 1 commit

81 - - apply.c:update_pre_post_images(): the preimage can be truncated

119 +* rs/branch-del-symref (2012-10-18) 5 commits

120 + (merged to 'next' on 2012-10-18 at 68ee254)

121 + + branch: show targets of deleted symrefs, not sha1s

122 + + branch: skip commit checks when deleting symref branches

123 + + branch: delete symref branch, not its target

124 + + branch: factor out delete_branch_config()

125 + + branch: factor out check_branch_commit()

126

83 - Fix to update_pre_post_images() that did not take into account the

84 - possibility that whitespace fix could shrink the preimage and

85 - change the number of lines in it.

127 + A symbolic ref refs/heads/SYM was not correctly removed with

128 + "git branch -d SYM"; the command removed the ref pointed by

129 + SYM instead.

130

87 - Extra set of eyeballs appreciated.

131 + Will merge to 'master' in the second batch after 1.8.0 ships.

132

133

90 -* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits

91 - - config: exit on error accessing any config file

92 - - doc: advertise GIT_CONFIG_NOSYSTEM

93 - - config: treat user and xdg config permission problems as errors

94 - - config, gitignore: failure to access with ENOTDIR is ok

134 +* sz/maint-curl-multi-timeout (2012-10-18) 1 commit

135 + - Fix potential hang in https handshake

136

96 - An RFC to deal with a situation where .config/git is a file and we

97 - notice .config/git/config is not readable due to ENOTDIR, not

98 - ENOENT; I think a bit more refactored approach to consistently

99 - address permission errors across config, exclude and attrs is

100 - desirable. Don't we also need a check for an opposite situation

101 - where we open .config/git/config or .gitattributes for reading but

102 - they turn out to be directories?

137 + Sometimes curl_multi_timeout() function suggested a wrong timeout

138 + value when there is no file descriptors to wait on and the http

139 + transport ended up sleeping for minutes in select(2) system call.

140 + Detect this and reduce the wait timeout in such a case.

141

142

105 -* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit

106 - - refs: lock symref that is to be deleted, not its target

143 +* jc/same-encoding (2012-10-18) 1 commit

144 + - reencode_string(): introduce and use same_encoding()

145 +

146 + Various codepaths checked if two encoding names are the same using

147 + ad-hoc code and some of them ended up asking iconv() to convert

148 + between "utf8" and "UTF-8". The former is not a valid way to spell

149 + the encoding name, but often people use it by mistake, and we

150 + equated them in some but not all codepaths. Introduce a new helper

151 + function to make these codepaths consistent.

152

108 - When "update-ref -d --no-deref SYM" tried to delete a symbolic ref

109 - SYM, it incorrectly locked the underlying reference pointed by SYM,

110 - not the symbolic ref itself.

153

112 - Will merge to 'next'.

154 +* nd/tree-walk-enum-cleanup (2012-10-19) 1 commit

155 + - tree-walk: use enum interesting instead of integer

156

157 --------------------------------------------------

158 [Stalled]

@@ -342,7 +385,81 @@ repositories listed at

385 --------------------------------------------------

386 [Cooking]

387

345 -* as/check-ignore (2012-10-15) 12 commits

388 +* jk/maint-http-init-not-in-result-handler (2012-10-12) 2 commits

389 + (merged to 'next' on 2012-10-16 at cc88829)

390 + + http: do not set up curl auth after a 401

391 + + remote-curl: do not call run_slot repeatedly

392 +

393 + Further clean-up to the http codepath that picks up results after

394 + cURL library is done with one request slot.

395 +

396 + Will merge to 'master' in the second batch after 1.8.0 ships.

397 +

398 +

399 +* nd/grep-true-path (2012-10-12) 1 commit

400 + (merged to 'next' on 2012-10-16 at 8a75ac8)

401 + + grep: stop looking at random places for .gitattributes

402 +

403 + "git grep -e pattern <tree>" asked the attribute system to read

404 + "<tree>:.gitattributes" file in the working tree, which was

405 + nonsense.

406 +

407 + Will merge to 'master' in the second batch after 1.8.0 ships.

408 +

409 +

410 +* cr/cvsimport-local-zone (2012-10-16) 1 commit

411 + - git-cvsimport: allow author-specific timezones

412 +

413 + Allows "cvsimport" to read per-author timezone from the author info

414 + file.

415 +

416 +

417 +* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit

418 + - completion: add format-patch options to send-email

419 +

420 +

421 +* fc/zsh-completion (2012-10-15) 3 commits

422 + - completion: add new zsh completion

423 + - tests: use __gitcompadd to simplify completion tests

424 + - completion: add new __gitcompadd helper

425 +

426 +

427 +* jc/apply-trailing-blank-removal (2012-10-12) 1 commit

428 + - apply.c:update_pre_post_images(): the preimage can be truncated

429 +

430 + Fix to update_pre_post_images() that did not take into account the

431 + possibility that whitespace fix could shrink the preimage and

432 + change the number of lines in it.

433 +

434 + Extra set of eyeballs appreciated.

435 +

436 +

437 +* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits

438 + - config: exit on error accessing any config file

439 + - doc: advertise GIT_CONFIG_NOSYSTEM

440 + - config: treat user and xdg config permission problems as errors

441 + - config, gitignore: failure to access with ENOTDIR is ok

442 +

443 + An RFC to deal with a situation where .config/git is a file and we

444 + notice .config/git/config is not readable due to ENOTDIR, not

445 + ENOENT; I think a bit more refactored approach to consistently

446 + address permission errors across config, exclude and attrs is

447 + desirable. Don't we also need a check for an opposite situation

448 + where we open .config/git/config or .gitattributes for reading but

449 + they turn out to be directories?

450 +

451 +

452 +* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit

453 + (merged to 'next' on 2012-10-16 at 850b5b2)

454 + + refs: lock symref that is to be deleted, not its target

455 +

456 + When "update-ref -d --no-deref SYM" tried to delete a symbolic ref

457 + SYM, it incorrectly locked the underlying reference pointed by SYM,

458 + not the symbolic ref itself.

459 +

460 +

461 +* as/check-ignore (2012-10-19) 13 commits

462 + - Documentation/check-ignore: we show the deciding match, not the first

463 - Add git-check-ignore sub-command

464 - dir.c: provide free_directory() for reclaiming dir_struct memory

465 - pathspec.c: move reusable code from builtin/add.c

@@ -357,27 +474,20 @@ repositories listed at

474 - dir.c: rename cryptic 'which' variable to more consistent name

475 (this branch uses nd/attr-match-optim and nd/attr-match-optim-more; is tangled with nd/wildmatch.)

476

360 - Duy helped to reroll this. Needs a bit of documentation updates,

361 - at least.

477 + Duy helped to reroll this.

478

479

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

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

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

367 - - format-patch: introduce helper function last_line_length()

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

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

480 +* js/format-2047 (2012-10-18) 7 commits

481 + (merged to 'next' on 2012-10-18 at 5b9a629)

482 + + format-patch tests: check quoting/encoding in To: and Cc: headers

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

484 + + format-patch: make rfc2047 encoding more strict

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

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

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

488 + + utf8: fix off-by-one wrapping of text

489

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

372 - The last patch attempts to sneak new policies in without concensus,

373 - which I'd wish to see at least described as such i.e. "this fails

374 - with the current codebase but we would eventually want to do X and

375 - Y at which point it will pass". Then we can discuss if doing X and

376 - Y is a good thing. Alternatively, the bits that adds expect-failure

377 - should be removed from the patch, leaving the tests that cover what

378 - this series is supposed to have fixed.

379 -

380 - Otherwise, I think this is fit for 'next'.

491

492

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

@@ -391,7 +501,11 @@ repositories listed at

501 Will merge to 'master' in the second batch after 1.8.0 ships.

502

503

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

504 +* so/prompt-command (2012-10-17) 4 commits

505 + (merged to 'next' on 2012-10-17 at 0843a8b)

506 + + coloured git-prompt: paint detached HEAD marker in red

507 + (merged to 'next' on 2012-10-16 at adf81be)

508 + + Fix up colored git-prompt

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

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

511 + Allow __git_ps1 to be used in PROMPT_COMMAND

@@ -427,26 +541,30 @@ repositories listed at

541

542

543 * nd/wildmatch (2012-10-15) 13 commits

430 - - Support "**" wildcard in .gitignore and .gitattributes

431 - - wildmatch: make /**/ match zero or more directories

432 - - wildmatch: adjust "**" behavior

433 - - wildmatch: fix case-insensitive matching

434 - - wildmatch: remove static variable force_lower_case

435 - - wildmatch: make wildmatch's return value compatible with fnmatch

436 - - t3070: disable unreliable fnmatch tests

437 - - Integrate wildmatch to git

438 - - wildmatch: follow Git's coding convention

439 - - wildmatch: remove unnecessary functions

440 - - Import wildmatch from rsync

441 - - ctype: support iscntrl, ispunct, isxdigit and isprint

442 - - ctype: make sane_ctype[] const array

544 + (merged to 'next' on 2012-10-16 at 5eaf3a4)

545 + + Support "**" wildcard in .gitignore and .gitattributes

546 + + wildmatch: make /**/ match zero or more directories

547 + + wildmatch: adjust "**" behavior

548 + + wildmatch: fix case-insensitive matching

549 + + wildmatch: remove static variable force_lower_case

550 + + wildmatch: make wildmatch's return value compatible with fnmatch

551 + + t3070: disable unreliable fnmatch tests

552 + + Integrate wildmatch to git

553 + + wildmatch: follow Git's coding convention

554 + + wildmatch: remove unnecessary functions

555 + + Import wildmatch from rsync

556 + + ctype: support iscntrl, ispunct, isxdigit and isprint

557 + + ctype: make sane_ctype[] const array

558 (this branch uses nd/attr-match-optim and nd/attr-match-optim-more; is tangled with as/check-ignore.)

559

560 Allows pathname patterns in .gitignore and .gitattributes files

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

447 - hiearchies.

562 + hierarchies.

563

449 - Will merge to 'next'.

564 + I suspect that this needs to be plugged to pathspec matching code;

565 + otherwise "git log -- 'Docum*/**/*.txt'" would not show the log for

566 + commits that touch Documentation/git.txt, which would be confusing

567 + to the users.

568

569

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

@@ -475,20 +593,19 @@ repositories listed at

593

594

595 * nd/attr-match-optim-more (2012-10-15) 7 commits

478 - - attr: more matching optimizations from .gitignore

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

480 - - exclude: split pathname matching code into a separate function

481 - - exclude: fix a bug in prefix compare optimization

482 - - exclude: split basename matching code into a separate function

483 - - exclude: stricten a length check in EXC_FLAG_ENDSWITH case

596 + (merged to 'next' on 2012-10-16 at 9baac99)

597 + + attr: more matching optimizations from .gitignore

598 + + gitignore: make pattern parsing code a separate function

599 + + exclude: split pathname matching code into a separate function

600 + + exclude: fix a bug in prefix compare optimization

601 + + exclude: split basename matching code into a separate function

602 + + exclude: stricten a length check in EXC_FLAG_ENDSWITH case

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

604 (this branch is used by as/check-ignore and nd/wildmatch; uses nd/attr-match-optim.)

605

606 Start laying the foundation to build the "wildmatch" after we can

607 agree on its desired semantics.

608

490 - Will merge to 'next'.

491 -

609

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

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

What's cooking (2012/10 #06)