049fec054c · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2014, #06; Tue, 25)

4 -X-master-at: d393d140b5656e608b332c00ea3b14f9a060d604

5 -X-next-at: 2ddfaae461cfeaf6df645d1978edc11df0e4914b

3 +Subject: What's cooking in git.git (Mar 2014, #07; Fri, 28)

4 +X-master-at: 96e67c86f817b4fbd492b12f57dae4bd821571ba

5 +X-next-at: f39dc61b64e8fe9f0fb9ad70df8bb78bf1f5f911

6

7 -What's cooking in git.git (Mar 2014, #06; Tue, 25)

7 +What's cooking in git.git (Mar 2014, #07; Fri, 28)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -22,124 +22,142 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

25 -* bb/diff-no-index-dotdot (2014-03-19) 2 commits

26 - (merged to 'next' on 2014-03-20 at 352f48c)

27 - + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()

28 - + diff-no-index: rename read_directory()

29 -

25 +* ah/doc-gitk-config (2014-03-20) 1 commit

26 + (merged to 'next' on 2014-03-20 at d671b60)

27 + + Documentation/gitk: document the location of the configulation file

28

31 -* cp/am-patch-format-doc (2014-03-17) 2 commits

32 - (merged to 'next' on 2014-03-17 at 7437c77)

33 - + Documentation/git-am: typofix

34 - (merged to 'next' on 2014-03-12 at 17c3ada)

35 - + Documentation/git-am: Document supported --patch-format options

29

30 +* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit

31 + (merged to 'next' on 2014-03-21 at 916b759)

32 + + rebase: allow "-" short-hand for the previous branch

33

38 -* dm/configure-iconv-locale-charset (2014-03-11) 1 commit

39 - (merged to 'next' on 2014-03-20 at 4443bfd)

40 - + configure.ac: link with -liconv for locale_charset()

34 + "git rebase" learned to interpret a lone "-" as "@{-1}", the

35 + branch that we were previously on.

36

37

43 -* jk/lib-terminal-lazy (2014-03-14) 1 commit

44 - (merged to 'next' on 2014-03-20 at 5de832f)

45 - + t/lib-terminal: make TTY a lazy prerequisite

38 +* bp/commit-p-editor (2014-03-18) 7 commits

39 + (merged to 'next' on 2014-03-21 at 23b6b06)

40 + + run-command: mark run_hook_with_custom_index as deprecated

41 + + merge hook tests: fix and update tests

42 + + merge: fix GIT_EDITOR override for commit hook

43 + + commit: fix patch hunk editing with "commit -p -m"

44 + + test patch hunk editing with "commit -p -m"

45 + + merge hook tests: use 'test_must_fail' instead of '!'

46 + + merge hook tests: fix missing '&&' in test

47

47 - The test helper lib-terminal always run an actual test_expect_* when

48 - included, which screwed up with the use of skil-all that may have to

49 - be done later.

48 + When it is not necessary to edit a commit log message (e.g. "git

49 + commit -m" is given a message without specifying "-e"), we used to

50 + disable the spawning of the editor by overriding GIT_EDITOR, but

51 + this means all the uses of the editor, other than to edit the

52 + commit log message, are also affected.

53

54

52 -* jk/mv-submodules-fix (2014-03-17) 2 commits

53 - (merged to 'next' on 2014-03-17 at 7cae3b1)

54 - + mv: prevent mismatched data when ignoring errors.

55 - + builtin/mv: fix out of bounds write

55 +* fr/add-interactive-argv-array (2014-03-18) 1 commit

56 + (merged to 'next' on 2014-03-20 at 9d65f3d)

57 + + add: use struct argv_array in run_add_interactive()

58

57 - "git mv" that moves a submodule forgot to adjust the array that

58 - uses to keep track of which submodules were to be moved to update

59 - its configuration.

59

60 +* jk/pack-bitmap (2014-03-17) 1 commit

61 + (merged to 'next' on 2014-03-20 at bba6246)

62 + + pack-objects: turn off bitmaps when skipping objects

63

62 -* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits

63 - (merged to 'next' on 2014-03-17 at 3f8e98e)

64 - + rev-list: disable object/refname ambiguity check with --stdin

65 - + cat-file: restore warn_on_object_refname_ambiguity flag

66 - + cat-file: fix a minor memory leak in batch_objects

67 - + cat-file: refactor error handling of batch_objects

64 + Instead of dying when asked to (re)pack with the reachability

65 + bitmap when a bitmap cannot be built, just (re)pack without

66 + producing a bitmap in such a case, with a warning.

67

68

70 -* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits

71 - (merged to 'next' on 2014-03-17 at 68cc994)

72 - + entry.c: fix possible buffer overflow in remove_subtree()

73 - + checkout_entry(): use the strbuf throughout the function

69 +* jk/pack-bitmap-progress (2014-03-17) 2 commits

70 + (merged to 'next' on 2014-03-20 at c7a83f9)

71 + + pack-objects: show reused packfile objects in "Counting objects"

72 + + pack-objects: show progress for reused packfiles

73

75 - Length limit for the pathname used when removing a path in a deep

76 - subdirectory has been removed to avoid buffer overflows.

74 + The progress output while repacking and transferring objects showed

75 + an apparent large silence while writing the objects out of existing

76 + packfiles, when the reachability bitmap was in use.

77

78

79 -* nd/commit-editor-cleanup (2014-02-25) 3 commits

80 - (merged to 'next' on 2014-03-17 at 986605d)

81 - + commit: add --cleanup=scissors

82 - + wt-status.c: move cut-line print code out to wt_status_add_cut_line

83 - + wt-status.c: make cut_line[] const to shrink .data section a bit

79 +* jk/subtree-prefix (2014-03-17) 1 commit

80 + (merged to 'next' on 2014-03-20 at 81367fa)

81 + + subtree: initialize "prefix" variable

82

85 - "git commit --cleanup=<mode>" learned a new mode, scissors.

83 + A stray environment variable $prefix could have leaked into and

84 + affected the behaviour of the "subtree" script.

85

86

88 -* nd/indent-fix-connect-c (2014-03-13) 1 commit

89 - (merged to 'next' on 2014-03-17 at a109efc)

90 - + connect.c: SP after "}", not TAB

87 +* ys/fsck-commit-parsing (2014-03-19) 2 commits

88 + (merged to 'next' on 2014-03-21 at 2728983)

89 + + fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant

90 + + fsck.c:fsck_ident(): ident points at a const string

91

92 +--------------------------------------------------

93 +[New Topics]

94

93 -* nd/index-pack-error-message (2014-03-17) 1 commit

94 - (merged to 'next' on 2014-03-20 at 4d722ac)

95 - + index-pack: report error using the correct variable

95 +* jc/apply-ignore-whitespace (2014-03-26) 1 commit

96 + - apply --ignore-space-change: lines with and without leading whitespaces do not match

97

97 - "git index-pack" used a wrong variable to name the keep-file in an

98 - error message when the file cannot be written or closed.

98 + An RFC. "--ignore-space-change" option of "git apply" ignored the

99 + spaces at the beginning of line too aggressively, which is

100 + inconsistent with the option of the same name "diff" and "git diff"

101 + have.

102

103 + Will hold.

104

101 -* rr/doc-merge-strategies (2014-03-17) 1 commit

102 - (merged to 'next' on 2014-03-20 at d31f415)

103 - + Documentation/merge-strategies: avoid hyphenated commands

105

105 - There were a few instances of 'git-foo' remaining in the

106 - documentation that should have been spelled 'git foo'.

106 +* jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits

107 + - parse-options: make sure argh string does not have SP or _

108 + - update-index: teach --cacheinfo a new syntax "mode,sha1,path"

109 + - parse-options: multi-word argh should use dash to separate words

110 + (this branch uses ib/rev-parse-parseopt-argh.)

111

112 + Make sure that the help text given to describe the "<param>" part

113 + of the "git cmd --option=<param>" does not contain SP or _,

114 + e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled

115 + as "--gpg-sign=<key id>".

116

109 -* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit

110 - (merged to 'next' on 2014-03-20 at 2b7b95d)

111 - + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

117 + Will merge to 'next'.

118

119

114 -* us/printf-not-echo (2014-03-18) 2 commits

115 - (merged to 'next' on 2014-03-20 at 41205c8)

116 - + test-lib.sh: do not "echo" caller-supplied strings

117 - + rebase -i: do not "echo" random user-supplied strings

120 +* jk/commit-dates-parsing-fix (2014-03-26) 1 commit

121 + - t4212: loosen far-in-future test for AIX

122

119 - "rebase -i" produced a broken insn sheet when the title of a commit

120 - happened to contain '\n' (or ended with '\c') due to a careless use

121 - of 'echo'.

123 + I think we agreed that a simpler test would be a better way

124 + forward.

125

123 ---------------------------------------------------

124 -[New Topics]

126

126 -* jk/tests-cleanup (2014-03-21) 12 commits

127 - - t0001: drop subshells just for "cd"

128 - - t0001: drop useless subshells

129 - - t0001: use test_must_fail

130 - - t0001: use test_config_global

131 - - t0001: use test_path_is_*

132 - - t0001: make symlink reinit test more careful

133 - - t: prefer "git config --file" to GIT_CONFIG

134 - - t: prefer "git config --file" to GIT_CONFIG with test_must_fail

135 - - t: stop using GIT_CONFIG to cross repo boundaries

136 - - t: drop useless sane_unset GIT_* calls

137 - - t/test-lib: drop redundant unset of GIT_CONFIG

138 - - t/Makefile: stop setting GIT_CONFIG

139 - (this branch uses dt/tests-with-env-not-subshell.)

127 +* mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit

128 + - MSVC: link in invalidcontinue.obj for better POSIX compatibility

129

130 Will merge to 'next'.

131

132 +

133 +* mr/msvc-link-with-lcurl (2014-03-27) 1 commit

134 + (merged to 'next' on 2014-03-28 at 3281dab)

135 + + MSVC: allow linking with the cURL library

136 +

137 + Will merge to 'master'.

138 +

139 +

140 +* wt/doc-submodule-name-path-confusion-1 (2014-03-27) 1 commit

141 + (merged to 'next' on 2014-03-28 at 225f241)

142 + + doc: submodule.* config are keyed by submodule names

143 +

144 + Will merge to 'master'.

145 +

146 +

147 +* wt/doc-submodule-name-path-confusion-2 (2014-03-27) 1 commit

148 + (merged to 'next' on 2014-03-28 at ec5bcf3)

149 + + doc: submodule.*.branch config is keyed by name

150 +

151 + Will merge to 'master'.

152 +

153 +

154 +* ep/shell-command-substitution (2014-03-25) 2 commits

155 + (merged to 'next' on 2014-03-28 at 99a512a)

156 + + git-am.sh: use the $(...) construct for command substitution

157 + + check-builtins.sh: use the $(...) construct for command substitution

158 +

159 + Will merge to 'master'.

160 +

161 --------------------------------------------------

162 [Stalled]

163

@@ -172,7 +190,8 @@ of the repositories listed at

190 * sz/mingw-index-pack-threaded (2014-03-19) 1 commit

191 - Enable index-pack threading in msysgit.

192

175 - Still under discussion among Windows folks

193 + Still under discussion among Windows folks. A failure report

194 + exists ($gmane/245170).

195

196

197 * bc/blame-crlf-test (2014-02-18) 1 commit

@@ -344,6 +363,25 @@ of the repositories listed at

363 --------------------------------------------------

364 [Cooking]

365

366 +* jk/tests-cleanup (2014-03-21) 12 commits

367 + (merged to 'next' on 2014-03-26 at 4a72b49)

368 + + t0001: drop subshells just for "cd"

369 + + t0001: drop useless subshells

370 + + t0001: use test_must_fail

371 + + t0001: use test_config_global

372 + + t0001: use test_path_is_*

373 + + t0001: make symlink reinit test more careful

374 + + t: prefer "git config --file" to GIT_CONFIG

375 + + t: prefer "git config --file" to GIT_CONFIG with test_must_fail

376 + + t: stop using GIT_CONFIG to cross repo boundaries

377 + + t: drop useless sane_unset GIT_* calls

378 + + t/test-lib: drop redundant unset of GIT_CONFIG

379 + + t/Makefile: stop setting GIT_CONFIG

380 + (this branch uses dt/tests-with-env-not-subshell.)

381 +

382 + Will merge to 'master'.

383 +

384 +

385 * ca/doc-config-third-party (2014-03-21) 1 commit

386 (merged to 'next' on 2014-03-25 at 731e011)

387 + config.txt: third-party tools may and do use their own variables

@@ -383,20 +421,18 @@ of the repositories listed at

421 Will merge to 'master'.

422

423

386 -* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits

387 - - parse-options: make sure argh string does not have SP or _

388 - - update-index: teach --cacheinfo a new syntax "mode,sha1,path"

389 - - parse-options: multi-word argh should use dash to separate words

424 +* ib/rev-parse-parseopt-argh (2014-03-23) 2 commits

425 (merged to 'next' on 2014-03-25 at d9083ed)

426 + t1502: protect runs of SPs used in the indentation

427 + rev-parse --parseopt: option argument name hints

428 + (this branch is used by jc/rev-parse-argh-dashed-multi-words.)

429

430 Teaches the "rev-parse --parseopt" mechanism used by scripted

431 Porcelains to parse command line options and give help text how to

432 supply argv-help (the placeholder string for an option parameter,

433 e.g. "key-id" in "--gpg-sign=<key-id>").

434

399 - Will merge the bottom part to 'master'.

435 + Will merge to 'master'.

436

437

438 * rs/pickaxe-i (2014-03-24) 10 commits

@@ -420,62 +456,23 @@ of the repositories listed at

456

457

458 * an/branch-config-message (2014-03-24) 1 commit

423 - - branch.c: install_branch_config: simplify if chain

424 -

425 - Will merge to 'next'.

426 -

427 -

428 -* ah/doc-gitk-config (2014-03-20) 1 commit

429 - (merged to 'next' on 2014-03-20 at d671b60)

430 - + Documentation/gitk: document the location of the configulation file

459 + (merged to 'next' on 2014-03-26 at 26f9741)

460 + + branch.c: install_branch_config: simplify if chain

461

462 Will merge to 'master'.

463

464

465 * as/grep-fullname-config (2014-03-20) 1 commit

436 - - grep: add grep.fullName config variable

437 -

438 - Will merge to 'next'.

439 -

440 -

441 -* fr/add-interactive-argv-array (2014-03-18) 1 commit

442 - (merged to 'next' on 2014-03-20 at 9d65f3d)

443 - + add: use struct argv_array in run_add_interactive()

444 -

445 - Will merge to 'master'.

446 -

447 -

448 -* jk/pack-bitmap (2014-03-17) 1 commit

449 - (merged to 'next' on 2014-03-20 at bba6246)

450 - + pack-objects: turn off bitmaps when skipping objects

451 -

452 - Instead of dying when asked to (re)pack with the reachability

453 - bitmap when a bitmap cannot be built, just (re)pack without

454 - producing a bitmap in such a case, with a warning.

455 -

456 - Will merge to 'master', and probably to 'maint' later.

457 -

466 + (merged to 'next' on 2014-03-28 at 810a076)

467 + + grep: add grep.fullName config variable

468

459 -* jk/pack-bitmap-progress (2014-03-17) 2 commits

460 - (merged to 'next' on 2014-03-20 at c7a83f9)

461 - + pack-objects: show reused packfile objects in "Counting objects"

462 - + pack-objects: show progress for reused packfiles

463 -

464 - The progress output while repacking and transferring objects showed

465 - an apparent large silence while writing the objects out of existing

466 - packfiles, when the reachability bitmap was in use.

467 -

468 - Will merge to 'master', and probably to 'maint' later.

469 -

470 -

471 -* jk/subtree-prefix (2014-03-17) 1 commit

472 - (merged to 'next' on 2014-03-20 at 81367fa)

473 - + subtree: initialize "prefix" variable

469 + Add a configuration variable to force --full-name to be default for

470 + "git grep".

471

475 - A stray environment variable $prefix could have leaked into and

476 - affected the behaviour of the "subtree" script.

472 + This may cause regressions on scripted users that do not expect

473 + this new behaviour.

474

478 - Will merge to 'master'.

475 + Will hold.

476

477

478 * nd/gc-aggressive (2014-03-17) 4 commits

@@ -485,13 +482,6 @@ of the repositories listed at

482 - environment.c: fix constness for odb_pack_keep()

483

484

488 -* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit

489 - (merged to 'next' on 2014-03-21 at 916b759)

490 - + rebase: allow "-" short-hand for the previous branch

491 -

492 - Will merge to 'master'.

493 -

494 -

485 * dt/tests-with-env-not-subshell (2014-03-19) 1 commit

486 (merged to 'next' on 2014-03-25 at 19fe25f)

487 + tests: use "env" to run commands with temporary env-var settings

@@ -507,11 +497,11 @@ of the repositories listed at

497 Will merge to 'master'.

498

499

510 -* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits

511 - - SQUASH??? fix decl-after-stmt and simplify

512 - - status: disable translation when --porcelain is used

500 +* mm/status-porcelain-format-i18n-fix (2014-03-26) 1 commit

501 + (merged to 'next' on 2014-03-26 at 41680fc)

502 + + status: disable translation when --porcelain is used

503

514 - Will merge to 'next' after squashing in the fixup.

504 + Will merge to 'master'.

505

506

507 * ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit

@@ -521,45 +511,19 @@ of the repositories listed at

511 Will merge to 'master'.

512

513

524 -* ys/fsck-commit-parsing (2014-03-19) 2 commits

525 - (merged to 'next' on 2014-03-21 at 2728983)

526 - + fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant

527 - + fsck.c:fsck_ident(): ident points at a const string

528 -

529 - Will merge to 'master'.

530 -

531 -

532 -* bp/commit-p-editor (2014-03-18) 7 commits

533 - (merged to 'next' on 2014-03-21 at 23b6b06)

534 - + run-command: mark run_hook_with_custom_index as deprecated

535 - + merge hook tests: fix and update tests

536 - + merge: fix GIT_EDITOR override for commit hook

537 - + commit: fix patch hunk editing with "commit -p -m"

538 - + test patch hunk editing with "commit -p -m"

539 - + merge hook tests: use 'test_must_fail' instead of '!'

540 - + merge hook tests: fix missing '&&' in test

541 -

542 - When it is not necessary to edit a commit log message (e.g. "git

543 - commit -m" is given a message without specifying "-e"), we used to

544 - disable the spawning of the editor by overriding GIT_EDITOR, but

545 - this means all the uses of the editor, other than to edit the

546 - commit log message, are also affected.

547 -

548 - Will merge to 'master'.

549 -

550 -

551 -* cn/fetch-prune-overlapping-destination (2014-03-24) 3 commits

552 - - SQUASH??? style and leak fix

553 - - fetch: handle overlaping refspecs on --prune

554 - - fetch: add a failing test for prunning with overlapping refspecs

514 +* cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits

515 + (merged to 'next' on 2014-03-28 at 954513a)

516 + + fetch: handle overlaping refspecs on --prune

517 + + fetch: add a failing test for prunning with overlapping refspecs

518

519 Protect refs in a hierarchy that can come from more than one remote

520 hierarcies from incorrect removal by "git fetch --prune".

521

522 Since I didn't get any responses to my earlier "Comments?", I ended

560 - up reading it myself again and found a small leak.

523 + up reading it myself again and found a small leak, whose fix has

524 + been squashed in to the tip commit.

525

562 - Hoping to be able to merge a fix for this issue soonish.

526 + Will merge to 'master'.

527

528

529 * nd/multiple-work-trees (2014-03-25) 28 commits

@@ -597,7 +561,7 @@ of the repositories listed at

561 by making the borrowee and borrowers aware of each other.

562

563

600 -* ks/tree-diff-nway (2014-03-20) 19 commits

564 +* ks/tree-diff-nway (2014-03-27) 19 commits

565 - combine-diff: speed it up, by using multiparent diff tree-walker directly

566 - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

567 - Portable alloca for Git

@@ -628,19 +592,19 @@ of the repositories listed at

592 2-way diff-tree, which is very nice.

593

594

631 -* nd/log-show-linear-break (2014-03-20) 2 commits

632 - - log: add --show-linear-break to help see non-linear history

633 - - object.h: centralize object flag allocation

595 +* nd/log-show-linear-break (2014-03-25) 2 commits

596 + (merged to 'next' on 2014-03-28 at ea4a8db)

597 + + log: add --show-linear-break to help see non-linear history

598 + + object.h: centralize object flag allocation

599

600 Attempts to show where a single-strand-of-pearls break in "git log"

601 output.

602

638 - The implementation seems to have got worse compared to the previous

639 - round. Will hold.

603 + Will merge to 'master'.

604

605

642 -* cc/interpret-trailers (2014-03-07) 11 commits

643 - - Documentation: add documentation for 'git interpret-trailers'

606 +* cc/interpret-trailers (2014-03-26) 12 commits

607 + - trailers: add documentation for 'git interpret-trailers'

608 - trailer: add tests for commands in config file

609 - trailer: execute command from 'trailer.<name>.command'

610 - trailer: add tests for "git interpret-trailers"

@@ -649,28 +613,9 @@ of the repositories listed at

613 - trailer: parse trailers from stdin

614 - trailer: process command line trailer arguments

615 - trailer: read and process config information

616 + - Move lower case functions into wrapper.c

617 - trailer: process trailers from stdin and arguments

618 - trailers: add data structures and basic functions

619

620 A new filter to programatically edit the tail end of the commit log

621 messages.

657 -

658 - Will merge to 'next'.

659 -

660 ---------------------------------------------------

661 -[Discarded]

662 -

663 -* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit

664 - . diff: simplify cpp funcname regex

665 -

666 - Superceded.

667 -

668 -

669 -* pw/branch-config-message (2014-03-13) 1 commit

670 - . install_branch_config(): simplify verbose messages logic

671 -

672 - Among the many attempts to microproject #8, this seemed to be the

673 - most "done" among the table based ones; I however tend to think

674 - that the original with minimum refactoring would be easier to read.

675 -

676 - an/branch-config-message supersedes this topic.

What's cooking (2014/03 #07)