da431a21dc · 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 (May 2016, #03; Mon, 9)

4 -X-master-at: 63a35025b11bf0e7ef39693aeea3b639a066b7b8

5 -X-next-at: 51d527da26abd20d7685abe3bbf48cc606056418

3 +Subject: What's cooking in git.git (May 2016, #04; Wed, 11)

4 +X-master-at: 5fe494c54ae44ae01a8efa91d00ac9d4c1c475e9

5 +X-next-at: d10caa2ddaf445fafa2323231055ded89325d69d

6

7 -What's cooking in git.git (May 2016, #03; Mon, 9)

7 +What's cooking in git.git (May 2016, #04; Wed, 11)

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

9

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

@@ -12,11 +12,9 @@ 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 -The 'master' branch now has the tenth batch of topics of this cycle.

16 -On the 'maint' front, 2.8.2 is out and fixes that have been in

17 -'master' accumulates on it for 2.8.3.

18 -

19 -Ones with questionable status has a '?' character in their comments.

15 +The 'master' branch now has the eleventh batch of topics of this

16 +cycle. On the 'maint' front, 2.8.2 is out and fixes that have been

17 +in 'master' accumulates on it for 2.8.3.

18

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

20 of the repositories listed at

@@ -24,159 +22,163 @@ of the repositories listed at

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

23

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

27 -[New Topics]

25 +[Graduated to "master"]

26

29 -* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit

30 - - t4151: make sure argument to 'test -z' is given

27 +* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit

28 + (merged to 'next' on 2016-05-06 at 6343d1e)

29 + + pack-objects: warn on split packs disabling bitmaps

30

32 - Test fix.

31 + Doc update.

32

34 - Will merge to 'next'.

33

34 +* ew/normal-to-e (2016-05-02) 1 commit

35 + (merged to 'next' on 2016-05-06 at 65a2c52)

36 + + .mailmap: update to my shorter email address

37

37 -* es/test-gpg-tags (2016-05-09) 1 commit

38 - - t6302: simplify non-gpg cases

38

40 - Test fix.

39 +* js/close-packs-before-gc (2016-05-02) 1 commit

40 + (merged to 'next' on 2016-05-06 at bfd39bf)

41 + + t5510: run auto-gc in the foreground

42

42 - Will merge to 'next'.

43

44 +* ls/p4-lfs (2016-04-28) 3 commits

45 + (merged to 'next' on 2016-05-06 at 3e1354d)

46 + + git-p4: fix Git LFS pointer parsing

47 + + travis-ci: express Linux/OS X dependency versions more clearly

48 + + travis-ci: update Git-LFS and P4 to the latest version

49

45 -* jc/test-seq (2016-05-09) 2 commits

46 - - test-lib-functions.sh: rewrite test_seq without Perl

47 - - test-lib-functions.sh: remove misleading comment on test_seq

50 + Recent update to Git LFS broke "git p4" by changing the output from

51 + its "lfs pointer" subcommand.

52

49 - Test fix.

53

51 - Will merge to 'next'.

54 +* ls/travis-submitting-patches (2016-05-02) 1 commit

55 + (merged to 'next' on 2016-05-06 at 467930e)

56 + + Documentation: add setup instructions for Travis CI

57

58

54 -* js/windows-dotgit (2016-05-09) 2 commits

55 - - mingw: remove unnecessary definition

56 - - mingw: introduce the 'core.hideDotFiles' setting

59 +* rn/glossary-typofix (2016-05-02) 1 commit

60 + (merged to 'next' on 2016-05-06 at 1e73e76)

61 + + Documentation: fix typo 'In such these cases'

62

58 - On Windows, .git and optionally any files whose name starts with a

59 - dot are now marked as hidden, with a core.hideDotFiles knob to

60 - customize this behaviour.

63

64 +* sb/clean-test-fix (2016-05-03) 1 commit

65 + (merged to 'next' on 2016-05-06 at d80c9c6)

66 + + t7300: mark test with SANITY

67

63 -* nd/error-errno (2016-05-09) 41 commits

64 - - wrapper.c: use warning_errno()

65 - - vcs-svn: use error_errno()

66 - - upload-pack.c: use error_errno()

67 - - unpack-trees.c: use error_errno()

68 - - transport-helper.c: use error_errno()

69 - - sha1_file.c: use {error,die,warning}_errno()

70 - - server-info.c: use error_errno()

71 - - sequencer.c: use error_errno()

72 - - run-command.c: use error_errno()

73 - - rerere.c: use error_errno() and warning_errno()

74 - - reachable.c: use error_errno()

75 - - mailmap.c: use error_errno()

76 - - ident.c: use warning_errno()

77 - - http.c: use error_errno() and warning_errno()

78 - - grep.c: use error_errno()

79 - - gpg-interface.c: use error_errno()

80 - - fast-import.c: use error_errno()

81 - - entry.c: use error_errno()

82 - - editor.c: use error_errno()

83 - - diff-no-index.c: use error_errno()

84 - - credential-cache--daemon.c: use warning_errno()

85 - - copy.c: use error_errno()

86 - - connected.c: use error_errno()

87 - - config.c: use error_errno()

88 - - compat/win32/syslog.c: use warning_errno()

89 - - combine-diff.c: use error_errno()

90 - - check-racy.c: use error_errno()

91 - - builtin/worktree.c: use error_errno()

92 - - builtin/upload-archive.c: use error_errno()

93 - - builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

94 - - builtin/rm.c: use warning_errno()

95 - - builtin/pack-objects.c: use die_errno() and warning_errno()

96 - - builtin/merge-file.c: use error_errno()

97 - - builtin/mailsplit.c: use error_errno()

98 - - builtin/help.c: use warning_errno()

99 - - builtin/fetch.c: use error_errno()

100 - - builtin/branch.c: use error_errno()

101 - - builtin/am.c: use error_errno()

102 - - bisect.c: use die_errno() and warning_errno()

103 - - usage.c: add warning_errno() and error_errno()

104 - - usage.c: move format processing out of die_errno()

68

106 - The code for warning_errno/die_errno has been refactored and a new

107 - error_errno() reporting helper is introduced.

69 +* sb/misc-cleanups (2016-04-28) 2 commits

70 + (merged to 'next' on 2016-05-06 at 87bc8a5)

71 + + submodule-config: don't shadow `cache`

72 + + config.c: drop local variable

73

109 - Will merge to 'next'.

74

75 +* sk/gitweb-highlight-encoding (2016-05-03) 1 commit

76 + (merged to 'next' on 2016-05-06 at 441302c)

77 + + gitweb: apply fallback encoding before highlight

78

112 -* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit

113 - - remote.c: specify correct plural form in "commit diverge" message

79 + Some multi-byte encoding can have a backslash byte as a later part

80 + of one letter, which would confuse "highlight" filter used in

81 + gitweb.

82

115 - Message fix.

83 +--------------------------------------------------

84 +[New Topics]

85

117 - Will merge to 'next'.

86 +* es/t1500-modernize (2016-05-10) 7 commits

87 + - t1500: finish preparation upfront

88 + - t1500: be considerate to future potential tests

89 + - t1500: avoid setting environment variables outside of tests

90 + - t1500: avoid setting configuration options outside of tests

91 + - t1500: avoid changing working directory outside of tests

92 + - t1500: reduce dependence upon global state

93 + - t1500: test_rev_parse: facilitate future test enhancements

94

95 + test updates to make it more readable and maintainable.

96

120 -* nd/test-helpers (2016-05-09) 1 commit

121 - - wrap-for-bin.sh: handle t/helper/ paths internally

97 + Will be rerolled.

98

123 - Switching between 'master' and 'next', between which the paths to

124 - test helper binaries have changed, did not update bin-wrappers/*

125 - scripts used in tests, causing false test failures.

99

127 - Will merge to 'next'.

100 +* ls/travis-build-doc (2016-05-10) 1 commit

101 + (merged to 'next' on 2016-05-10 at 7f63497)

102 + + travis-ci: build documentation

103

104 + CI test was taught to build documentation pages.

105

130 -* tb/core-eol-fix (2016-04-25) 4 commits

131 - - convert.c: ident + core.autocrlf didn't work

132 - - t0027: test cases for combined attributes

133 - - convert: allow core.autocrlf=input and core.eol=crlf

134 - - t0027: make commit_chk_wrnNNO() reliable

106 + Will merge to 'master'.

107

136 - A couple of bugs around core.autocrlf have been fixed.

108

138 - Will merge to 'next'.

109 +* js/t3404-typofix (2016-05-10) 1 commit

110 + (merged to 'next' on 2016-05-10 at cbeabc0)

111 + + t3404: fix typo

112

113 + Will merge to 'master'.

114

141 -* tb/t5601-sed-fix (2016-05-09) 1 commit

142 - - t5601: Remove trailing space in sed expression

115

144 - Test fix.

116 +* jk/rebase-interative-eval-fix (2016-05-10) 1 commit

117 + (merged to 'next' on 2016-05-11 at 4fdf387)

118 + + rebase--interactive: avoid empty list in shell for-loop

119

146 - Will merge to 'next'.

120 + Portability enhancement for "rebase -i" to help platforms whose

121 + shell does not like "for i in <empty>" (which is not POSIX-kosher).

122

123 + Will merge to 'master'.

124

149 -* va/i18n-remote-comment-to-align (2016-05-09) 1 commit

150 - - i18n: remote: add comment for translators

125

152 - Message fix.

126 +* jk/test-send-sh-x-trace-elsewhere (2016-05-11) 1 commit

127 + (merged to 'next' on 2016-05-11 at 273a137)

128 + + test-lib: set BASH_XTRACEFD automatically

129

154 - Will merge to 'next'.

130 + Running tests with '-x' option to trace the individual command

131 + executions is a useful way to debug test scripts, but some tests

132 + that capture the standard error stream and check what the command

133 + said can be broken with the trace output mixed in. When running

134 + our tests under "bash", however, we can redirect the trace output

135 + to another file descriptor to keep the standard error of programs

136 + being tested intact.

137

138 + Will merge to 'master'.

139

157 -* jc/linkgit-fix (2016-05-09) 1 commit

158 - - Documentation: fix linkgit references

140

160 - Many 'linkgit:<git documentation page>' references were broken,

161 - which are all fixed with this.

141 +* js/perf-rebase-i (2016-05-11) 3 commits

142 + - Add a perf test for rebase -i

143 + - perf: make the tests work in worktrees

144 + - perf: let's disable symlinks when they are not available

145

163 - Will merge to 'next'.

146 + Add perf test for "rebase -i"

147

148

166 -* js/http-custom-headers (2016-05-09) 2 commits

167 - - t5551: make the test for extra HTTP headers more robust

168 - - tests: adjust the configuration for Apache 2.2

149 +* nd/worktree-cleanup-post-head-protection (2016-05-10) 7 commits

150 + - worktree: simplify prefixing paths

151 + - worktree: avoid 0{40}, too many zeroes, hard to read

152 + - worktree.c: add clear_worktree()

153 + - worktree.c: use is_dot_or_dotdot()

154 + - git-worktree.txt: keep subcommand listing in alphabetical order

155 + - worktree.c: rewrite mark_current_worktree() to avoid strbuf

156 + - completion: support git-worktree

157 + (this branch uses nd/worktree-various-heads.)

158

170 - Update tests for "http.extraHeaders=<header>" to be portable back

171 - to Apache 2.2 (the original depended on <RequireAll/> which is a

172 - more recent feature).

159

174 - Will merge to 'next'.

160 +* va/mailinfo-doc-typofix (2016-05-11) 1 commit

161 + (merged to 'next' on 2016-05-11 at 7180176)

162 + + Documentation/git-mailinfo: fix typo

163

164 + Typofix.

165 +

166 + Will merge to 'master'.

167

168 --------------------------------------------------

169 [Stalled]

170

171 +* ep/http-curl-trace (2016-05-02) 2 commits

172 + . imap-send.c: introduce the GIT_TRACE_CURL environment variable

173 + . http.c: implement the GIT_TRACE_CURL environment variable

174 +

175 + HTTP transport gained an option to produce more detailed debugging

176 + trace.

177 +

178 + Expecting a reroll.

179 + ($gmane/292074, 293236)

180 +

181 +

182 * sb/bisect (2016-04-15) 22 commits

183 - SQUASH???

184 - bisect: get back halfway shortcut

@@ -260,27 +262,27 @@ of the repositories listed at

262

263

264 * sg/completion-updates (2016-02-28) 21 commits

263 - - completion: cache the path to the repository

264 - - completion: extract repository discovery from __gitdir()

265 - - completion: don't guard git executions with __gitdir()

266 - - completion: consolidate silencing errors from git commands

267 - - completion: don't use __gitdir() for git commands

268 - - completion: respect 'git -C <path>'

269 - - completion: fix completion after 'git -C <path>'

270 - - completion: don't offer commands when 'git --opt' needs an argument

271 - - rev-parse: add '--absolute-git-dir' option

272 - - completion: list short refs from a remote given as a URL

273 - - completion: don't list 'HEAD' when trying refs completion outside of a repo

274 - - completion: list refs from remote when remote's name matches a directory

275 - - completion: respect 'git --git-dir=<path>' when listing remote refs

276 - - completion: fix most spots not respecting 'git --git-dir=<path>'

277 - - completion: ensure that the repository path given on the command line exists

278 - - completion tests: add tests for the __git_refs() helper function

279 - - completion tests: check __gitdir()'s output in the error cases

280 - - completion tests: consolidate getting path of current working directory

281 - - completion tests: make the $cur variable local to the test helper functions

282 - - completion tests: don't add test cruft to the test repository

283 - - completion: improve __git_refs()'s in-code documentation

265 + . completion: cache the path to the repository

266 + . completion: extract repository discovery from __gitdir()

267 + . completion: don't guard git executions with __gitdir()

268 + . completion: consolidate silencing errors from git commands

269 + . completion: don't use __gitdir() for git commands

270 + . completion: respect 'git -C <path>'

271 + . completion: fix completion after 'git -C <path>'

272 + . completion: don't offer commands when 'git --opt' needs an argument

273 + . rev-parse: add '--absolute-git-dir' option

274 + . completion: list short refs from a remote given as a URL

275 + . completion: don't list 'HEAD' when trying refs completion outside of a repo

276 + . completion: list refs from remote when remote's name matches a directory

277 + . completion: respect 'git --git-dir=<path>' when listing remote refs

278 + . completion: fix most spots not respecting 'git --git-dir=<path>'

279 + . completion: ensure that the repository path given on the command line exists

280 + . completion tests: add tests for the __git_refs() helper function

281 + . completion tests: check __gitdir()'s output in the error cases

282 + . completion tests: consolidate getting path of current working directory

283 + . completion tests: make the $cur variable local to the test helper functions

284 + . completion tests: don't add test cruft to the test repository

285 + . completion: improve __git_refs()'s in-code documentation

286

287 Will be rerolled.

288 ($gmane/287839)

@@ -297,15 +299,6 @@ of the repositories listed at

299 Needs a better explanation.

300

301

300 -* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit

301 - - wt-status.c: set commitable bit if there is a meaningful merge.

302 -

303 - "git commit --dry-run" reported "No, no, you cannot commit." in one

304 - case where "git commit" would have allowed you to commit, and this

305 - improves it a little bit ("git commit --dry-run --short" still does

306 - not give you the correct answer, for example).

307 -

308 -

302 * nd/icase (2016-02-15) 12 commits

303 - grep.c: reuse "icase" variable

304 - diffcore-pickaxe: support case insensitive match on non-ascii

@@ -398,6 +391,185 @@ of the repositories listed at

391 --------------------------------------------------

392 [Cooking]

393

394 +* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit

395 + (merged to 'next' on 2016-05-10 at 2ada404)

396 + + wt-status.c: set commitable bit if there is a meaningful merge.

397 +

398 + "git commit --dry-run" reported "No, no, you cannot commit." in one

399 + case where "git commit" would have allowed you to commit, and this

400 + improves it a little bit ("git commit --dry-run --short" still does

401 + not give you the correct answer, for example). This is a stop-gap

402 + measure in that "commit --short --dry-run" still gives an incorrect

403 + result.

404 +

405 + Will merge to 'master'.

406 +

407 +

408 +* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit

409 + (merged to 'next' on 2016-05-10 at 36ae38c)

410 + + t4151: make sure argument to 'test -z' is given

411 +

412 + Test fix.

413 +

414 + Will merge to 'master'.

415 +

416 +

417 +* es/test-gpg-tags (2016-05-09) 1 commit

418 + (merged to 'next' on 2016-05-10 at 9fcb98b)

419 + + t6302: simplify non-gpg cases

420 +

421 + Test fix.

422 +

423 + Will merge to 'master'.

424 +

425 +

426 +* jc/test-seq (2016-05-09) 2 commits

427 + (merged to 'next' on 2016-05-10 at 1512890)

428 + + test-lib-functions.sh: rewrite test_seq without Perl

429 + + test-lib-functions.sh: remove misleading comment on test_seq

430 +

431 + Test fix.

432 +

433 + Will merge to 'master'.

434 +

435 +

436 +* js/windows-dotgit (2016-05-11) 2 commits

437 + (merged to 'next' on 2016-05-11 at d10caa2)

438 + + mingw: remove unnecessary definition

439 + + mingw: introduce the 'core.hideDotFiles' setting

440 +

441 + On Windows, .git and optionally any files whose name starts with a

442 + dot are now marked as hidden, with a core.hideDotFiles knob to

443 + customize this behaviour.

444 +

445 + Will merge to 'master'.

446 +

447 +

448 +* nd/error-errno (2016-05-09) 41 commits

449 + (merged to 'next' on 2016-05-10 at 1cdeda8)

450 + + wrapper.c: use warning_errno()

451 + + vcs-svn: use error_errno()

452 + + upload-pack.c: use error_errno()

453 + + unpack-trees.c: use error_errno()

454 + + transport-helper.c: use error_errno()

455 + + sha1_file.c: use {error,die,warning}_errno()

456 + + server-info.c: use error_errno()

457 + + sequencer.c: use error_errno()

458 + + run-command.c: use error_errno()

459 + + rerere.c: use error_errno() and warning_errno()

460 + + reachable.c: use error_errno()

461 + + mailmap.c: use error_errno()

462 + + ident.c: use warning_errno()

463 + + http.c: use error_errno() and warning_errno()

464 + + grep.c: use error_errno()

465 + + gpg-interface.c: use error_errno()

466 + + fast-import.c: use error_errno()

467 + + entry.c: use error_errno()

468 + + editor.c: use error_errno()

469 + + diff-no-index.c: use error_errno()

470 + + credential-cache--daemon.c: use warning_errno()

471 + + copy.c: use error_errno()

472 + + connected.c: use error_errno()

473 + + config.c: use error_errno()

474 + + compat/win32/syslog.c: use warning_errno()

475 + + combine-diff.c: use error_errno()

476 + + check-racy.c: use error_errno()

477 + + builtin/worktree.c: use error_errno()

478 + + builtin/upload-archive.c: use error_errno()

479 + + builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

480 + + builtin/rm.c: use warning_errno()

481 + + builtin/pack-objects.c: use die_errno() and warning_errno()

482 + + builtin/merge-file.c: use error_errno()

483 + + builtin/mailsplit.c: use error_errno()

484 + + builtin/help.c: use warning_errno()

485 + + builtin/fetch.c: use error_errno()

486 + + builtin/branch.c: use error_errno()

487 + + builtin/am.c: use error_errno()

488 + + bisect.c: use die_errno() and warning_errno()

489 + + usage.c: add warning_errno() and error_errno()

490 + + usage.c: move format processing out of die_errno()

491 +

492 + The code for warning_errno/die_errno has been refactored and a new

493 + error_errno() reporting helper is introduced.

494 +

495 + Will merge to 'master'.

496 +

497 +

498 +* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit

499 + (merged to 'next' on 2016-05-10 at aea08dc)

500 + + remote.c: specify correct plural form in "commit diverge" message

501 +

502 + Message fix.

503 +

504 + Will merge to 'master'.

505 +

506 +

507 +* nd/test-helpers (2016-05-10) 1 commit

508 + (merged to 'next' on 2016-05-10 at e8ad58d)

509 + + wrap-for-bin.sh: regenerate bin-wrappers when switching branches

510 +

511 + Switching between 'master' and 'next', between which the paths to

512 + test helper binaries have changed, did not update bin-wrappers/*

513 + scripts used in tests, causing false test failures.

514 +

515 + Will merge to 'master'.

516 +

517 +

518 +* tb/core-eol-fix (2016-04-25) 4 commits

519 + (merged to 'next' on 2016-05-10 at fa8a200)

520 + + convert.c: ident + core.autocrlf didn't work

521 + + t0027: test cases for combined attributes

522 + + convert: allow core.autocrlf=input and core.eol=crlf

523 + + t0027: make commit_chk_wrnNNO() reliable

524 +

525 + A couple of bugs around core.autocrlf have been fixed.

526 +

527 + Will merge to 'master'.

528 +

529 +

530 +* tb/t5601-sed-fix (2016-05-09) 1 commit

531 + (merged to 'next' on 2016-05-10 at d3e54e8)

532 + + t5601: Remove trailing space in sed expression

533 +

534 + Test fix.

535 +

536 + Will merge to 'master'.

537 +

538 +

539 +* va/i18n-remote-comment-to-align (2016-05-09) 1 commit

540 + (merged to 'next' on 2016-05-10 at edbacbb)

541 + + i18n: remote: add comment for translators

542 +

543 + Message fix.

544 +

545 + Will merge to 'master'.

546 +

547 +

548 +* jc/linkgit-fix (2016-05-09) 1 commit

549 + (merged to 'next' on 2016-05-10 at 0e5ba60)

550 + + Documentation: fix linkgit references

551 +

552 + Many 'linkgit:<git documentation page>' references were broken,

553 + which are all fixed with this.

554 +

555 + Will merge to 'master'.

556 +

557 +

558 +* js/http-custom-headers (2016-05-10) 4 commits

559 + (merged to 'next' on 2016-05-10 at 7cf5cca)

560 + + submodule: ensure that -c http.extraheader is heeded

561 + + Merge branch 'jk/submodule-c-credential' into js/http-custom-headers

562 + + t5551: make the test for extra HTTP headers more robust

563 + + tests: adjust the configuration for Apache 2.2

564 + (this branch uses jk/submodule-c-credential.)

565 +

566 + Update tests for "http.extraHeaders=<header>" to be portable back

567 + to Apache 2.2 (the original depended on <RequireAll/> which is a

568 + more recent feature).

569 +

570 + Will merge to 'master'.

571 +

572 +

573 * sb/submodule-deinit-all (2016-05-05) 1 commit

574 (merged to 'next' on 2016-05-09 at 0fd4518)

575 + submodule deinit: require '--all' instead of '.' for all submodules

@@ -410,12 +582,13 @@ of the repositories listed at

582

583

584 * bn/config-doc-tt-varnames (2016-05-05) 1 commit

413 - - config: consistently format $variables in monospaced font

585 + (merged to 'next' on 2016-05-10 at aa7b834)

586 + + config: consistently format $variables in monospaced font

587 (this branch uses jc/config-pathname-type.)

588

589 Doc formatting fixes.

590

418 - Will merge to 'next'.

591 + Will merge to 'master'.

592

593

594 * lp/typofixes (2016-05-06) 1 commit

@@ -433,56 +606,28 @@ of the repositories listed at

606 Will merge to 'master'.

607

608

436 -* jc/test-parse-options-expect (2016-05-06) 4 commits

437 - - t0040: convert a few tests to use test-parse-options --expect

438 - - t0040: remove unused test helpers

439 - - test-parse-options: --expect=<string> option to simplify tests

440 - - test-parse-options: fix output when callback option fails

609 +* jc/test-parse-options-expect (2016-05-10) 4 commits

610 + (merged to 'next' on 2016-05-10 at 3ca5783)

611 + + t0040: convert a few tests to use test-parse-options --expect

612 + + t0040: remove unused test helpers

613 + + test-parse-options: --expect=<string> option to simplify tests

614 + + test-parse-options: fix output when callback option fails

615 (this branch uses pb/commit-verbose-config.)

616

617 t0040 had too many unnecessary repetitions in its test data. Teach

618 test-parse-options program so that a caller can tell what it

619 expects in its output, so that these repetitions can be cleaned up.

620

447 - Will merge to 'next'.

621 + Will merge to 'master'.

622

623

450 -* jc/doc-lint (2016-05-04) 1 commit

451 - - ci: validate "gitlink:" in documentation

624 +* jc/doc-lint (2016-05-10) 1 commit

625 + - ci: validate "linkgit:" in documentation

626

627 Find common mistakes when writing gitlink: in our documentation and

628 drive the check from "make check-docs".

629

630

457 -

458 -* ew/normal-to-e (2016-05-02) 1 commit

459 - (merged to 'next' on 2016-05-06 at 65a2c52)

460 - + .mailmap: update to my shorter email address

461 -

462 - Will merge to 'master'.

463 -

464 -

465 -* js/close-packs-before-gc (2016-05-02) 1 commit

466 - (merged to 'next' on 2016-05-06 at bfd39bf)

467 - + t5510: run auto-gc in the foreground

468 -

469 - Will merge to 'master'.

470 -

471 -

472 -* ls/travis-submitting-patches (2016-05-02) 1 commit

473 - (merged to 'next' on 2016-05-06 at 467930e)

474 - + Documentation: add setup instructions for Travis CI

475 -

476 - Will merge to 'master'.

477 -

478 -

479 -* rn/glossary-typofix (2016-05-02) 1 commit

480 - (merged to 'next' on 2016-05-06 at 1e73e76)

481 - + Documentation: fix typo 'In such these cases'

482 -

483 - Will merge to 'master'.

484 -

485 -

631 * jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit

632 (merged to 'next' on 2016-05-06 at 08eccb2)

633 + commit-tree: do not pay attention to commit.gpgsign

@@ -500,16 +645,14 @@ of the repositories listed at

645 Will merge to 'master'.

646

647

503 -* jk/push-client-deadlock-fix (2016-05-02) 1 commit

648 +* jk/push-client-deadlock-fix (2016-05-11) 2 commits

649 + (merged to 'next' on 2016-05-11 at 8f4abf9)

650 + + Windows: only add a no-op pthread_sigmask() when needed

651 (merged to 'next' on 2016-05-06 at e91626c)

652 + Windows: add pthread_sigmask() that does nothing

653

507 - Will merge to 'master'.

508 -

509 -

510 -* sb/clean-test-fix (2016-05-03) 1 commit

511 - (merged to 'next' on 2016-05-06 at d80c9c6)

512 - + t7300: mark test with SANITY

654 + Some Windows SDK lacks pthread_sigmask() implementation and fails

655 + to compile the recently updated "git push" codepath that uses it.

656

657 Will merge to 'master'.

658

@@ -521,17 +664,6 @@ of the repositories listed at

664 Will merge to 'master'.

665

666

524 -* sk/gitweb-highlight-encoding (2016-05-03) 1 commit

525 - (merged to 'next' on 2016-05-06 at 441302c)

526 - + gitweb: apply fallback encoding before highlight

527 -

528 - Some multi-byte encoding can have a backslash byte as a later part

529 - of one letter, which would confuse "highlight" filter used in

530 - gitweb.

531 -

532 - Will merge to 'master'.

533 -

534 -

667 * ab/hooks (2016-05-04) 4 commits

668 (merged to 'next' on 2016-05-09 at 23cf808)

669 + hooks: allow customizing where the hook directory is

@@ -611,15 +743,6 @@ of the repositories listed at

743 Will merge to 'master'.

744

745

614 -* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit

615 - (merged to 'next' on 2016-05-06 at 6343d1e)

616 - + pack-objects: warn on split packs disabling bitmaps

617 -

618 - Doc update.

619 -

620 - Will merge to 'master'.

621 -

622 -

746 * jc/config-pathname-type (2016-05-04) 1 commit

747 (merged to 'next' on 2016-05-09 at 0876e55)

748 + config: describe 'pathname' value type

@@ -632,19 +755,21 @@ of the repositories listed at

755

756

757 * jk/submodule-c-credential (2016-05-06) 6 commits

635 - - submodule: stop sanitizing config options

636 - - submodule: use prepare_submodule_repo_env consistently

637 - - submodule--helper: move config-sanitizing to submodule.c

638 - - submodule: export sanitized GIT_CONFIG_PARAMETERS

639 - - t5550: break submodule config test into multiple sub-tests

640 - - t5550: fix typo in $HTTPD_URL

758 + (merged to 'next' on 2016-05-10 at 4abe871)

759 + + submodule: stop sanitizing config options

760 + + submodule: use prepare_submodule_repo_env consistently

761 + + submodule--helper: move config-sanitizing to submodule.c

762 + + submodule: export sanitized GIT_CONFIG_PARAMETERS

763 + + t5550: break submodule config test into multiple sub-tests

764 + + t5550: fix typo in $HTTPD_URL

765 + (this branch is used by js/http-custom-headers.)

766

767 An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:

768 submodule honor -c credential.* from command line, 2016-02-29)

769 turned out to be a convoluted no-op; implement what it wanted to do

645 - correctly.

770 + correctly, and stop filtering settings given via "git -c var=val".

771

647 - Everybody happy?

772 + Will merge to 'master'.

773

774

775 * mh/connect-leak (2016-04-28) 1 commit

@@ -656,103 +781,74 @@ of the repositories listed at

781 Will discard.

782

783

659 -* sb/misc-cleanups (2016-04-28) 2 commits

660 - (merged to 'next' on 2016-05-06 at 87bc8a5)

661 - + submodule-config: don't shadow `cache`

662 - + config.c: drop local variable

663 -

664 - Will merge to 'master'.

665 -

666 -

667 -* ew/fast-import-unpack-limit (2016-04-24) 1 commit

668 - - fast-import: implement unpack limit

784 +* ew/fast-import-unpack-limit (2016-05-11) 1 commit

785 + (merged to 'next' on 2016-05-11 at ffd4efb)

786 + + fast-import: implement unpack limit

787

788 "git fast-import" learned the same performance trick to avoid

789 creating too small a packfile as "git fetch" and "git push" have,

790 using *.unpackLimit configuration.

791

674 - Need to pick up the rerolled version.

675 - ($gmane/292562)

676 -

677 -

678 -* ls/p4-lfs (2016-04-28) 3 commits

679 - (merged to 'next' on 2016-05-06 at 3e1354d)

680 - + git-p4: fix Git LFS pointer parsing

681 - + travis-ci: express Linux/OS X dependency versions more clearly

682 - + travis-ci: update Git-LFS and P4 to the latest version

683 -

684 - Recent update to Git LFS broke "git p4" by changing the output from

685 - its "lfs pointer" subcommand.

686 -

792 Will merge to 'master'.

793

794

690 -* ep/http-curl-trace (2016-05-02) 2 commits

691 - . imap-send.c: introduce the GIT_TRACE_CURL environment variable

692 - . http.c: implement the GIT_TRACE_CURL environment variable

693 -

694 - HTTP transport gained an option to produce more detailed debugging

695 - trace.

696 -

697 - Still under discussion.

698 - ($gmane/292074, 293236)

699 -

700 -

795 * nd/worktree-various-heads (2016-04-22) 13 commits

702 - - branch: do not rename a branch under bisect or rebase

703 - - worktree.c: check whether branch is bisected in another worktree

704 - - wt-status.c: split bisect detection out of wt_status_get_state()

705 - - worktree.c: check whether branch is rebased in another worktree

706 - - worktree.c: avoid referencing to worktrees[i] multiple times

707 - - wt-status.c: make wt_status_check_rebase() work on any worktree

708 - - wt-status.c: split rebase detection out of wt_status_get_state()

709 - - path.c: refactor and add worktree_git_path()

710 - - worktree.c: mark current worktree

711 - - worktree.c: make find_shared_symref() return struct worktree *

712 - - worktree.c: store "id" instead of "git_dir"

713 - - path.c: add git_common_path() and strbuf_git_common_path()

714 - - dir.c: rename str(n)cmp_icase to fspath(n)cmp

796 + (merged to 'next' on 2016-05-10 at 61d3415)

797 + + branch: do not rename a branch under bisect or rebase

798 + + worktree.c: check whether branch is bisected in another worktree

799 + + wt-status.c: split bisect detection out of wt_status_get_state()

800 + + worktree.c: check whether branch is rebased in another worktree

801 + + worktree.c: avoid referencing to worktrees[i] multiple times

802 + + wt-status.c: make wt_status_check_rebase() work on any worktree

803 + + wt-status.c: split rebase detection out of wt_status_get_state()

804 + + path.c: refactor and add worktree_git_path()

805 + + worktree.c: mark current worktree

806 + + worktree.c: make find_shared_symref() return struct worktree *

807 + + worktree.c: store "id" instead of "git_dir"

808 + + path.c: add git_common_path() and strbuf_git_common_path()

809 + + dir.c: rename str(n)cmp_icase to fspath(n)cmp

810 + (this branch is used by nd/worktree-cleanup-post-head-protection.)

811

812 The experimental "multiple worktree" feature gains more safety to

813 forbid operations on a branch that is checked out or being actively

814 worked on elsewhere, by noticing that e.g. it is being rebased.

815

720 - Will merge to 'next'.

816 + Will merge to 'master'.

817

818

723 -* pb/commit-verbose-config (2016-05-05) 8 commits

724 - - SQUASH???

725 - - commit: add a commit.verbose config variable

726 - - t7507-commit-verbose: improve test coverage by testing number of diffs

727 - - parse-options.c: make OPTION_COUNTUP respect "unspecified" values

728 - - t/t7507: improve test coverage

729 - - t0040-parse-options: improve test coverage

730 - - test-parse-options: print quiet as integer

731 - - t0040-test-parse-options.sh: fix style issues

819 +* pb/commit-verbose-config (2016-05-10) 7 commits

820 + + commit: add a commit.verbose config variable

821 + + t7507-commit-verbose: improve test coverage by testing number of diffs

822 + + parse-options.c: make OPTION_COUNTUP respect "unspecified" values

823 + + t/t7507: improve test coverage

824 + + t0040-parse-options: improve test coverage

825 + + test-parse-options: print quiet as integer

826 + + t0040-test-parse-options.sh: fix style issues

827 (this branch is used by jc/test-parse-options-expect.)

828

829 "git commit" learned to pay attention to "commit.verbose"

830 configuration variable and act as if "--verbose" option was

831 given from the command line.

832

738 - Almost there.

739 - ($gmane/293663).

833 + Will merge to 'master'.

834

835

742 -* jc/fsck-nul-in-commit (2016-04-14) 2 commits

743 - - fsck: detect and warn a commit with embedded NUL

744 - - fsck_commit_buffer(): do not special case the last validation

836 +* jc/fsck-nul-in-commit (2016-05-10) 2 commits

837 + (merged to 'next' on 2016-05-10 at 3bc3ca3)

838 + + fsck: detect and warn a commit with embedded NUL

839 + + fsck_commit_buffer(): do not special case the last validation

840

841 "git fsck" learned to catch NUL byte in a commit object as

842 potential error and warn.

843

749 - What was the status of this one? Ready to proceed?

844 + Will merge to 'master'.

845

846

847 * jc/ll-merge-internal (2016-05-09) 3 commits

753 - - t6036: remove pointless test that expects failure

754 - - ll-merge: use a longer conflict marker for internal merge

755 - - ll-merge: fix typo in comment

848 + (merged to 'next' on 2016-05-10 at a6bf1d0)

849 + + t6036: remove pointless test that expects failure

850 + + ll-merge: use a longer conflict marker for internal merge

851 + + ll-merge: fix typo in comment

852

853 "git rerere" can get confused by conflict markers deliberately left

854 by the inner merge step, because they are indistinguishable from

@@ -760,7 +856,7 @@ of the repositories listed at

856 what the end user and "rerere" need to look at. This was fixed by

857 making the conflict markers left by the inner merges a bit longer.

858

763 - Will merge to 'next'.

859 + Will merge to 'master'.

860

861

862 * sb/submodule-init (2016-05-03) 7 commits

@@ -793,19 +889,20 @@ of the repositories listed at

889

890

891 * va/i18n-misc-updates (2016-04-19) 9 commits

796 - - i18n: builtin/pull.c: split strings marked for translation

797 - - i18n: builtin/pull.c: mark placeholders for translation

798 - - i18n: git-parse-remote.sh: mark strings for translation

799 - - i18n: branch: move comment for translators

800 - - i18n: branch: unmark string for translation

801 - - i18n: builtin/rm.c: remove a comma ',' from string

802 - - i18n: unpack-trees: mark strings for translation

803 - - i18n: builtin/branch.c: mark option for translation

804 - - i18n: index-pack: use plural string instead of normal one

892 + (merged to 'next' on 2016-05-10 at b5dbd0d)

893 + + i18n: builtin/pull.c: split strings marked for translation

894 + + i18n: builtin/pull.c: mark placeholders for translation

895 + + i18n: git-parse-remote.sh: mark strings for translation

896 + + i18n: branch: move comment for translators

897 + + i18n: branch: unmark string for translation

898 + + i18n: builtin/rm.c: remove a comma ',' from string

899 + + i18n: unpack-trees: mark strings for translation

900 + + i18n: builtin/branch.c: mark option for translation

901 + + i18n: index-pack: use plural string instead of normal one

902

903 Mark several messages for translation.

904

808 - Will merge to 'next'.

905 + Will merge to 'master'.

906

907

908 * kn/ref-filter-branch-list (2016-04-25) 17 commits

@@ -834,16 +931,17 @@ of the repositories listed at

931

932

933 * xy/format-patch-base (2016-04-26) 4 commits

837 - - format-patch: introduce format.useAutoBase configuration

838 - - format-patch: introduce --base=auto option

839 - - format-patch: add '--base' option to record base tree info

840 - - patch-ids: make commit_patch_id() a public helper function

934 + (merged to 'next' on 2016-05-10 at dd19e0a)

935 + + format-patch: introduce format.useAutoBase configuration

936 + + format-patch: introduce --base=auto option

937 + + format-patch: add '--base' option to record base tree info

938 + + patch-ids: make commit_patch_id() a public helper function

939

940 "git format-patch" learned a new "--base" option to record what

941 (public, well-known) commit the original series was built on in

942 its output.

943

846 - Will merge to 'next'.

944 + Will merge to 'master'.

945

946

947 * dt/index-helper (2016-05-09) 19 commits

What's cooking (2016/05 #04)