1f2cb46379 · matheusbsbs/matheus-bagliano

@@ -1,20 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2015, #01; Wed, 2)

4 -X-master-at: 16ffa6443e279a9b3b63d7a2bebeb07833506010

5 -X-next-at: f624c3dbe0116484e9e326add66d7bb19da420e0

3 +Subject: What's cooking in git.git (Sep 2015, #02; Wed, 9)

4 +X-master-at: 7a2c4af7a82eebf2ed0e60a2b36c31e70c619264

5 +X-next-at: 8a6dc4c4eedd63a3d9286c8083e0c7f522faa35b

6

7 -What's cooking in git.git (Sep 2015, #01; Wed, 2)

7 +What's cooking in git.git (Sep 2015, #02; Wed, 9)

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 -An early preview 2.6-rc0 has been tagged. There are a few fixes

15 -that should be merged down to 'master' that are still cooking in

16 -'next', but other than that this should give a fairly good taste

17 -for the upcoming release.

14 +The first release candidate 2.6-rc1 has been tagged. Let's make

15 +sure we catch any possible regressions from now on, without getting

16 +distracted by yet more shiny new features. On the 'maint' front,

17 +we'll have 2.5.2 tomorrow.

18

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

20 of the repositories listed at

@@ -24,146 +24,137 @@ of the repositories listed at

24 --------------------------------------------------

25 [Graduated to "master"]

26

27 -* ah/pack-objects-usage-strings (2015-08-28) 1 commit

28 - (merged to 'next' on 2015-08-31 at 78c8240)

29 - + pack-objects: place angle brackets around placeholders in usage strings

27 +* jc/builtin-am-signoff-regression-fix (2015-09-06) 1 commit

28 + (merged to 'next' on 2015-09-06 at 7e84b6f)

29 + + am: match --signoff to the original scripted version

30

31 - Usage string fix.

31 + Recent "git am" had regression when adding a Signed-off-by line

32 + with its "-s" option by an unintended tightening of how an existing

33 + trailer block is detected.

34

35

34 -* ah/read-tree-usage-string (2015-08-28) 1 commit

35 - (merged to 'next' on 2015-08-31 at fbaa7bd)

36 - + read-tree: replace bracket set with parentheses to clarify usage

37 -

38 - Usage string fix.

39 -

40 -

41 -* ah/reflog-typofix-in-error (2015-08-28) 1 commit

42 - (merged to 'next' on 2015-08-31 at 1b37218)

43 - + reflog: add missing single quote to error message

44 -

45 - Error string fix.

46 -

47 -

48 -* ah/submodule-typofix-in-error (2015-08-28) 1 commit

49 - (merged to 'next' on 2015-08-31 at 5a20628)

50 - + git-submodule: remove extraneous space from error message

51 -

52 - Error string fix.

53 -

54 -

55 -* br/svn-doc-include-paths-config (2015-08-26) 1 commit

56 - (merged to 'next' on 2015-08-31 at 27a305f)

57 - + git-svn doc: mention "svn-remote.<name>.include-paths"

36 +* jk/am-rerere-lock-fix (2015-09-01) 1 commit

37 + (merged to 'next' on 2015-09-02 at 686c5c0)

38 + + rerere: release lockfile in non-writing functions

39

40 + Recent "git am" introduced a double-locking failure when used with

41 + the "--3way" option that invokes rerere machinery.

42

60 -* cc/trailers-corner-case-fix (2015-08-31) 1 commit

61 - (merged to 'next' on 2015-09-01 at 4786608)

62 - + trailer: support multiline title

43 +--------------------------------------------------

44 +[New Topics]

45

64 - The "interpret-trailers" helper mistook a multi-paragraph title of

65 - a commit log message with a colon in it as the end of the trailer

66 - block.

46 +* jk/connect-clear-env (2015-09-08) 2 commits

47 + (merged to 'next' on 2015-09-08 at 86b64f7)

48 + + git_connect: clarify conn->use_shell flag

49 + (merged to 'next' on 2015-09-06 at 9ddbed8)

50 + + git_connect: clear GIT_* environment for ssh

51

52 + The ssh transport, just like any other transport over the network,

53 + did not clear GIT_* environment variables, but it is possible to

54 + use SendEnv and AcceptEnv to leak them to the remote invocation of

55 + Git, which is not a good idea at all. Explicitly clear them just

56 + like we do for the local transport.

57

69 -* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update (2015-08-31) 1 commit

70 - (merged to 'next' on 2015-08-31 at c4133fb)

71 - + commit: don't rewrite shared index unnecessarily

58 + Will merge to 'master'.

59

73 - When re-priming the cache-tree opportunistically while committing

74 - the in-core index as-is, we mistakenly invalidated the in-core

75 - index too aggressively, causing the experimental split-index code

76 - to unnecessarily rewrite the on-disk index file(s).

60

61 +* jk/pack-protocol-doc (2015-09-03) 1 commit

62 + (merged to 'next' on 2015-09-08 at 98d861d)

63 + + pack-protocol: clarify LF-handling in PKT-LINE()

64

79 -* ee/clean-test-fixes (2015-08-31) 1 commit

80 - (merged to 'next' on 2015-09-01 at 0032b34)

81 - + t7300: fix broken && chains

65 + Streamline documentation of the pkt-line protocol.

66

67 + Will merge to 'master'.

68

84 -* jk/log-missing-default-HEAD (2015-08-31) 1 commit

85 - (merged to 'next' on 2015-09-01 at 3f4582b)

86 - + log: diagnose empty HEAD more clearly

69

88 - "git init empty && git -C empty log" said "bad default revision 'HEAD'",

89 - which was found to be a bit confusing to new users.

70 +* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit

71 + (merged to 'next' on 2015-09-08 at c8047ba)

72 + + pager: don't use unsafe functions in signal handlers

73

74 + Allocation related functions and stdio are unsafe things to call

75 + inside a signal handler, and indeed killing the pager can cause

76 + glibc to deadlock waiting on allocation mutex as our signal handler

77 + tries to free() some data structures in wait_for_pager(). Reduce

78 + these unsafe calls.

79

92 -* ls/p4-fold-case-client-specs (2015-08-28) 1 commit

93 - (merged to 'next' on 2015-08-31 at f25a3bd)

94 - + git-p4: honor core.ignorecase when using P4 client specs

80 + I seem to recall Peff had other ideas? Let's revisit this in the

81 + next cycle.

82

96 - On case insensitive systems, "git p4" did not work well with client

97 - specs.

83

84 +* as/subtree-with-spaces (2015-09-08) 2 commits

85 + (merged to 'next' on 2015-09-09 at f3d763d)

86 + + contrib/subtree: respect spaces in a repository path

87 + + t7900-subtree: test the "space in a subdirectory name" case

88

100 -* nd/fixup-linked-gitdir (2015-08-25) 1 commit

101 - (merged to 'next' on 2015-08-26 at 7b8a1aa)

102 - + setup: update the right file in multiple checkouts

89 + Update "git subtree" (in contrib/) so that it can take whitespaces

90 + in the pathnames, not only in the in-tree pathname but the name of

91 + the directory that the repository is in.

92

104 - The code in "multiple-worktree" support that attempted to recover

105 - from an inconsistent state updated an incorrect file.

93 + Will merge to 'master'.

94

95

108 -* rs/archive-zip-many (2015-08-28) 3 commits

109 - (merged to 'next' on 2015-08-31 at b799358)

110 - + archive-zip: support more than 65535 entries

111 - + archive-zip: use a local variable to store the creator version

112 - + t5004: test ZIP archives with many entries

96 +* gb/apply-comment-typofix (2015-09-09) 1 commit

97 + (merged to 'next' on 2015-09-09 at 29fb0ff)

98 + + apply: comment grammar fix

99

114 - "git archive" did not use zip64 extension when creating an archive

115 - with more than 64k entries, which nobody should need, right ;-)?

100 + Will merge to 'master'.

101

102

118 -* rt/remove-hold-lockfile-for-append (2015-08-28) 1 commit

119 - (merged to 'next' on 2015-08-31 at caabe4b)

120 - + lockfile: remove function "hold_lock_file_for_append"

103 +* gb/filter-branch-progress (2015-09-08) 1 commit

104 + - filter-branch: add passed/remaining seconds on progress

105

106 + Give progress meter to "git filter-branch".

107

123 -* sb/read-cache-one-indent-style-fix (2015-08-31) 1 commit

124 - (merged to 'next' on 2015-09-01 at adf8298)

125 - + read-cache: fix indentation in read_index_from

108 + Is a reroll coming?

109

127 ---------------------------------------------------

128 -[New Topics]

110

130 -* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit

131 - (merged to 'next' on 2015-09-02 at 1129ca4)

132 - + git-quiltimport: add commandline option --series <file>

111 +* jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit

112 + (merged to 'next' on 2015-09-09 at a75fce3)

113 + + interpret-trailers: allow running outside a repository

114

134 - "quiltimport" allows to specify the series file by honoring the

135 - $QUILT_SERIES environment and also --series command line option.

115 + Allow "git interpret-trailers" to run outside of a Git repository.

116

117 Will merge to 'master'.

118

119

140 -* jk/am-rerere-lock-fix (2015-09-01) 1 commit

141 - (merged to 'next' on 2015-09-02 at 686c5c0)

142 - + rerere: release lockfile in non-writing functions

120 +* jk/test-lint-forbid-when-finished-in-subshell (2015-09-08) 5 commits

121 + (merged to 'next' on 2015-09-09 at 74ede61)

122 + + test-lib-functions: detect test_when_finished in subshell

123 + + t7800: don't use test_config in a subshell

124 + + test-lib-functions: support "test_config -C <dir> ..."

125 + + t5801: don't use test_when_finished in a subshell

126 + + t7610: don't use test_config in a subshell

127

144 - Recent "git am" introduced a double-locking failure when used with

145 - the "--3way" option that invokes rerere machinery.

146 -

147 - Will merge to 'master' before 2.6-rc1.

128 + Because "test_when_finished" in our test framework queues the

129 + clean-up tasks to be done in a shell variable, it should not be

130 + used inside a subshell. Add a mechanism to allow 'bash' to catch

131 + such uses, and fix the ones that were found.

132

133 + Will merge to 'master'.

134

150 -* jk/async-pkt-line (2015-09-01) 2 commits

151 - (merged to 'next' on 2015-09-02 at e185717)

152 - + pkt-line: show packets in async processes as "sideband"

153 - + run-command: provide in_async query function

135

155 - The debugging infrastructure for pkt-line based communication has

156 - been improved to mark the side-band communicatio specifically.

136 +* ls/p4-lfs (2015-09-09) 5 commits

137 + - git-p4: add Git LFS backend for large file system

138 + - git-p4: add support for large file systems

139 + - git-p4: return an empty list if a list config has no values

140 + - git-p4: add gitConfigInt reader

141 + - git-p4: add optional type specifier to gitConfig reader

142

158 - Will merge to 'master'.

143 + Teach "git p4" to send large blobs outside the repository by

144 + talking to Git LFS.

145

146

161 -* mp/t7060-diff-index-test (2015-09-02) 1 commit

162 - - t7060: actually test "git diff-index --cached -M"

147 +* nd/clone-linked-checkout (2015-09-07) 5 commits

148 + - clone: better error when --reference is a linked checkout

149 + - clone: allow --local from a linked checkout

150 + - enter_repo: allow .git files in strict mode

151 + - enter_repo: avoid duplicating logic, use is_git_directory() instead

152 + - path.c: delete an extra space

153

164 - Fix an old test that was doing the same thing as another one.

154 + It was not possible to use a repository-lookalike created by "git

155 + worktree add" as a local source of "git clone".

156

166 - Will merge to 'next'.

157 + Is a reroll coming?

158

159 --------------------------------------------------

160 [Stalled]

@@ -402,8 +393,39 @@ of the repositories listed at

393 --------------------------------------------------

394 [Cooking]

395

396 +* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit

397 + (merged to 'next' on 2015-09-02 at 1129ca4)

398 + + git-quiltimport: add commandline option --series <file>

399 +

400 + "quiltimport" allows to specify the series file by honoring the

401 + $QUILT_SERIES environment and also --series command line option.

402 +

403 + Will merge to 'master'.

404 +

405 +

406 +* jk/async-pkt-line (2015-09-01) 2 commits

407 + (merged to 'next' on 2015-09-02 at e185717)

408 + + pkt-line: show packets in async processes as "sideband"

409 + + run-command: provide in_async query function

410 +

411 + The debugging infrastructure for pkt-line based communication has

412 + been improved to mark the side-band communicatio specifically.

413 +

414 + Will merge to 'master'.

415 +

416 +

417 +* mp/t7060-diff-index-test (2015-09-02) 1 commit

418 + (merged to 'next' on 2015-09-08 at 80ff284)

419 + + t7060: actually test "git diff-index --cached -M"

420 +

421 + Fix an old test that was doing the same thing as another one.

422 +

423 + Will merge to 'master'.

424 +

425 +

426 * ah/show-ref-usage-string (2015-08-31) 1 commit

406 - - show-ref: place angle brackets around variables in usage string

427 + (merged to 'next' on 2015-09-08 at dc512c8)

428 + + show-ref: place angle brackets around variables in usage string

429

430 Both "git show-ref -h" and "git show-ref --help" illustrated that the

431 "--exclude-existing" option makes the command read list of refs

@@ -411,36 +433,52 @@ of the repositories listed at

433 have a pair of "<>" around the placeholder that designate an input

434 file, i.e. "git show-ref --exclude-existing < <ref-list>".

435

436 + Will merge to 'master'.

437

415 -* jk/date-local (2015-09-01) 6 commits

416 - - t6300: add tests for "-local" date formats

417 - - t6300: add test for "raw" date format

418 - - t6300: make UTC and local dates different

419 - - t6300: introduce test_date() helper

420 - - date: make "local" orthogonal to date format

421 - - fast-import: switch crash-report date to iso8601

438 +

439 +* jk/date-local (2015-09-03) 11 commits

440 + (merged to 'next' on 2015-09-08 at 66781d9)

441 + + t6300: add tests for "-local" date formats

442 + + t6300: make UTC and local dates different

443 + + date: make "local" orthogonal to date format

444 + + date: check for "local" before anything else

445 + + t6300: add test for "raw" date format

446 + + t6300: introduce test_date() helper

447 + + fast-import: switch crash-report date to iso8601

448 + + Documentation/rev-list: don't list date formats

449 + + Documentation/git-for-each-ref: don't list date formats

450 + + Documentation/config: don't list date formats

451 + + Documentation/blame-options: don't list date formats

452

453 "git log --date=local" used to only allow to show the normal

454 (default) format in the local timezone. The command learned to take

455 'local' as an instruction to use the local timezone with other

456 formats, e.g. "git show --date=rfc-local".

457

458 + Will merge to 'master'.

459 +

460

461 * nk/stash-show-config (2015-08-31) 1 commit

430 - - stash: allow "stash show" diff output configurable

462 + (merged to 'next' on 2015-09-08 at 90dd06f)

463 + + stash: allow "stash show" diff output configurable

464

465 Users who are too busy to type three extra keystrokes to ask for

466 "git stash show -p" can now set stash.showPatch configuration

467 varible to true to always see the actual patch, not just the list

468 of paths affected with feel for the extent of damage via diffstat.

469

470 + Will merge to 'master'.

471 +

472

438 -* ls/p4-path-encoding (2015-08-31) 1 commit

439 - . git-p4: add "--path-encoding" option

473 +* ls/p4-path-encoding (2015-09-03) 1 commit

474 + (merged to 'next' on 2015-09-08 at 56514f9)

475 + + git-p4: add config git-p4.pathEncoding

476

477 "git p4" learned to reencode the pathname it uses to communicate

478 with the p4 depot with a new option.

479

480 + Will merge to 'master'.

481 +

482

483 * ad/bisect-terms (2015-08-03) 4 commits

484 (merged to 'next' on 2015-09-01 at ede6e64)

@@ -463,16 +501,16 @@ of the repositories listed at

501

502

503 * dt/refs-bisection (2015-09-01) 3 commits

466 - - refs: make refs/bisect/* per-worktree

467 - - path: optimize common dir checking

468 - - refs: clean up common_list

504 + (merged to 'next' on 2015-09-08 at 2b66bad)

505 + + refs: make refs/bisect/* per-worktree

506 + + path: optimize common dir checking

507 + + refs: clean up common_list

508

509 Move the refs used during a "git bisect" session to per-worktree

510 hierarchy refs/worktree/* so that independent bisect sessions can

511 be done in different worktrees.

512

474 - $gmane/276765. We do not need to move (which can break third-party

475 - tools) in order to make the hierarchy per-worktree.

513 + Will merge to 'master'.

514

515

516 * ld/p4-import-labels (2015-08-28) 3 commits

@@ -506,16 +544,15 @@ of the repositories listed at

544 does and then "tag -l" is reimplemented in terms of "ref-filter".

545

546 Almost there...

509 - Waiting for a reroll.

510 - ($gmane/276615, $gmane/276529, $gmane/276607, $gmane/276606, etc.)

547 + A reroll exists at v16, but it seems there will be another one.

548

549

513 -* nd/ita-cleanup (2015-08-25) 6 commits

550 +* nd/ita-cleanup (2015-09-06) 6 commits

551 - grep: make it clear i-t-a entries are ignored

552 - checkout(-index): do not checkout i-t-a entries

553 - apply: make sure check_preimage() does not leave empty file on error

554 - apply: fix adding new files on i-t-a entries

518 - - Add and use convenient macro ce_intent_to_add()

555 + - add and use a convenience macro ce_intent_to_add()

556 - blame: remove obsolete comment

557

558 Paths that have been told the index about with "add -N" are not yet

@@ -537,7 +574,7 @@ of the repositories listed at

574 Waiting for a reroll.

575

576

540 -* bb/remote-get-url (2015-08-05) 1 commit

577 +* bb/remote-get-url (2015-09-04) 1 commit

578 - remote: add get-url subcommand

579

580 "git remote" learned "get-url" subcommand to show the URL for a

@@ -547,18 +584,19 @@ of the repositories listed at

584 ($gmane/275401)

585

586

550 -* sb/submodule-helper (2015-08-31) 5 commits

551 - . submodule: implement `module_clone` as a builtin helper

552 - . submodule: implement `module_name` as a builtin helper

553 - . SQUASH???

554 - . submodule: implement `module_list` as a builtin helper

555 - . Merge 'hv/submodule-config' to 'sb/submodule-helper'

587 +* sb/submodule-helper (2015-09-08) 4 commits

588 + - submodule: rewrite `module_clone` shell function in C

589 + - submodule: rewrite `module_name` shell function in C

590 + - submodule: rewrite `module_list` shell function in C

591 + - Merge 'hv/submodule-config' to 'sb/submodule-helper'

592

593 The infrastructure to rewrite "git submodule" in C is being built

594 incrementally. Let's polish these early parts well enough and make

595 them graduate to 'next' and 'master', so that the more involved

596 follow-up can start cooking on a solid ground.

597

598 + Looked ready for 'next'. Comments from others?

599 +

600

601 * ad/cygwin-wants-rename (2015-08-07) 1 commit

602 - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES

@@ -589,6 +627,8 @@ of the repositories listed at

627 implementation can be shared across all three, in a follow-up

628 series or two.

629

630 + Will merge to 'master'.

631 +

632

633 * jc/rerere (2015-07-24) 21 commits

634 (merged to 'next' on 2015-08-26 at 8ae15ef)

What's cooking (2015/09 #02)