0f14cc0e92 · 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 (Aug 2016, #08; Wed, 24)

4 -X-master-at: 2632c897f74b1cc9b5533f467da459b9ec725538

5 -X-next-at: 3a084aaf40d3898679a48d19dac63e45ecde4cc7

3 +Subject: What's cooking in git.git (Aug 2016, #09; Wed, 31)

4 +X-master-at: 5b18e70009487bb156cac18546d6f91105338f4c

5 +X-next-at: 775ea9aab9ac658f12f52eef7b42ae8064dd56dd

6

7 -What's cooking in git.git (Aug 2016, #08; Wed, 24)

7 +What's cooking in git.git (Aug 2016, #09; Wed, 31)

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

9

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

@@ -12,131 +12,92 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -v2.10.0-rc1 was tagged last week, then I got sick and lost an entire

16 -day. I've merged a handful more topics to 'next' and marked 5 among

17 -them to be merged to 'master' by -rc2. A notable is the ja/i18n

18 -topic, which hopefully will reduce the translator's load somewhat.

19 -Also the change to arrange the file-descriptors to the tempfile be

20 -closed for subprocesses to avoid deadlocks on Windows is also in;

21 -even though it is not a new problem, the fix looked safe enough.

22 -Linus's "32-bit GPG key-ids are so last century" change is already

23 -in, as reported in the 2.10.0-rc1 announcement.

24 -

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

16 of the repositories listed at

17

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

19

20 --------------------------------------------------

31 -[Graduated to "master"]

32 -

33 -* ab/hooks (2016-08-16) 1 commit

34 - (merged to 'next' on 2016-08-17 at b56e55d)

35 - + rev-parse: respect core.hooksPath in --git-path

36 -

37 - "git rev-parse --git-path hooks/<hook>" learned to take

38 - core.hooksPath configuration variable (introduced during 2.9 cycle)

39 - into account.

40 -

41 -

42 -* jk/difftool-command-not-found (2016-08-15) 1 commit

43 - (merged to 'next' on 2016-08-17 at 32baf03)

44 - + difftool: always honor fatal error exit codes

45 -

46 - "git difftool" by default ignores the error exit from the backend

47 - commands it spawns, because often they signal that they found

48 - differences by exiting with a non-zero status code just like "diff"

49 - does; the exit status codes 126 and above however are special in

50 - that they are used to signal that the command is not executable,

51 - does not exist, or killed by a signal. "git difftool" has been

52 - taught to notice these exit status codes.

21 +[New Topics]

22

23 +* bh/diff-highlight-graph (2016-08-31) 6 commits

24 + (merged to 'next' on 2016-08-31 at 523a15f)

25 + + diff-highlight: avoid highlighting combined diffs

26 + + diff-highlight: add multi-byte tests

27 + + diff-highlight: ignore test cruft

28 + + diff-highlight: add support for --graph output

29 + + diff-highlight: add failing test for handling --graph output

30 + + diff-highlight: add some tests

31

55 -* lt/gpg-show-long-key-in-signature-verification (2016-08-16) 1 commit

56 - (merged to 'next' on 2016-08-17 at 1ee8a00)

57 - + Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification

58 - (this branch uses lt/gpg-show-long-key-in-signature-verification-maint.)

32 + "diff-highlight" script (in contrib/) learned to work better with

33 + "git log -p --graph" output.

34

60 - "git log --show-signature" and other commands that display the

61 - verification status of PGP signature now shows the longer key-id,

62 - as 32-bit key-id is so last century.

35 + Will keep in 'next' during the rest of the cycle.

36

64 - A last-minute merge of this topic was a bit scary but I made sure

65 - push-certificate codepath would not be negatively affected.

37

38 +* jc/am-read-author-file (2016-08-30) 1 commit

39 + - am: refactor read_author_script()

40

68 -* lt/gpg-show-long-key-in-signature-verification-maint (2016-08-16) 1 commit

69 - + gpg-interface: prefer "long" key format output when verifying pgp signatures

70 - (this branch is used by lt/gpg-show-long-key-in-signature-verification.)

41 + Extract a small helper out of the function that reads the authors

42 + script file "git am" internally uses.

43

72 - "git log --show-signature" and other commands that display the

73 - verification status of PGP signature now shows the longer key-id,

74 - as 32-bit key-id is so last century. This is based on older

75 - codebase, just in case somebody wants to have it.

44

45 +* jk/test-lib-drop-pid-from-results (2016-08-30) 1 commit

46 + - test-lib: drop PID from test-results/*.count

47

78 -* rs/pull-signed-tag (2016-08-13) 4 commits

79 - (merged to 'next' on 2016-08-17 at cecca71)

80 - + commit: use FLEX_ARRAY in struct merge_remote_desc

81 - + merge-recursive: fix verbose output for multiple base trees

82 - + commit: factor out set_merge_remote_desc()

83 - + commit: use xstrdup() in get_merge_parent()

48 + The test framework left the number of tests and success/failure

49 + count in the t/test-results directory, keyed by the name of the

50 + test script plus the process ID. The latter however turned out not

51 + to serve any useful purpose. The process ID part of the filename

52 + has been removed.

53

85 - When "git merge-recursive" works on history with many criss-cross

86 - merges in "verbose" mode, the names the command assigns to the

87 - virtual merge bases could have overwritten each other by unintended

88 - reuse of the same piece of memory.

54 + Will hold for a bit more and then merge to 'next'.

55

56

91 -* sb/checkout-explit-detach-no-advice (2016-08-15) 1 commit

92 - (merged to 'next' on 2016-08-17 at fb64716)

93 - + checkout: do not mention detach advice for explicit --detach option

57 +* js/sequencer-wo-die (2016-08-29) 14 commits

58 + - sequencer: lib'ify save_opts()

59 + - sequencer: lib'ify save_todo()

60 + - sequencer: lib'ify save_head()

61 + - sequencer: lib'ify create_seq_dir()

62 + - sequencer: lib'ify read_populate_opts()

63 + - sequencer: lib'ify read_populate_todo()

64 + - sequencer: lib'ify read_and_refresh_cache()

65 + - sequencer: lib'ify prepare_revs()

66 + - sequencer: lib'ify walk_revs_populate_todo()

67 + - sequencer: lib'ify do_pick_commit()

68 + - sequencer: lib'ify do_recursive_merge()

69 + - sequencer: lib'ify write_message()

70 + - sequencer: do not die() in do_pick_commit()

71 + - sequencer: lib'ify sequencer_pick_revisions()

72

95 - "git checkout --detach <branch>" used to give the same advice

96 - message as that is issued when "git checkout <tag>" (or anything

97 - that is not a branch name) is given, but asking with "--detach" is

98 - an explicit enough sign that the user knows what is going on. The

99 - advice message has been squelched in this case.

73 + Lifts calls to exit(2) and die() higher in the callchain in

74 + sequencer.c files so that more helper functions in it can be used

75 + by callers that want to handle error conditions themselves.

76

77 + Waiting for the review discussion to settle.

78

102 -* tb/t0027-raciness-fix (2016-08-14) 1 commit

103 - (merged to 'next' on 2016-08-17 at 39a6635)

104 - + convert: Correct NNO tests and missing `LF will be replaced by CRLF`

79

106 - The t0027 test for CRLF conversion was timing dependent and flaky.

80 +* jk/squelch-false-warning-from-gcc-o3 (2016-08-31) 2 commits

81 + - color_parse_mem: initialize "struct color" temporary

82 + - error_errno: use constant return similar to error()

83

84 --------------------------------------------------

109 -[New Topics]

110 -

111 -* cc/receive-pack-limit (2016-08-24) 3 commits

112 - - receive-pack: allow a maximum input size to be specified

113 - - unpack-objects: add --max-input-size=<size> option

114 - - index-pack: add --max-input-size=<size> option

115 -

116 - An incoming "git push" that attempts to push too many bytes can now

117 - be rejected by setting a new configuration variable at the receiving

118 - end.

119 -

120 - Will merge to 'next'.

121 -

122 -

123 -* hv/doc-commit-reference-style (2016-08-17) 1 commit

124 - (merged to 'next' on 2016-08-24 at b187d45)

125 - + SubmittingPatches: document how to reference previous commits

126 -

127 - A small doc update.

128 -

129 - Will merge to 'master'.

130 -

131 -

132 -* js/no-html-bypass-on-windows (2016-08-19) 1 commit

133 - (merged to 'next' on 2016-08-24 at 05728f8)

134 - + Revert "display HTML in default browser using Windows' shell API"

85 +[Graduated to "master"]

86

136 - On Windows, help.browser configuration variable used to be ignored,

137 - which has been corrected.

87 +* bw/mingw-avoid-inheriting-fd-to-lockfile (2016-08-23) 2 commits

88 + (merged to 'next' on 2016-08-24 at 8389b0e)

89 + + mingw: ensure temporary file handles are not inherited by child processes

90 + + t6026-merge-attr: child processes must not inherit index.lock handles

91

139 - Will merge to 'master'.

92 + The tempfile (hence its user lockfile) API lets the caller to open

93 + a file descriptor to a temporary file, write into it and then

94 + finalize it by first closing the filehandle and then either

95 + removing or renaming the temporary file. When the process spawns a

96 + subprocess after obtaining the file descriptor, and if the

97 + subprocess has not exited when the attempt to remove or rename is

98 + made, the last step fails on Windows, because the subprocess has

99 + the file descriptor still open. Open tempfile with O_CLOEXEC flag

100 + to avoid this (on Windows, this is mapped to O_NOINHERIT).

101

102

103 * dg/document-git-c-in-git-config-doc (2016-08-23) 1 commit

@@ -149,28 +110,6 @@ of the repositories listed at

110 place for people to look for when they ask "can I make a one-shot

111 override, and if so how?"

112

152 - Will merge to 'master'.

153 -

154 -

155 -* jk/format-patch-number-singleton-patch-with-cover (2016-08-23) 1 commit

156 - - format-patch: show 0/1 and 1/1 for singleton patch with cover letter

157 -

158 - "git format-patch --cover-letter HEAD^" to format a single patch

159 - with a separate cover letter now numbers the output as [PATCH 0/1]

160 - and [PATCH 1/1] by default.

161 -

162 - Will merge to 'next'.

163 -

164 -

165 -* cp/completion-negative-refs (2016-08-24) 1 commit

166 - - completion: support excluding refs

167 -

168 - The command-line completion script (in contrib/) learned to

169 - complete "git cmd ^mas<HT>" to complete the negative end of

170 - reference to "git cmd ^master".

171 -

172 - Waiting for a review.

173 -

113

114 * ja/i18n (2016-08-24) 3 commits

115 (merged to 'next' on 2016-08-24 at 3a084aa)

@@ -182,50 +121,34 @@ of the repositories listed at

121 refactoring of the messages to avoid word-legos; the repetition has

122 been reduced to help translators.

123

185 - Will merge to 'master'.

124

125 +* js/no-html-bypass-on-windows (2016-08-19) 1 commit

126 + (merged to 'next' on 2016-08-24 at 05728f8)

127 + + Revert "display HTML in default browser using Windows' shell API"

128

188 -* jk/delta-base-cache (2016-08-23) 7 commits

189 - - t/perf: add basic perf tests for delta base cache

190 - - delta_base_cache: use hashmap.h

191 - - delta_base_cache: drop special treatment of blobs

192 - - delta_base_cache: use list.h for LRU

193 - - release_delta_base_cache: reuse existing detach function

194 - - clear_delta_base_cache_entry: use a more descriptive name

195 - - cache_or_unpack_entry: drop keep_cache parameter

129 + On Windows, help.browser configuration variable used to be ignored,

130 + which has been corrected.

131

197 - The delta-base-cache mechanism has been a key to the performance in

198 - a repository with a tightly packed packfile, but it did not scale

199 - well even with a larger value of core.deltaBaseCacheLimit.

132

201 - Will merge to 'next'.

133 +* kw/patch-ids-optim (2016-08-29) 1 commit

134 + (merged to 'next' on 2016-08-30 at 9590e42)

135 + + p3400: make test script executable

136

137 + Micro hot-fix for a topic that is already in.

138

204 -* js/cat-file-filters (2016-08-24) 4 commits

205 - - cat-file: support --textconv/--filters in batch mode

206 - - cat-file --textconv/--filters: allow specifying the path separately

207 - - cat-file: introduce the --filters option

208 - - cat-file: fix a grammo in the man page

139

210 - Even though "git hash-objects", which is a tool to take an

211 - on-filesystem data stream and put it into the Git object store,

212 - allowed to perform the "outside-world-to-Git" conversions (e.g.

213 - end-of-line conversions and application of the clean-filter), and

214 - it had the feature on by default from very early days, its reverse

215 - operation "git cat-file", which takes an object from the Git object

216 - store and externalize for the consumption by the outside world,

217 - lacked an equivalent mechanism to run the "Git-to-outside-world"

218 - conversion. The command learned the "--filters" option to do so.

140 +* ls/packet-line-protocol-doc-fix (2016-08-30) 1 commit

141 + - pack-protocol: fix maximum pkt-line size

142

143 + Correct an age-old calco (is that a typo-like word for calc)

144 + in the documentation.

145

221 -* sb/push-make-submodule-check-the-default (2016-08-24) 1 commit

222 - - push: change submodule default to check

146

224 - Turn the default of "push.recurseSubmodules" to "check".

147 +* mh/blame-worktree (2016-08-29) 1 commit

148 + (merged to 'next' on 2016-08-30 at 6c8d903)

149 + + blame: fix segfault on untracked files

150

226 - Alas, this reveals that the "check" mode is too inefficient to use

227 - in real projects.

228 - cf. <xmqqh9aaot49.fsf@gitster.mtv.corp.google.com>

151 + Micro hot-fix for a topic that is already in.

152

153 --------------------------------------------------

154 [Stalled]

@@ -480,6 +403,95 @@ of the repositories listed at

403 --------------------------------------------------

404 [Cooking]

405

406 +* hv/doc-commit-reference-style (2016-08-26) 1 commit

407 + (merged to 'next' on 2016-08-31 at 68fb778)

408 + + SubmittingPatches: use gitk's "Copy commit summary" format

409 +

410 + A small doc update.

411 + Will keep in 'next' during the rest of the cycle.

412 +

413 +

414 +* cc/receive-pack-limit (2016-08-24) 3 commits

415 + (merged to 'next' on 2016-08-25 at bc74b5b)

416 + + receive-pack: allow a maximum input size to be specified

417 + + unpack-objects: add --max-input-size=<size> option

418 + + index-pack: add --max-input-size=<size> option

419 +

420 + An incoming "git push" that attempts to push too many bytes can now

421 + be rejected by setting a new configuration variable at the receiving

422 + end.

423 +

424 + Will keep in 'next' during the rest of the cycle.

425 +

426 +

427 +* jk/format-patch-number-singleton-patch-with-cover (2016-08-23) 1 commit

428 + (merged to 'next' on 2016-08-25 at a4737fb)

429 + + format-patch: show 0/1 and 1/1 for singleton patch with cover letter

430 +

431 + "git format-patch --cover-letter HEAD^" to format a single patch

432 + with a separate cover letter now numbers the output as [PATCH 0/1]

433 + and [PATCH 1/1] by default.

434 +

435 + Will keep in 'next' during the rest of the cycle.

436 +

437 +

438 +* cp/completion-negative-refs (2016-08-24) 1 commit

439 + - completion: support excluding refs

440 +

441 + The command-line completion script (in contrib/) learned to

442 + complete "git cmd ^mas<HT>" to complete the negative end of

443 + reference to "git cmd ^master".

444 +

445 + Waiting for a review.

446 +

447 +

448 +* jk/delta-base-cache (2016-08-23) 7 commits

449 + (merged to 'next' on 2016-08-25 at f1c141a)

450 + + t/perf: add basic perf tests for delta base cache

451 + + delta_base_cache: use hashmap.h

452 + + delta_base_cache: drop special treatment of blobs

453 + + delta_base_cache: use list.h for LRU

454 + + release_delta_base_cache: reuse existing detach function

455 + + clear_delta_base_cache_entry: use a more descriptive name

456 + + cache_or_unpack_entry: drop keep_cache parameter

457 +

458 + The delta-base-cache mechanism has been a key to the performance in

459 + a repository with a tightly packed packfile, but it did not scale

460 + well even with a larger value of core.deltaBaseCacheLimit.

461 +

462 + Will keep in 'next' during the rest of the cycle.

463 +

464 +

465 +* js/cat-file-filters (2016-08-24) 4 commits

466 + - cat-file: support --textconv/--filters in batch mode

467 + - cat-file --textconv/--filters: allow specifying the path separately

468 + - cat-file: introduce the --filters option

469 + - cat-file: fix a grammo in the man page

470 +

471 + Even though "git hash-objects", which is a tool to take an

472 + on-filesystem data stream and put it into the Git object store,

473 + allowed to perform the "outside-world-to-Git" conversions (e.g.

474 + end-of-line conversions and application of the clean-filter), and

475 + it had the feature on by default from very early days, its reverse

476 + operation "git cat-file", which takes an object from the Git object

477 + store and externalize for the consumption by the outside world,

478 + lacked an equivalent mechanism to run the "Git-to-outside-world"

479 + conversion. The command learned the "--filters" option to do so.

480 +

481 + Waiting for a reroll.

482 + cf. <xmqqmvk2qcv8.fsf@gitster.mtv.corp.google.com>

483 +

484 +

485 +* sb/push-make-submodule-check-the-default (2016-08-24) 1 commit

486 + - push: change submodule default to check

487 +

488 + Turn the default of "push.recurseSubmodules" to "check".

489 +

490 + Alas, this reveals that the "check" mode is too inefficient to use

491 + in real projects, even in ones as small as git itself.

492 + cf. <xmqqh9aaot49.fsf@gitster.mtv.corp.google.com>

493 +

494 +

495 * ak/curl-imap-send-explicit-scheme (2016-08-17) 1 commit

496 - imap-send: Tell cURL to use imap:// or imaps://

497

@@ -491,56 +503,41 @@ of the repositories listed at

503 Needs review and testing.

504

505

494 -* bw/mingw-avoid-inheriting-fd-to-lockfile (2016-08-23) 2 commits

495 - (merged to 'next' on 2016-08-24 at 8389b0e)

496 - + mingw: ensure temporary file handles are not inherited by child processes

497 - + t6026-merge-attr: child processes must not inherit index.lock handles

498 -

499 - The tempfile (hence its user lockfile) API lets the caller to open

500 - a file descriptor to a temporary file, write into it and then

501 - finalize it by first closing the filehandle and then either

502 - removing or renaming the temporary file. When the process spawns a

503 - subprocess after obtaining the file descriptor, and if the

504 - subprocess has not exited when the attempt to remove or rename is

505 - made, the last step fails on Windows, because the subprocess has

506 - the file descriptor still open. Open tempfile with O_CLOEXEC flag

507 - to avoid this (on Windows, this is mapped to O_NOINHERIT).

508 -

509 - Will merge to 'master'.

510 -

511 -

512 -* rt/help-unknown (2016-08-18) 2 commits

513 - - help: make option --help open man pages only for Git commands

514 - - help: introduce option --command-only

506 +* rt/help-unknown (2016-08-30) 3 commits

507 + (merged to 'next' on 2016-08-30 at db2a5b0)

508 + + help: make option --help open man pages only for Git commands

509 + + help: introduce option --exclude-guides

510 + + Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknown

511

512 "git nosuchcommand --help" said "No manual entry for gitnosuchcommand",

513 which was not intuitive, given that "git nosuchcommand" said "git:

514 'nosuchcommand' is not a git command".

515

520 - Waiting for the review discussion to settle.

516 + Will keep in 'next' during the rest of the cycle.

517

518

519 * po/range-doc (2016-08-13) 12 commits

524 - - doc: revisions: sort examples and fix alignment of the unchanged

525 - - doc: revisions: show revision expansion in examples

526 - - doc: revisions - clarify reachability examples

527 - - doc: revisions - define `reachable`

528 - - doc: gitrevisions - clarify 'latter case' is revision walk

529 - - doc: gitrevisions - use 'reachable' in page description

530 - - doc: revisions: single vs multi-parent notation comparison

531 - - doc: revisions: extra clarification of <rev>^! notation effects

532 - - doc: revisions: give headings for the two and three dot notations

533 - - doc: show the actual left, right, and boundary marks

534 - - doc: revisions - name the left and right sides

535 - - doc: use 'symmetric difference' consistently

520 + (merged to 'next' on 2016-08-31 at d29870b)

521 + + doc: revisions: sort examples and fix alignment of the unchanged

522 + + doc: revisions: show revision expansion in examples

523 + + doc: revisions - clarify reachability examples

524 + + doc: revisions - define `reachable`

525 + + doc: gitrevisions - clarify 'latter case' is revision walk

526 + + doc: gitrevisions - use 'reachable' in page description

527 + + doc: revisions: single vs multi-parent notation comparison

528 + + doc: revisions: extra clarification of <rev>^! notation effects

529 + + doc: revisions: give headings for the two and three dot notations

530 + + doc: show the actual left, right, and boundary marks

531 + + doc: revisions - name the left and right sides

532 + + doc: use 'symmetric difference' consistently

533

534 Clarify various ways to specify the "revision ranges" in the

535 documentation.

536

540 - Waiting for the review discussion to settle.

537 + Will keep in 'next' during the rest of the cycle.

538

539

543 -* jk/diff-submodule-diff-inline (2016-08-23) 8 commits

540 +* jk/diff-submodule-diff-inline (2016-08-26) 8 commits

541 - diff: teach diff to display submodule difference with an inline diff

542 - submodule: refactor show_submodule_summary with helper function

543 - submodule: convert show_submodule_summary to use struct object_id *

@@ -554,8 +551,7 @@ of the repositories listed at

551 to allow "--submodule=diff" to show the patch between the submodule

552 commits bound to the superproject.

553

557 - Waiting for the review discussion to settle.

558 - I think it is getting there.

554 + Waiting for a reroll.

555

556

557 * jk/reduce-gc-aggressive-depth (2016-08-11) 1 commit

@@ -580,36 +576,43 @@ of the repositories listed at

576

577

578 * sb/submodule-clone-rr (2016-08-17) 8 commits

583 - - clone: recursive and reference option triggers submodule alternates

584 - - clone: implement optional references

585 - - clone: clarify option_reference as required

586 - - clone: factor out checking for an alternate path

587 - - submodule--helper update-clone: allow multiple references

588 - - submodule--helper module-clone: allow multiple references

589 - - t7408: merge short tests, factor out testing method

590 - - t7408: modernize style

579 + (merged to 'next' on 2016-08-31 at 08b4b7d)

580 + + clone: recursive and reference option triggers submodule alternates

581 + + clone: implement optional references

582 + + clone: clarify option_reference as required

583 + + clone: factor out checking for an alternate path

584 + + submodule--helper update-clone: allow multiple references

585 + + submodule--helper module-clone: allow multiple references

586 + + t7408: merge short tests, factor out testing method

587 + + t7408: modernize style

588 +

589 + "git clone --resurse-submodules --reference $path $URL" is a way to

590 + reduce network transfer cost by borrowing objects in an existing

591 + $path repository when cloning the superproject from $URL; it

592 + learned to also peek into $path for presense of corresponding

593 + repositories of submodules and borrow objects from there when able.

594

592 - I spotted a last-minute bug in v5, which is not a very good sign

593 - (it shows that nobody is reviewing). Any more comments?

595 + Will keep in 'next' during the rest of the cycle.

596

597

598 * jh/status-v2-porcelain (2016-08-12) 9 commits

597 - - status: unit tests for --porcelain=v2

598 - - test-lib-functions.sh: add lf_to_nul helper

599 - - git-status.txt: describe --porcelain=v2 format

600 - - status: print branch info with --porcelain=v2 --branch

601 - - status: print per-file porcelain v2 status data

602 - - status: collect per-file data for --porcelain=v2

603 - - status: support --porcelain[=<version>]

604 - - status: cleanup API to wt_status_print

605 - - status: rename long-format print routines

599 + (merged to 'next' on 2016-08-31 at e71f595)

600 + + status: unit tests for --porcelain=v2

601 + + test-lib-functions.sh: add lf_to_nul helper

602 + + git-status.txt: describe --porcelain=v2 format

603 + + status: print branch info with --porcelain=v2 --branch

604 + + status: print per-file porcelain v2 status data

605 + + status: collect per-file data for --porcelain=v2

606 + + status: support --porcelain[=<version>]

607 + + status: cleanup API to wt_status_print

608 + + status: rename long-format print routines

609

610 Enhance "git status --porcelain" output by collecting more data on

611 the state of the index and the working tree files, which may

612 further be used to teach git-prompt (in contrib/) to make fewer

613 calls to git.

614

612 - Any more comments?

615 + Will keep in 'next' during the rest of the cycle.

616

617

618 * mh/diff-indent-heuristic (2016-08-23) 6 commits

@@ -626,14 +629,14 @@ of the repositories listed at

629 are the same. A command line option is added to help with the

630 experiment to find a good heuristics.

631

629 - Waiting for the review discussion to settle.

630 - cf. <29c40cdd-363a-df09-f9e2-fe9070bb8a9c@ramsayjones.plus.com>

632 + Waiting for a reroll.

633 cf. <a27aa17e-f602-fc49-92b3-2198e4772e47@ramsayjones.plus.com>

634

635

634 -* cc/apply-am (2016-08-11) 40 commits

636 +* cc/apply-am (2016-08-29) 41 commits

637 - builtin/am: use apply API in run_apply()

638 - apply: learn to use a different index file

639 + - apply: pass apply state to build_fake_ancestor()

640 - apply: refactor `git apply` option parsing

641 - apply: change error_routine when silent

642 - usage: add get_error_routine() and get_warn_routine()

@@ -676,9 +679,7 @@ of the repositories listed at

679 "git am" has been taught to make an internal call to "git apply"'s

680 innards without spawning the latter as a separate process.

681

679 - Waiting for the review discussion to settle.

680 - cf. <xmqqvaz7ys9u.fsf@gitster.mtv.corp.google.com>

681 - We are almost there.

682 + Will hold for a bit more and then merge to 'next'.

683

684

685 * jk/pack-objects-optim-mru (2016-08-11) 4 commits

What's cooking (2016/08 #09)