17549b9d86 · 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 2012, #08; Sun, 25)

4 -X-master-at: e8a1f5a2ae53805986b1b965e036450bdfc0c460

5 -X-next-at: 9942e54037a4342f619d609da15329417569d00b

3 +Subject: What's cooking in git.git (Nov 2012, #09; Wed, 28)

4 +X-master-at: b7973fbbc3f8f72df352f4ef1a2ff325db92c36f

5 +X-next-at: 0e4115f14e74f5bdd623ce876941a254499f6c9d

6

7 -What's cooking in git.git (Nov 2012, #08; Sun, 25)

7 +What's cooking in git.git (Nov 2012, #09; Wed, 28)

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 'maint' has been tagged as 1.8.0.1 with many fixes since

15 -the 1.8.0 release.

14 +Hopefully 1.8.1-rc0 preview will be tagged this weekend. Many

15 +topics are marked to be cooked in 'next' during the feature freeze,

16 +but some topics in flight should be in 'master' before -rc1 happens.

17

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

19 repositories listed at

@@ -20,54 +21,137 @@ repositories listed at

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

22

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

23 -[Graduated to "master"]

24 +[New Topics]

25 +

26 +* bc/append-signed-off-by (2012-11-26) 11 commits

27 + - Unify appending signoff in format-patch, commit and sequencer

28 + - format-patch: update append_signoff prototype

29 + - format-patch: stricter S-o-b detection

30 + - t4014: more tests about appending s-o-b lines

31 + - sequencer.c: teach append_signoff to avoid adding a duplicate newline

32 + - sequencer.c: teach append_signoff how to detect duplicate s-o-b

33 + - sequencer.c: always separate "(cherry picked from" from commit body

34 + - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

35 + - t/t3511: add some tests of 'cherry-pick -s' functionality

36 + - t/test-lib-functions.sh: allow to specify the tag name to test_commit

37 + - sequencer.c: remove broken support for rfc2822 continuation in footer

38 +

39 + Will merge to 'next'.

40 +

41 +

42 +* er/doc-add-new-commands (2012-11-26) 1 commit

43 + - Documentation: how to add a new command

44 +

45 + Will merge to 'next'.

46 +

47 +

48 +* fc/send-email-no-sender-prompt (2012-11-26) 1 commit

49 + - send-email: avoid questions when user has an ident

50 + (this branch is used by jk/send-email-sender-prompt.)

51 +

52 + Will merge to 'next'.

53 +

54 +

55 +* jl/submodule-rm (2012-11-23) 1 commit

56 + (merged to 'next' on 2012-11-28 at 0e4115f)

57 + + Teach rm to remove submodules when given with a trailing '/'

58 +

59 + Finishing touches to the topic already in 'master'.

60 + Will merge to 'master'.

61 +

62 +

63 +* km/send-email-remove-cruft-in-address (2012-11-26) 5 commits

64 + - git-send-email: allow edit invalid email address

65 + - git-send-email: ask what to do with an invalid email address

66 + - git-send-email: remove invalid addresses earlier

67 + - git-send-email: fix fallback code in extract_valid_address()

68 + - git-send-email: remove garbage after email address

69 +

70 + Will merge to 'next'.

71 +

72 +

73 +* mh/unify-xml-in-imap-send-and-http-push (2012-11-26) 8 commits

74 + - wrap_in_html(): process message in bulk rather than line-by-line

75 + - wrap_in_html(): use strbuf_addstr_xml_quoted()

76 + - imap-send: change msg_data from storing (char *, len) to storing strbuf

77 + - imap-send: correctly report errors reading from stdin

78 + - imap-send: store all_msgs as a strbuf

79 + - lf_to_crlf(): NUL-terminate msg_data::data

80 + - xml_entities(): use function strbuf_addstr_xml_quoted()

81 + - Add new function strbuf_add_xml_quoted()

82 +

83 +

84 +* pw/p4-various-fixes (2012-11-26) 6 commits

85 + - git p4: remove unneeded cmd initialization

86 + - git p4: fix labelDetails typo in exception

87 + - git p4 test: display unresolvable host error

88 + - git p4: catch p4 errors when streaming file contents

89 + - git p4: handle servers without move support

90 + - git p4: catch p4 describe errors

91 +

92 + Will merge to 'next'.

93 +

94 +

95 +* rr/t4041-cleanup (2012-11-27) 4 commits

96 + - t4041 (diff-submodule-option): modernize style

97 + - t4041 (diff-submodule-option): rewrite add_file() routine

98 + - t4041 (diff-submodule-option): parse digests sensibly

99 + - t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs

100 +

101 + As a clean-up, it still misses some.

102 +

103 +

104 +* jc/doc-maintainer (2012-11-27) 1 commit

105 + - update "howto maintain git"

106 +

107 + An early draft that is still incomplete.

108

25 -* bc/do-not-recurse-in-die (2012-11-15) 1 commit

26 - (merged to 'next' on 2012-11-18 at 79d62a8)

27 - + usage.c: detect recursion in die routines and bail out immediately

109

110 +* jc/doc-push-satellite (2012-11-27) 1 commit

111 + - Documentation/git-push.txt: clarify the "push from satellite" workflow

112 +

113 + Will merge to 'next'.

114

30 -* jh/update-ref-d-through-symref (2012-10-21) 2 commits

31 - (merged to 'next' on 2012-11-19 at 6bcca4c)

32 - + Fix failure to delete a packed ref through a symref

33 - + t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

115

35 - "update-ref -d --deref SYM" to delete a ref through a symbolic ref

36 - that points to it did not remove it correctly.

116 +* jk/fsck-dot-in-trees (2012-11-28) 1 commit

117 + - fsck: warn about '.' and '..' in trees

118 +

119 + Will merge to 'next'.

120

121

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

40 - (merged to 'next' on 2012-11-19 at 0037290)

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

122 +* lt/diff-stat-show-0-lines (2012-11-27) 6 commits

123 + - diff --shortstat: do not count "unmerged" entries

124 + - diff --stat: do not count "unmerged" entries

125 + - diff --stat: move the "total count" logic to the last loop

126 + - diff --stat: use "file" temporary variable to refer to data->files[i]

127 + - diff --stat: status of unmodified pair in diff-q is not zero

128 + - test: add failing tests for "diff --stat" to t4049

129

43 - We failed to mention a file without any content change but whose

44 - permission bit was modified, or (worse yet) a new file without any

45 - content in the "git diff --stat" output.

130 + Will merge to 'next'.

131

132

48 -* mk/complete-tcsh (2012-11-16) 1 commit

49 - (merged to 'next' on 2012-11-19 at 8309029)

50 - + tcsh-completion re-using git-completion.bash

133 +* mh/doc-remote-helpers (2012-11-27) 6 commits

134 + - git-remote-helpers.txt: clarify options & ref list attributes

135 + - git-remote-helpers.txt: clarify command <-> capability correspondences

136 + - git-remote-helpers.txt: rearrange description of capabilities

137 + - git-remote-helpers.txt: minor grammar fix

138 + - git-remote-helpers.txt: document missing capabilities

139 + - git-remote-helpers.txt: document invocation before input format

140

141 + Need comment and Ack from people who have worked on remote-helpers

142 + before this goes forward.

143

53 -* nd/maint-compat-fnmatch-fix (2012-11-20) 1 commit

54 - (merged to 'next' on 2012-11-21 at ce6fbe5)

55 - + compat/fnmatch: fix off-by-one character class's length check

144

145 +* mh/pthreads-autoconf (2012-11-27) 1 commit

146 + - configure.ac: fix pthreads detection on Mac OS X

147

58 -* rr/submodule-diff-config (2012-11-18) 4 commits

59 - (merged to 'next' on 2012-11-19 at 355319e)

60 - + submodule: display summary header in bold

61 - + diff: rename "set" variable

62 - + diff: introduce diff.submodule configuration variable

63 - + Documentation: move diff.wordRegex from config.txt to diff-config.txt

148 + Will merge to 'next'.

149

65 - Lets "git diff --submodule=log" become the default via configuration.

150

151 +* mk/complete-tcsh (2012-11-27) 1 commit

152 + - Support for git aliasing for tcsh completion

153

68 -* sg/complete-help-undup (2012-11-14) 1 commit

69 - (merged to 'next' on 2012-11-18 at eadd0f3)

70 - + completion: remove 'help' duplicate from porcelain commands

154 + Will merge to 'next'.

155

156 --------------------------------------------------

157 [Stalled]

@@ -170,47 +254,6 @@ repositories listed at

254 remote interface happy with this change?

255

256

173 -* jk/send-email-sender-prompt (2012-11-15) 8 commits

174 - - send-email: do not prompt for explicit repo ident

175 - - Git.pm: teach "ident" to query explicitness

176 - - var: provide explicit/implicit ident information

177 - - var: accept multiple variables on the command line

178 - - ident: keep separate "explicit" flags for author and committer

179 - - ident: make user_ident_explicitly_given static

180 - - t7502: factor out autoident prerequisite

181 - - test-lib: allow negation of prerequisites

182 -

183 - Avoid annoying sender prompt in git-send-email, but only when it is

184 - safe to do so.

185 -

186 - Perhaps keep only the first three patches, and replace the rest

187 - with the one from Felipe that takes a much simpler approach (the

188 - rationale of that patch needs to be cleaned up first, along the

189 - lines Jeff outlined, though). Frozen until that happens.

190 -

191 -

192 -* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit

193 - - Unify appending signoff in format-patch, commit and sequencer

194 -

195 - I am not sure if the logic to refrain from adding a sign-off based

196 - on the existing run of sign-offs is done correctly in this change.

197 -

198 -

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

200 - . pretty: support %>> that steal trailing spaces

201 - . pretty: support truncating in %>, %< and %><

202 - . pretty: support padding placeholders, %< %> and %><

203 - . pretty: two phase conversion for non utf-8 commits

204 - . utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences

205 - . utf8.c: move display_mode_esc_sequence_len() for use by other functions

206 - . pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)

207 - . pretty: split parsing %C into a separate function

208 - . pretty: share code between format_decoration and show_decorations

209 -

210 - This causes warnings with -Wuninitialized, so I've ejected it from pu

211 - for the time being.

212 -

213 -

257 * rc/maint-complete-git-p4 (2012-09-24) 1 commit

258 (merged to 'next' on 2012-10-29 at af52cef)

259 + Teach git-completion about git p4

@@ -276,7 +319,7 @@ repositories listed at

319 Stalled mostly due to lack of responses.

320

321

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

322 +* jc/doc-default-format (2012-11-26) 2 commits

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

324 - Allow generating a non-default set of documentation

325

@@ -323,48 +366,76 @@ repositories listed at

366 "The first remote becomes the default" bit is better done as a

367 separate step.

368

369 +--------------------------------------------------

370 +[Cooking]

371

372 * mh/ceiling (2012-10-29) 8 commits

328 - - string_list_longest_prefix(): remove function

329 - - setup_git_directory_gently_1(): resolve symlinks in ceiling paths

330 - - longest_ancestor_length(): require prefix list entries to be normalized

331 - - longest_ancestor_length(): take a string_list argument for prefixes

332 - - longest_ancestor_length(): use string_list_split()

333 - - Introduce new function real_path_if_valid()

334 - - real_path_internal(): add comment explaining use of cwd

335 - - Introduce new static function real_path_internal()

373 + (merged to 'next' on 2012-11-26 at d1ce76a)

374 + + string_list_longest_prefix(): remove function

375 + + setup_git_directory_gently_1(): resolve symlinks in ceiling paths

376 + + longest_ancestor_length(): require prefix list entries to be normalized

377 + + longest_ancestor_length(): take a string_list argument for prefixes

378 + + longest_ancestor_length(): use string_list_split()

379 + + Introduce new function real_path_if_valid()

380 + + real_path_internal(): add comment explaining use of cwd

381 + + Introduce new static function real_path_internal()

382

383 Elements of GIT_CEILING_DIRECTORIES list may not match the real

384 pathname we obtain from getcwd(), leading the GIT_DIR discovery

385 logic to escape the ceilings the user thought to have specified.

386

341 ---------------------------------------------------

342 -[Cooking]

387 + Resurrected from Stalled; the earlier performance fear was

388 + unwarranted.

389 +

390 + Will cook in 'next'.

391

344 -* fc/fast-export-fixes (2012-11-21) 19 commits

392 +

393 +* jk/send-email-sender-prompt (2012-11-28) 7 commits

394 + - t9001: check send-email behavior with implicit sender

395 + - Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt

396 + - t: add tests for "git var"

397 + - ident: keep separate "explicit" flags for author and committer

398 + - ident: make user_ident_explicitly_given static

399 + - t7502: factor out autoident prerequisite

400 + - test-lib: allow negation of prerequisites

401 + (this branch uses fc/send-email-no-sender-prompt.)

402 +

403 + Resurrected only the internal clean-up part.

404 +

405 + Will merge to 'next'.

406 +

407 +

408 +* fc/fast-export-fixes (2012-11-27) 25 commits

409 + - fast-export: trivial cleanups

410 + - fast-export: refactor get_tags_and_duplicates()

411 + - fast-export: make extra_refs global

412 + - transport-helper: fix push without marks

413 + - transport-helper: fix pushing with straight refspec

414 + - transport-helper: fix push without refspec

415 + - transport-helper: trivial code shuffle

416 + - [squash] earlier breakages in t5800 fixed by the previous

417 - fast-export: don't handle uninteresting refs

418 + - transport-helper: update remote helper namespace

419 + - [squash] previous breaks t5800

420 - fast-export: make sure updated refs get updated

421 - fast-export: fix comparison in tests

422 - fast-export: trivial cleanup

349 - - remote-testgit: advertise "done" feature and write "done" ourselves

350 - - fixup! remote-testgit: report success after an import

423 + - remote-testgit: implement the "done" feature manually

424 - remote-testgit: report success after an import

352 - - fixup! remote-testgit: exercise non-default refspec feature

353 - - remote-testgit: exercise non-default refspec feature

425 + - remote-testgit: exercise more features

426 - remote-testgit: cleanup tests

427 - remote-testgit: remove irrelevant test

356 - - remote-testgit: remove non-local tests

357 - - fixup! Add git-remote-testgit

358 - - Add git-remote-testgit

428 + - remote-testgit: remove non-local functionality

429 + - Add new simplified git-remote-testgit

430 - Rename git-remote-testgit to git-remote-testpy

431 - remote-helpers: fix failure message

432 - remote-testgit: fix direction of marks

362 - - fixup! fast-export: avoid importing blob marks

433 - fast-export: avoid importing blob marks

434

365 - Replaced with the last re-roll posted to the list, queued with

366 - various fixup! commits to record suggested changes (most are

367 - trivial style fixes).

435 + It needs a bit of re-roll or reorder to keep things bisectable, at

436 + least, and with log message here and there to justify non-trivial

437 + bits with something better than unsubstantiated "this is trivial"

438 + claim. Overall, the series looked OK.

439

440

441 * pp/gitweb-config-underscore (2012-11-21) 1 commit

@@ -373,36 +444,42 @@ repositories listed at

444 The key "gitweb.remote_heads" is not legal git config; this maps it to

445 "gitweb.remoteheads".

446

447 + Will merge to 'next'.

448 +

449

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

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

451 + (merged to 'next' on 2012-11-26 at 3af69e7)

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

453

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

455 possibility that whitespace fix could shrink the preimage and

456 change the number of lines in it.

457

384 - Will merge to 'next'.

458 + Will cook in 'next'.

459

460

387 -* nd/pathspec-wildcard (2012-11-19) 4 commits

461 +* nd/pathspec-wildcard (2012-11-26) 4 commits

462 - tree_entry_interesting: do basedir compare on wildcard patterns when possible

463 - pathspec: apply "*.c" optimization from exclude

464 - pathspec: do exact comparison on the leading non-wildcard part

465 - pathspec: save the non-wildcard length part

466

467 + Will merge to 'next'.

468 +

469

470 * mm/status-push-pull-advise (2012-11-16) 1 commit

395 - - status: add advice on how to push/pull to tracking branch

471 + (merged to 'next' on 2012-11-26 at ed40d5e)

472 + + status: add advice on how to push/pull to tracking branch

473

397 - Will merge to 'next'.

474 + Will merge to 'master' in the seventh batch.

475

476

477 * fc/zsh-completion (2012-11-19) 2 commits

401 - - completion: start moving to the new zsh completion

402 - - completion: add new zsh completion

478 + (merged to 'next' on 2012-11-26 at 48ebdc9)

479 + + completion: start moving to the new zsh completion

480 + + completion: add new zsh completion

481

404 - Replaced by shedding large changes to other independent topics.

405 - Any comments from zsh users?

482 + Will merge to 'master' in the seventh batch.

483

484

485 * nd/wildmatch (2012-11-20) 14 commits

@@ -448,30 +525,39 @@ repositories listed at

525 itself, but I think that issue should be addressed in some other

526 way (e.g. making sure individual tests in 9902 can be skipped).

527

528 + Will merge to 'next'.

529 +

530

531 * jk/pickaxe-textconv (2012-10-28) 2 commits

453 - - pickaxe: use textconv for -S counting

454 - - pickaxe: hoist empty needle check

532 + (merged to 'next' on 2012-11-26 at 2c5b5c9)

533 + + pickaxe: use textconv for -S counting

534 + + pickaxe: hoist empty needle check

535

536 Use textconv filters when searching with "log -S".

537

458 - Will merge to 'next'.

459 -

538 + Will merge to 'master' in the seventh batch.

539

461 -* fc/remote-bzr (2012-11-08) 5 commits

462 - (merged to 'next' on 2012-11-18 at 86add07)

463 - + remote-bzr: update working tree

464 - + remote-bzr: add support for remote repositories

465 - + remote-bzr: add support for pushing

466 - + remote-bzr: add simple tests

467 - + Add new remote-bzr transport helper

540

469 - New remote helper for bzr.

541 +* fc/remote-bzr (2012-11-28) 10 commits

542 + - (fixup) test-bzr.sh: fix multi-line string assignment

543 + - remote-bzr: detect local repositories

544 + - remote-bzr: add support for older versions of bzr

545 + - remote-bzr: add support to push special modes

546 + - remote-bzr: add support for fecthing special modes

547 + - remote-bzr: add simple tests

548 + - remote-bzr: update working tree

549 + - remote-bzr: add support for remote repositories

550 + - remote-bzr: add support for pushing

551 + - Add new remote-bzr transport helper

552

471 - Will merge to 'master' in the seventh batch.

553 + New remote helper for bzr (v3). With minor fixes this may be ready

554 + for 'next'.

555

556

474 -* fc/remote-hg (2012-11-12) 20 commits

557 +* fc/remote-hg (2012-11-27) 22 commits

558 + (merged to 'next' on 2012-11-28 at f805784)

559 + + remote-hg: fix for older versions of python

560 + + remote-hg: fix for files with spaces

561 (merged to 'next' on 2012-11-18 at 4a4f2e4)

562 + remote-hg: avoid bad refs

563 + remote-hg: try the 'tip' if no checkout present

@@ -496,14 +582,45 @@ repositories listed at

582

583 New remote helper for hg.

584

499 - Will merge to 'master' in the seventh batch.

585 + Will merge to 'master'.

586

587

502 -* cr/push-force-tag-update (2012-11-19) 5 commits

503 - - push: update remote tags only with force

588 +* cr/push-force-tag-update (2012-11-26) 7 commits

589 + - push: clarify rejection of update to non-commit-ish

590 + - push: require force for annotated tags

591 + - push: require force for refs under refs/tags/

592 - push: flag updates that require force

593 - push: keep track of "update" state separately

594 - push: add advice for rejected tag reference

595 - push: return reject reasons via a mask

596

597 Require "-f" for push to update a tag, even if it is a fast-forward.

598 +

599 + With a minor tweak, I think this is getting ready for 'next'.

600 +

601 +--------------------------------------------------

602 +[Discarded]

603 +

604 +* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit

605 + . Unify appending signoff in format-patch, commit and sequencer

606 +

607 + I am not sure if the logic to refrain from adding a sign-off based

608 + on the existing run of sign-offs is done correctly in this change.

609 +

610 + Brandon's series attempts the same thing and seemed to be more

611 + cleanly done.

612 +

613 +

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

615 + . pretty: support %>> that steal trailing spaces

616 + . pretty: support truncating in %>, %< and %><

617 + . pretty: support padding placeholders, %< %> and %><

618 + . pretty: two phase conversion for non utf-8 commits

619 + . utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences

620 + . utf8.c: move display_mode_esc_sequence_len() for use by other functions

621 + . pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)

622 + . pretty: split parsing %C into a separate function

623 + . pretty: share code between format_decoration and show_decorations

624 +

625 + This causes warnings with -Wuninitialized, so I've ejected it from pu

626 + for the time being.

What's cooking (2012/11 #09)