f22b746dba · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Nov 2013, #05; Thu, 21)

4 -X-master-at: 5fd09df3937f54c5cfda4f1087f5d99433cce527

5 -X-next-at: df10213b17da8480bb44fc5e4ff77001f2265457

3 +Subject: What's cooking in git.git (Dec 2013, #01; Wed, 4)

4 +X-master-at: daad3aa255ec5c08f95867feaaf8f4db03346e70

5 +X-next-at: dd8f0929c2ec5ca88db21a610c529223e471ab6c

6

7 -What's cooking in git.git (Nov 2013, #05; Thu, 21)

7 +What's cooking in git.git (Dec 2013, #01; Wed, 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 -Hopefully 1.8.5-rc3 that was tagged on Wednesday will be the final

15 -release candidate for this cycle.

14 +There are quite a many topics that have been left over from the

15 +previous round. I haven't rewound the tip of 'next' yet, but I am

16 +planning to do so real soon now, kicking some topics out of it.

17

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

19 of the repositories listed at

@@ -22,64 +23,181 @@ of the repositories listed at

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

24 [Graduated to "master"]

25

25 -* nd/liteal-pathspecs (2013-10-28) 1 commit

26 - (merged to 'next' on 2013-11-01 at 1a91775)

27 - + pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

28 -

29 - Fixes a regression on 'master' since v1.8.4.

26 +* jj/doc-markup-gitcli (2013-11-20) 1 commit

27 + (merged to 'next' on 2013-11-21 at 5e49fa8)

28 + + Documentation/gitcli.txt: fix double quotes

29

31 ---------------------------------------------------

32 -[New Topics]

30

31 * jj/doc-markup-hints-in-coding-guidelines (2013-11-18) 1 commit

32 (merged to 'next' on 2013-11-21 at 9c638a6)

33 + State correct usage of literal examples in man pages in the coding standards

34

38 - Can wait in 'next'.

35

36 +* jj/log-doc (2013-11-13) 2 commits

37 + (merged to 'next' on 2013-11-21 at cb0ddd2)

38 + + Documentation/git-log.txt: mark-up fix and minor rephasing

39 + + Documentation/git-log: update "--log-size" description

40

41 -* jn/perl-lib-extra (2013-11-18) 2 commits

42 - (merged to 'next' on 2013-11-20 at 8c90afae)

43 - + Makefile: add PERLLIB_EXTRA variable that adds to default perl path

44 - + Makefile: rebuild perl scripts when perl paths change

41

42 +* jj/rev-list-options-doc (2013-11-18) 2 commits

43 + (merged to 'next' on 2013-11-20 at db975de)

44 + + Documentation/rev-list-options.txt: fix some grammatical issues and typos

45 + + Documentation/rev-list-options.txt: fix mark-up

46

47 -* jj/doc-markup-gitcli (2013-11-20) 1 commit

48 - (merged to 'next' on 2013-11-21 at 5e49fa8)

49 - + Documentation/gitcli.txt: fix double quotes

47

51 - Can wait in 'next'.

48 +* mi/typofixes (2013-11-12) 3 commits

49 + (merged to 'next' on 2013-11-13 at bb7c2eb)

50 + + contrib: typofixes

51 + + Documentation/technical/http-protocol.txt: typofixes

52 + + typofixes: fix misspelt comments

53

54

54 -* jk/remove-experimental-loose-object-support (2013-11-21) 1 commit

55 - (merged to 'next' on 2013-11-21 at d37bab7)

56 - + drop support for "experimental" loose objects

55 +* nd/glossary-content-pathspec-markup (2013-11-21) 1 commit

56 + (merged to 'next' on 2013-11-21 at 6072636)

57 + + glossary-content.txt: fix documentation of "**" patterns

58

58 - Can wait in 'next'.

59

60 +* tb/doc-fetch-pack-url (2013-11-11) 1 commit

61 + (merged to 'next' on 2013-11-13 at 90d6832)

62 + + git-fetch-pack uses URLs like git-fetch

63

61 -* jl/commit-v-strip-marker (2013-11-19) 1 commit

62 - - commit -v: strip diffs and submodule shortlogs from the commit message

64 +--------------------------------------------------

65 +[New Topics]

66

64 - Perhaps another reroll for core.commentChar coming?

67 +* cl/p4-use-diff-tree (2013-11-22) 1 commit

68 + (merged to 'next' on 2013-11-27 at 11926ce)

69 + + git p4: Use git diff-tree instead of format-patch

70

71 + Will merge to 'master'.

72

67 -* nd/glossary-content-pathspec-markup (2013-11-21) 1 commit

68 - (merged to 'next' on 2013-11-21 at 6072636)

69 - + glossary-content.txt: fix documentation of "**" patterns

73

71 - Can wait in 'next'.

74 +* jn/scripts-updates (2013-11-26) 11 commits

75 + (merged to 'next' on 2013-11-27 at 5056d4d)

76 + + Merge commit '0f2068c4cfb8bc84d338265f03c773e5559e761d' into jn/scripts-updates

77 + + gitk: chmod +x po2msg

78 + + Merge commit '688eb87c9444686180d8f379ab854bcbc34db4db' into jn/scripts-updates

79 + + git-gui: chmod +x po2msg, windows/git-gui.sh

80 + + remove #!interpreter line from shell libraries

81 + + test: replace shebangs with descriptions in shell libraries

82 + + test: make FILEMODE a lazy prereq

83 + + contrib: remove git-p4import

84 + + mark contributed hooks executable

85 + + mark perl test scripts executable

86 + + mark Windows build scripts executable

87

88 + Will drop the two merges at the tip to gitk and git-gui parts of

89 + the tree, as I've forwarded the relevant patches to the upstream

90 + and expect them to come back later from their respective trees.

91 +

92 +

93 +* tr/commit-slab-cleanup (2013-12-02) 3 commits

94 + (merged to 'next' on 2013-12-02 at f545f4d)

95 + + commit-slab: sizeof() the right type in xrealloc

96 + (merged to 'next' on 2013-11-27 at 84d5a73)

97 + + commit-slab: declare functions "static inline"

98 + + commit-slab: document clear_$slabname()

99 +

100 +

101 +* tr/doc-git-cherry (2013-11-27) 1 commit

102 + (merged to 'next' on 2013-11-27 at d37f520)

103 + + Documentation: revamp git-cherry(1)

104 +

105 + Will merge to 'master'.

106 +

107 +

108 +* aa/transport-non-positive-depth-only (2013-11-26) 1 commit

109 + (merged to 'next' on 2013-11-27 at b01f05b)

110 + + transport: catch non positive --depth option value

111 +

112 + Will merge to 'master'.

113 +

114 +

115 +* rs/doc-submitting-patches (2013-11-27) 1 commit

116 + (merged to 'next' on 2013-11-27 at f8886f4)

117 + + SubmittingPatches: document how to handle multiple patches

118 +

119 + Will merge to 'master'.

120 +

121 +

122 +* cc/starts-n-ends-with (2013-12-04) 4 commits

123 + - replace {pre,suf}fixcmp() with {starts,ends}_with()

124 + - strbuf: introduce starts_with() and ends_with()

125 + - builtin/remote: remove postfixcmp() and use suffixcmp() instead

126 + - environment: normalize use of prefixcmp() by removing " != 0"

127 + (this branch is used by cc/starts-n-ends-with-endgame.)

128 +

129 + Remove a few duplicate implementations of prefix/suffix comparison

130 + functions, and rename them to starts_with and ends_with.

131 +

132 + This conflicts with a part of cc/remote-remove-redundant-postfixcmp

133 + topic (I think it actually subsumes it).

134 +

135 +

136 +* cc/starts-n-ends-with-endgame (2013-12-04) 1 commit

137 + - strbuf: remove prefixcmp() and suffixcmp()

138 + (this branch uses cc/starts-n-ends-with.)

139 +

140 + Endgame for the above topic, that needs to be evil-merged with

141 + other topics that introduce new uses of prefix/suffix-cmp

142 + functions.

143 +

144 +

145 +* jc/push-refmap (2013-12-04) 3 commits

146 + - push: also use "upstream" mapping when pushing a single ref

147 + - push: use remote.$name.push as a refmap

148 + - builtin/push.c: use strbuf instead of manual allocation

149 +

150 + Make "git push origin master" update the same ref that would be

151 + updated by our 'master' when "git push origin" (no refspecs) is run

152 + while the 'master' branch is checked out, which makes "git push"

153 + more symmetric to "git fetch" and more usable for the triangular

154 + workflow.

155 +

156 +

157 +* jk/t5000-gzip-simplify (2013-12-04) 1 commit

158 + - t5000: simplify gzip prerequisite checks

159 +

160 + Test fix.

161 +

162 +

163 +* js/gnome-keyring (2013-12-04) 1 commit

164 + - contrib/git-credential-gnome-keyring.c: small stylistic cleanups

165 +

166 + Style fix.

167 +

168 +

169 +* kn/gitweb-extra-branch-refs (2013-12-04) 4 commits

170 + - gitweb: Denote non-heads, non-remotes branches

171 + - gitweb: Add a feature for adding more branch refs

172 + - gitweb: Return plain booleans in validation methods

173 + - gitweb: Move check-ref-format code into separate function

174 +

175 + Allow gitweb to be configured to show refs out of refs/heads/ as if

176 + they were branches.

177

74 -* nd/magic-pathspec (2013-11-20) 1 commit

75 - (merged to 'next' on 2013-11-21 at f914a30)

76 - + diff: restrict pathspec limitations to diff b/f case only

178

78 - Can wait in 'next'.

179 +* mm/mv-file-to-no-such-dir-with-slash (2013-12-04) 1 commit

180 + - mv: let 'git mv file no-such-dir/' error out

181 +

182 +

183 +* nd/gettext-vsnprintf (2013-12-04) 1 commit

184 + - gettext.c: detect the vsnprintf bug at runtime

185 +

186 +

187 +* tr/send-email-ssl (2013-12-04) 3 commits

188 + - send-email: set SSL options through IO::Socket::SSL::set_client_defaults

189 + - send-email: --smtp-ssl-cert-path takes an argument

190 + - send-email: pass Debug to Net::SMTP::SSL::new

191

192 --------------------------------------------------

193 [Stalled]

194

195 +* jl/commit-v-strip-marker (2013-11-19) 1 commit

196 + - commit -v: strip diffs and submodule shortlogs from the commit message

197 +

198 + Perhaps another reroll for core.commentChar coming?

199 +

200 +

201 * fc/transport-helper-fixes (2013-11-13) 12 commits

202 - remote-bzr: support the new 'force' option

203 - transport-helper: add support to delete branches

@@ -113,22 +231,6 @@ of the repositories listed at

231 Needs tests, perhaps?

232

233

116 -* tb/clone-ssh-with-colon-for-port (2013-11-04) 1 commit

117 - . git clone: is an URL local or ssh

118 -

119 - Still being reworked.

120 -

121 -

122 -* cn/thin-push-capability (2013-11-06) 2 commits

123 - - send-pack: only send a thin pack if the server supports it

124 - - receive-pack: advertise thin-pack

125 -

126 - Peff had a good suggestion to control this by expressing what the

127 - receiving end wants in a more direct way, namely to advertise a

128 - 'no-thin' trait in the capability list, which seems to be favored

129 - by Shawn, too.

130 -

131 -

234 * jt/commit-fixes-footer (2013-10-30) 1 commit

235 - commit: Add -f, --fixes <commit> option to add Fixes: line

236

@@ -270,36 +372,63 @@ of the repositories listed at

372 --------------------------------------------------

373 [Cooking]

374

273 -* jj/log-doc (2013-11-13) 2 commits

274 - (merged to 'next' on 2013-11-21 at cb0ddd2)

275 - + Documentation/git-log.txt: mark-up fix and minor rephasing

276 - + Documentation/git-log: update "--log-size" description

375 +* tb/clone-ssh-with-colon-for-port (2013-12-04) 10 commits

376 + - git_connect(): use common return point

377 + - connect.c: refactor url parsing

378 + - git_connect(): refactor the port handling for ssh

379 + - git fetch: support host:/~repo

380 + - t5500: add test cases for diag-url

381 + - git fetch-pack: add --diag-url

382 + - git_connect: factor out discovery of the protocol and its parts

383 + - git_connect: remove artificial limit of a remote command

384 + - t5601: add tests for ssh

385 + - t5601: remove clear_ssh, refactor setup_ssh_wrapper

386

278 - Mark-up fixes.

387

280 - Can wait in 'next'.

388

389 +* cn/thin-push-capability (2013-11-25) 1 commit

390 + - send-pack: don't send a thin pack to a server which doesn't support it

391

283 -* jc/bundle (2013-11-12) 1 commit

284 - (merged to 'next' on 2013-11-21 at 535b046)

285 - + bundle: use argv-array

392 + Allow receive-pack to insist on receiving a fat pack from "git

393 + push" clients.

394

287 - Code clean-up.

395 + Will merge to 'next'.

396

289 - Can wait in 'next'.

397

398 +* jn/perl-lib-extra (2013-11-18) 2 commits

399 + (merged to 'next' on 2013-11-20 at 8c90afae)

400 + + Makefile: add PERLLIB_EXTRA variable that adds to default perl path

401 + + Makefile: rebuild perl scripts when perl paths change

402

292 -* jj/rev-list-options-doc (2013-11-18) 2 commits

293 - (merged to 'next' on 2013-11-20 at db975de)

294 - + Documentation/rev-list-options.txt: fix some grammatical issues and typos

295 - + Documentation/rev-list-options.txt: fix mark-up

403 + Will merge to 'master'.

404 +

405 +

406 +* jk/remove-experimental-loose-object-support (2013-11-21) 1 commit

407 + (merged to 'next' on 2013-11-21 at d37bab7)

408 + + drop support for "experimental" loose objects

409 +

410 + Will merge to 'master'.

411

297 - Mark-up and grammo fixes.

412

299 - Can wait in 'next'.

413 +* nd/magic-pathspec (2013-11-20) 1 commit

414 + (merged to 'next' on 2013-11-21 at f914a30)

415 + + diff: restrict pathspec limitations to diff b/f case only

416 +

417 + Will merge to 'master'.

418 +

419

420 +* jc/bundle (2013-11-12) 1 commit

421 + (merged to 'next' on 2013-11-21 at 535b046)

422 + + bundle: use argv-array

423 +

424 + Code clean-up.

425

302 -* jk/remove-deprecated (2013-11-12) 4 commits

426 + Will merge to 'master'.

427 +

428 +

429 +* jk/remove-deprecated (2013-12-03) 5 commits

430 + (merged to 'next' on 2013-12-03 at bc1da41)

431 + + stop installing git-tar-tree link

432 (merged to 'next' on 2013-11-13 at c324792)

433 + peek-remote: remove deprecated alias of ls-remote

434 + lost-found: remove deprecated command

@@ -309,16 +438,7 @@ of the repositories listed at

438 Will cook in 'next' until a distant future.

439

440

312 -* mi/typofixes (2013-11-12) 3 commits

313 - (merged to 'next' on 2013-11-13 at bb7c2eb)

314 - + contrib: typofixes

315 - + Documentation/technical/http-protocol.txt: typofixes

316 - + typofixes: fix misspelt comments

317 -

318 - Can wait in 'next'.

319 -

320 -

321 -* rh/remote-hg-bzr-updates (2013-11-18) 9 commits

441 +* rh/remote-hg-bzr-updates (2013-11-18) 8 commits

442 (merged to 'next' on 2013-11-20 at a36f3c4)

443 + remote-bzr, remote-hg: fix email address regular expression

444 + test-hg.sh: help user correlate verbose output with email test

@@ -328,23 +448,27 @@ of the repositories listed at

448 + test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

449 + test-bzr.sh, test-hg.sh: allow running from any dir

450 + test-lib.sh: convert $TEST_DIRECTORY to an absolute path

331 - + remote-hg: don't decode UTF-8 paths into Unicode objects

451

333 - Can wait in 'next'.

452 + The patch that used to be at the bottom of the series has been

453 + merged to v1.8.5, as it fixes a minor regression and has also been

454 + cherry-picked to 'maint'.

455 +

456 + Will merge to 'master'.

457

458

459 * tr/config-multivalue-lift-max (2013-11-13) 1 commit

460 (merged to 'next' on 2013-11-20 at d18aac9)

461 + config: arbitrary number of matches for --unset and --replace-all

462

340 - Can wait in 'next'.

463 + Will merge to 'master'.

464

465

466 * kb/doc-exclude-directory-semantics (2013-11-07) 1 commit

467 (merged to 'next' on 2013-11-13 at 06e5645)

468 + gitignore.txt: clarify recursive nature of excluded directories

469

347 - Can wait in 'next'.

470 + Will kick back to 'pu' to replace with a newer reroll ($gmane/237814

471 + looked OK but there seems to have some loose ends in the discussion).

472

473

474 * jc/create-directories-microopt (2013-11-11) 1 commit

@@ -362,7 +486,7 @@ of the repositories listed at

486

487 Code clean-up.

488

365 - Can wait in 'next'.

489 + Will merge to 'master'.

490

491

492 * jn/mediawiki-makefile-updates (2013-11-11) 4 commits

@@ -374,17 +498,12 @@ of the repositories listed at

498

499 Build and Installation procedure clean-up.

500

377 - Can wait in 'next'.

378 -

379 -

380 -* tb/doc-fetch-pack-url (2013-11-11) 1 commit

381 - (merged to 'next' on 2013-11-13 at 90d6832)

382 - + git-fetch-pack uses URLs like git-fetch

383 -

384 - Can wait in 'next'.

501 + Will merge to 'master'.

502

503

387 -* cc/remote-remove-redundant-postfixcmp (2013-11-06) 2 commits

504 +* cc/remote-remove-redundant-postfixcmp (2013-12-04) 3 commits

505 + (merged to 'next' on 2013-12-04 at dd8f092)

506 + + Revert 76e08227e5bc8b6e3d208da965d2421911d25ae3

507 (merged to 'next' on 2013-11-06 at 7b45219)

508 + Rename suffixcmp() to has_suffix() and invert its result

509 (merged to 'next' on 2013-11-04 at 6408502)

@@ -392,7 +511,7 @@ of the repositories listed at

511

512 Minor code clean-up.

513

395 - Can wait in 'next'.

514 + Will drop, as cc/starts-n-ends-with contains the same.

515

516

517 * nd/wt-status-align-i18n (2013-11-06) 1 commit

@@ -403,7 +522,7 @@ of the repositories listed at

522 output, taking the display width of (translated) section labels

523 into account.

524

406 - Can wait in 'next'.

525 + Will merge to 'master'.

526

527

528 * sb/sha1-loose-object-info-check-existence (2013-11-06) 1 commit

@@ -413,7 +532,7 @@ of the repositories listed at

532 "git cat-file --batch-check=ok" did not check the existence of the

533 named object.

534

416 - Will cook in 'next'.

535 + Will merge to 'master'.

536

537

538 * gj/push-more-verbose-advice (2013-11-13) 2 commits

@@ -426,10 +545,7 @@ of the repositories listed at

545 topmost patch is a rebase of jc/push-2.0-default-to-simple on top

546 of it.

547

429 - Will cook in 'next'.

430 -

431 - The first one should be merged to 'master' soon after the next

432 - cycle opens; the other to replace jc/push-2.0-default-to-simple.

548 + Will merge the bottom to 'master' and cook the other in 'next'.

549

550

551 * rr/for-each-ref-decoration (2013-11-19) 6 commits

@@ -441,7 +557,7 @@ of the repositories listed at

557 + t6300 (for-each-ref): don't hardcode SHA-1 hexes

558 + t6300 (for-each-ref): clearly demarcate setup

559

444 - Can wait in 'next'.

560 + Will merge to 'master'.

561

562

563 * jk/two-way-merge-corner-case-fix (2013-11-04) 3 commits

@@ -453,7 +569,7 @@ of the repositories listed at

569 Fix a rather longstanding corner-case bug in twoway "reset to

570 there" merge, which is most often seen in "git am --abort".

571

456 - Will cook in 'next'.

572 + Will merge to 'master'.

573

574

575 * jc/ref-excludes (2013-11-01) 5 commits

@@ -469,21 +585,21 @@ of the repositories listed at

585 from the expansion of "--branches" (similarly for "--tags", "--all"

586 and "--glob=<pattern>"). Now they have one.

587

472 - Can wait in 'next'.

588 + Will merge to 'master'.

589

590

591 * jk/replace-perl-in-built-scripts (2013-10-29) 1 commit

592 (merged to 'next' on 2013-11-01 at 2384e29)

593 + use @@PERL@@ in built scripts

594

479 - Can wait in 'next'.

595 + Will merge to 'master'.

596

597

598 * jh/loose-object-dirs-creation-race (2013-10-28) 1 commit

599 (merged to 'next' on 2013-11-01 at 3169b0f)

600 + sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

601

486 - Will cook in 'next'.

602 + Will merge to 'master'.

603

604

605 * th/reflog-annotated-tag (2013-10-28) 1 commit

@@ -519,7 +635,7 @@ of the repositories listed at

635 Issue "100 Continue" responses to help use of GSS-Negotiate

636 authentication scheme over HTTP transport when needed.

637

522 - Will cook in 'next'.

638 + Will merge to 'master'.

639

640

641 * jc/merge-base-reflog (2013-10-29) 2 commits

@@ -530,7 +646,7 @@ of the repositories listed at

646 Code the logic in "pull --rebase" that figures out a fork point

647 from reflog entries in C.

648

533 - Will cook in 'next'.

649 + Will merge to 'master'.

650

651

652 * jk/robustify-parse-commit (2013-10-24) 6 commits

@@ -542,7 +658,7 @@ of the repositories listed at

658 + assume parse_commit checks commit->object.parsed

659 + log_tree_diff: die when we fail to parse a commit

660

545 - Will cook in 'next'.

661 + Will merge to 'master'.

662

663

664 * mh/fetch-tags-in-addition-to-normal-refs (2013-10-30) 23 commits

@@ -571,7 +687,7 @@ of the repositories listed at

687 + t5510: prepare test refs more straightforwardly

688 + t5510: use the correct tag name in test

689

574 - The "-tags" option to "git fetch" used to be literally a synonym to

690 + The "--tags" option to "git fetch" used to be literally a synonym to

691 a "refs/tags/*:refs/tags/*" refspec, which meant that (1) as an

692 explicit refspec given from the command line, it silenced the lazy

693 "git fetch" default that is configured, and (2) also as an explicit

@@ -596,7 +712,7 @@ of the repositories listed at

712 Enhance "rev-parse --parseopt" mode to help parsing options with

713 an optional parameter.

714

599 - Will cook in 'next'.

715 + Will merge to 'master'.

716

717

718 * ak/submodule-foreach-quoting (2013-09-27) 1 commit

@@ -621,7 +737,7 @@ of the repositories listed at

737 so that scripts that used multiple arguments but added their own

738 extra layer of quoting are not broken.

739

624 - Will cook in 'next'.

740 + Will merge to 'master'.

741

742

743 * kb/fast-hashmap (2013-11-18) 14 commits

@@ -647,6 +763,8 @@ of the repositories listed at

763 also squashed in a fix-up by Karsten found at $gmane/236468 (please

764 double-check the result).

765

766 + Will merge to 'next'.

767 +

768

769 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

770 (merged to 'next' on 2013-10-28 at d8cdf30)

What's cooking (2013/12 #01)