88edbae22e · matheusbsbs/matheus-bagliano

@@ -1,19 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Feb 2015, #05; Thu, 19)

4 -X-master-at: f3f407747c1cce420ae4b4857c4a6806efe38680

5 -X-next-at: b072d44c2c27039617e40171784569d7212f3148

3 +Subject: What's cooking in git.git (Feb 2015, #06; Sun, 22)

4 +X-master-at: 355d4e1739d1e88561ac04d2a2423c2aa93693d9

5 +X-next-at: a0c6b3dbaae84fcad8b65e4ac8caa8982d3d24a8

6

7 -What's cooking in git.git (Feb 2015, #05; Thu, 19)

7 +What's cooking in git.git (Feb 2015, #06; Sun, 22)

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 second and third batch of topics have been merged to 'master'.

15 -I am tempted to start discarding topics in the Stalled category that

16 -haven't seen much reviews and discussions on for a long time.

14 +The 'master' front have merged many topics that can further merged

15 +to the maintainance tracks. We may want to do a v2.3.1 soonish.

16

17 You can find the changes described here in the integration branches

18 of the repositories listed at

@@ -23,85 +22,94 @@ of the repositories listed at

22 --------------------------------------------------

23 [Graduated to "master"]

24

26 -* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit

27 - (merged to 'next' on 2015-02-16 at 69dd76d)

28 - + wincred: fix get credential if username has "@"

25 +* ab/merge-file-prefix (2015-02-11) 1 commit

26 + (merged to 'next' on 2015-02-16 at 89e0252)

27 + + merge-file: correctly open files when in a subdir

28

30 - The credential helper for Windows (in contrib/) used to mishandle

31 - a user name with an at-sign in it.

29 + "git merge-file" did not work correctly in a subdirectory.

30

31

34 -* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits

35 - (merged to 'next' on 2015-02-16 at e2daf10)

36 - + t/lib-gpg: sanity-check that we can actually sign

37 - + t/lib-gpg: include separate public keys in keyring.gpg

32 +* es/blame-commit-info-fix (2015-02-10) 1 commit

33 + (merged to 'next' on 2015-02-16 at f76ff44)

34 + + builtin/blame: destroy initialized commit_info only

35

39 - Older GnuPG implementations may not correctly import the keyring

40 - material we prepare for the tests to use.

36 + "git blame" died, trying to free an uninitialized piece of memory.

37

38

43 -* jc/push-cert (2015-02-12) 1 commit

44 - (merged to 'next' on 2015-02-16 at f40b3c5)

45 - + transport-helper: fix typo in error message when --signed is not supported

39 +* es/squelch-openssl-warnings-on-macosx (2015-02-09) 1 commit

40 + (merged to 'next' on 2015-02-16 at bbe2880)

41 + + git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

42

47 - "git push --signed" gave an incorrectly worded error message when

48 - the other side did not support the capability.

43 + An earlier workaround to squelch unhelpful deprecation warnings

44 + from the complier on Mac OSX unnecessarily set minimum required

45 + version of the OS, which the user might want to raise (or lower)

46 + for other reasons.

47

48

51 -* jc/remote-set-url-doc (2015-01-29) 1 commit

52 - (merged to 'next' on 2015-02-16 at 1f9c342)

53 - + Documentation/git-remote.txt: stress that set-url is not for triangular

49 +* jc/conf-var-doc (2015-02-02) 3 commits

50 + (merged to 'next' on 2015-02-16 at 97512a3)

51 + + CodingGuidelines: describe naming rules for configuration variables

52 + + config.txt: mark deprecated variables more prominently

53 + + config.txt: clarify that add.ignore-errors is deprecated

54

55 - Clarify in the documentation that "remote.<nick>.pushURL" and

56 - "remote.<nick>.URL" are there to name the same repository accessed

57 - via different transports, not two separate repositories.

55 + Longstanding configuration variable naming rules has been added to

56 + the documentation.

57

58

60 -* jk/config-no-ungetc-eof (2015-02-05) 2 commits

61 - (merged to 'next' on 2015-02-16 at b7fc890)

62 - + config_buf_ungetc: warn when pushing back a random character

63 - + config: do not ungetc EOF

59 +* jc/diff-files-ita (2015-02-04) 1 commit

60 + (merged to 'next' on 2015-02-16 at d7867a3)

61 + + run_diff_files(): clarify computation of sha1 validity

62

65 - Reading configuration from a blob object, when it ends with a lone

66 - CR, use to confuse the configuration parser.

63 + Code cleanup.

64

65

69 -* jk/decimal-width-for-uintmax (2015-02-05) 1 commit

70 - (merged to 'next' on 2015-02-16 at e608239)

71 - + decimal_width: avoid integer overflow

66 +* jk/prune-mtime (2015-02-09) 2 commits

67 + (merged to 'next' on 2015-02-16 at 3d46eae)

68 + + sha1_file: fix iterating loose alternate objects

69 + + for_each_loose_file_in_objdir: take an optional strbuf path

70

73 - We didn't format an integer that wouldn't fit in "int" but in

74 - "uintmax_t" correctly.

71 + In v2.2.0, we broke "git prune" that runs in a repository that

72 + borrows from an alternate object store.

73

74

77 -* jk/pack-bitmap (2015-02-04) 1 commit

78 - (merged to 'next' on 2015-02-16 at 2e30424)

79 - + ewah: fix building with gcc < 3.4.0

75 +* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit

76 + (merged to 'next' on 2015-02-16 at 8253132)

77 + + git-submodule.sh: fix '/././' path normalization

78

81 - The pack bitmap support did not build with older versions of GCC.

79 + "git submodule add" failed to squash "path/to/././submodule" to

80 + "path/to/submodule".

81

82

84 -* ye/http-accept-language (2015-01-28) 1 commit

85 - (merged to 'next' on 2015-02-16 at 10ed819)

86 - + http: add Accept-Language header if possible

83 +* ss/check-builtins-on-windows (2015-02-05) 1 commit

84 + (merged to 'next' on 2015-02-16 at 2c10cc1)

85 + + check-builtins: strip executable suffix $X when enumerating builtins

86

88 - Using environment variable LANGUAGE and friends on the client side,

89 - HTTP-based transports now send Accept-Language when making requests.

87 +

88 +* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit

89 + (merged to 'next' on 2015-02-16 at de90f95)

90 + + Makefile: handle broken curl version number in version check

91 +

92 + Certain older vintages of cURL give irregular output from

93 + "curl-config --vernum", which confused our build system.

94

95 --------------------------------------------------

96 [New Topics]

97

94 -* ak/git-pm-typofix (2015-02-18) 1 commit

95 - - Git.pm: two minor typo fixes

98 +* mm/am-c-doc (2015-02-20) 2 commits

99 + - Documentation/git-am.txt: mention mailinfo.scissors config variable

100 + - Documentation/config.txt: document mailinfo.scissors

101

97 - Will merge to 'next'.

102 + The configuration variable 'mailinfo.scissors' was hard to

103 + discover in the documentation.

104

105 + Will merge to 'next'.

106

100 -* jc/decorate-leaky-separator-color (2015-02-18) 1 commit

101 - - log --decorate: do not leak "commit" color into the next item

107

103 - "git log --decorate" did not reset colors correctly around the

104 - branch names.

108 +* rs/simple-cleanups (2015-02-22) 4 commits

109 + - sha1_name: use strlcpy() to copy strings

110 + - pretty: use starts_with() to check for a prefix

111 + - for-each-ref: use skip_prefix() to avoid duplicate string comparison

112 + - connect: use strcmp() for string comparison

113

114 Will merge to 'next'.

115

@@ -166,16 +174,6 @@ of the repositories listed at

174 Need extra sets of eyes to review this.

175

176

169 -* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits

170 - - t5500: show user name and host in diag-url

171 - - t5601: add more test cases for IPV6

172 - - connect.c: improve parsing of literal IPV6 addresses

173 -

174 - Parsing of literal IPv6 addresses.

175 -

176 - Will discard.

177 -

178 -

177 * ak/stash-store-create-help (2015-01-13) 1 commit

178 - stash: show "create" and "store" subcommands in usage-help

179

@@ -209,7 +207,7 @@ of the repositories listed at

207 - FIXUP

208 - index-pack: reduce memory footprint a bit

209

212 - Experimental?

210 + Need to replace with the reroll ($gmane/264126).

211

212

213 * pw/remote-set-url-fetch (2014-11-26) 1 commit

@@ -334,15 +332,40 @@ of the repositories listed at

332 --------------------------------------------------

333 [Cooking]

334

337 -* ms/submodule-update-config-doc (2015-02-17) 2 commits

338 - - SQUASH???

339 - - submodule: clarify documentation for update subcommand

335 +* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits

336 + - t5500: show user name and host in diag-url

337 + - t5601: add more test cases for IPV6

338 + - connect.c: allow ssh://user@[2001:db8::1]/repo.git

339 +

340 + Waiting for comments from Brian who had objections to the previous

341 + round.

342 +

343 +

344 +* ak/git-pm-typofix (2015-02-18) 1 commit

345 + (merged to 'next' on 2015-02-20 at 0fa233a)

346 + + Git.pm: two minor typo fixes

347 +

348 + Typofix in comments.

349 +

350 + Will merge to 'master'.

351 +

352 +

353 +* jc/decorate-leaky-separator-color (2015-02-20) 2 commits

354 + - config.txt: spell out how certain typed values are written

355 + - log --decorate: do not leak "commit" color into the next item

356 +

357 + "git log --decorate" did not reset colors correctly around the

358 + branch names.

359 +

360 + Waiting for discussion on the tip one.

361 +

362 +

363 +* ms/submodule-update-config-doc (2015-02-20) 1 commit

364 + - submodule: Improve documentation of update subcommand

365

366 The interaction between "git submodule update" and the

367 submodule.*.update configuration was not clearly documented.

368

344 - The SQUASH may be sufficient as a reroll ($gmane/259037).

345 -

369

370 * dp/remove-duplicated-header-inclusion (2015-02-13) 1 commit

371 (merged to 'next' on 2015-02-18 at a1bf108)

@@ -425,15 +448,16 @@ of the repositories listed at

448

449

450 * jk/daemon-interpolate (2015-02-17) 3 commits

428 - - daemon: sanitize incoming virtual hostname

429 - - t5570: test git-daemon's --interpolated-path option

430 - - git_connect: let user override virtual-host we send to daemon

451 + (merged to 'next' on 2015-02-20 at 21118a7)

452 + + daemon: sanitize incoming virtual hostname

453 + + t5570: test git-daemon's --interpolated-path option

454 + + git_connect: let user override virtual-host we send to daemon

455

456 The "interpolated-path" option of "git daemon" inserted any string

457 client declared on the "host=" capability request without checking.

458 Sanitize and limit %H and %CH to a saner and a valid DNS name.

459

436 - Will merge to 'next'.

460 + Will merge to 'master'.

461

462

463 * rs/daemon-interpolate (2015-02-17) 2 commits

@@ -483,36 +507,6 @@ of the repositories listed at

507 Will merge to 'master'.

508

509

486 -* ab/merge-file-prefix (2015-02-11) 1 commit

487 - (merged to 'next' on 2015-02-16 at 89e0252)

488 - + merge-file: correctly open files when in a subdir

489 -

490 - "git merge-file" did not work correctly in a subdirectory.

491 -

492 - Will merge to 'master'.

493 -

494 -

495 -* es/blame-commit-info-fix (2015-02-10) 1 commit

496 - (merged to 'next' on 2015-02-16 at f76ff44)

497 - + builtin/blame: destroy initialized commit_info only

498 -

499 - "git blame" died, trying to free an uninitialized piece of memory.

500 -

501 - Will merge to 'master'.

502 -

503 -

504 -* es/squelch-openssl-warnings-on-macosx (2015-02-09) 1 commit

505 - (merged to 'next' on 2015-02-16 at bbe2880)

506 - + git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

507 -

508 - An earlier workaround to squelch unhelpful deprecation warnings

509 - from the complier on Mac OSX unnecessarily set minimum required

510 - version of the OS, which the user might want to raise (or lower)

511 - for other reasons.

512 -

513 - Will merge to 'master'.

514 -

515 -

510 * jc/max-io-size-and-ssize-max (2015-02-12) 1 commit

511 (merged to 'next' on 2015-02-18 at 0c8a4da)

512 + xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

@@ -571,22 +565,6 @@ of the repositories listed at

565 Will merge to 'next', unless there is an objection.

566

567

574 -* jc/diff-files-ita (2015-02-04) 1 commit

575 - (merged to 'next' on 2015-02-16 at d7867a3)

576 - + run_diff_files(): clarify computation of sha1 validity

577 -

578 - Code cleanup.

579 -

580 - Will merge to 'master'.

581 -

582 -

583 -* ss/check-builtins-on-windows (2015-02-05) 1 commit

584 - (merged to 'next' on 2015-02-16 at 2c10cc1)

585 - + check-builtins: strip executable suffix $X when enumerating builtins

586 -

587 - Will merge to 'master'.

588 -

589 -

568 * jc/apply-beyond-symlink (2015-02-10) 4 commits

569 (merged to 'next' on 2015-02-18 at 4109de1)

570 + apply: do not touch a file beyond a symbolic link

@@ -602,37 +580,6 @@ of the repositories listed at

580 Will merge to 'master'.

581

582

605 -* jk/prune-mtime (2015-02-09) 2 commits

606 - (merged to 'next' on 2015-02-16 at 3d46eae)

607 - + sha1_file: fix iterating loose alternate objects

608 - + for_each_loose_file_in_objdir: take an optional strbuf path

609 -

610 - In v2.2.0, we broke "git prune" that runs in a repository that

611 - borrows from an alternate object store.

612 -

613 - Will merge to 'master'.

614 -

615 -

616 -* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit

617 - (merged to 'next' on 2015-02-16 at 8253132)

618 - + git-submodule.sh: fix '/././' path normalization

619 -

620 - "git submodule add" failed to squash "path/to/././submodule" to

621 - "path/to/submodule".

622 -

623 - Will merge to 'master'.

624 -

625 -

626 -* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit

627 - (merged to 'next' on 2015-02-16 at de90f95)

628 - + Makefile: handle broken curl version number in version check

629 -

630 - Certain older vintages of cURL give irregular output from

631 - "curl-config --vernum", which confused our build system.

632 -

633 - Will merge to 'master'.

634 -

635 -

583 * tc/missing-http-proxyauth (2015-02-03) 1 commit

584 (merged to 'next' on 2015-02-18 at 8ff01ad)

585 + http: support curl < 7.10.7

@@ -653,18 +600,6 @@ of the repositories listed at

600 Will merge to 'master'.

601

602

656 -* jc/conf-var-doc (2015-02-02) 3 commits

657 - (merged to 'next' on 2015-02-16 at 97512a3)

658 - + CodingGuidelines: describe naming rules for configuration variables

659 - + config.txt: mark deprecated variables more prominently

660 - + config.txt: clarify that add.ignore-errors is deprecated

661 -

662 - Longstanding configuration variable naming rules has been added to

663 - the documentation.

664 -

665 - Will merge to 'master'.

666 -

667 -

603 * js/fsck-opt (2015-01-21) 19 commits

604 - fsck: support ignoring objects in `git fsck` via fsck.skiplist

605 - fsck: git receive-pack: support excluding objects from fsck'ing

What's cooking (2015/02 #06)