c32e74bc2a · 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, #07; Fri, 20)

4 -X-master-at: 3916adf9978b020f9a9b165f4c1c109046899560

5 -X-next-at: 0520c90a3eb69be4dcb02396166432df2ae280e5

3 +Subject: What's cooking in git.git (May 2016, #08; Thu, 26)

4 +X-master-at: 7777322816a31edff4fb9f429847d11f8974f264

5 +X-next-at: 397704a2234a83bf7ba537e78d607ea550d3074c

6

7 -What's cooking in git.git (May 2016, #07; Fri, 20)

7 +What's cooking in git.git (May 2016, #08; Thu, 26)

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

9

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

@@ -12,12 +12,6 @@ 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 -Almost all the topics marked as "will merge" in this issue should be

16 -merged before 2.9-rc0 (scheduled for coming Monday). There are a

17 -few very interesting topics that we will be cooking throughout the

18 -pre-release freeze in 'next', and I am already looking forward to

19 -the cycle after this upcoming release ;-).

20 -

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

16 of the repositories listed at

17

@@ -26,49 +20,232 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

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

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

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

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

33 - + Windows: add pthread_sigmask() that does nothing

23 +* ar/diff-args-osx-precompose (2016-05-13) 1 commit

24 + (merged to 'next' on 2016-05-17 at 7b59b79)

25 + + diff: run arguments through precompose_argv

26 +

27 + Many commands normalize command line arguments from NFD to NFC

28 + variant of UTF-8 on OSX, but commands in the "diff" family did

29 + not, causing "git diff $path" to complain that no such path is

30 + known to Git. They have been taught to do the normalization.

31 +

32 +

33 +* da/difftool (2016-05-16) 2 commits

34 + (merged to 'next' on 2016-05-17 at ef5a435)

35 + + difftool: handle unmerged files in dir-diff mode

36 + + difftool: initialize variables for readability

37 +

38 + "git difftool" learned to handle unmerged paths correctly in

39 + dir-diff mode.

40 +

41 +

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

43 + (merged to 'next' on 2016-05-17 at 9032aa5)

44 + + ci: validate "linkgit:" in documentation

45 +

46 + Find common mistakes when writing gitlink: in our documentation and

47 + drive the check from "make check-docs".

48 +

49 +

50 +* jc/rerere-multi (2016-05-19) 2 commits

51 + (merged to 'next' on 2016-05-19 at 0520c90)

52 + + rerere: remove an null statement

53 + (merged to 'next' on 2016-05-13 at f4d1d82)

54 + + rerere: plug memory leaks upon "rerere forget" failure

55 +

56 +

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

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

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

60 + + t0040: remove unused test helpers

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

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

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

64 +

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

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

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

68 +

69 +

70 +* jk/test-z-n-unquoted (2016-05-14) 6 commits

71 + (merged to 'next' on 2016-05-17 at 65372cf)

72 + + always quote shell arguments to test -z/-n

73 + + t9103: modernize test style

74 + + t9107: switch inverted single/double quotes in test

75 + + t9107: use "return 1" instead of "exit 1"

76 + + t9100,t3419: enclose all test code in single-quotes

77 + + t/lib-git-svn: drop $remote_git_svn and $git_svn_id

78 +

79 + t9xxx series has been updated primarily for readability, while

80 + fixing small bugs in it. A few scripted Porcelains have also been

81 + updated to fix possible bugs around their use of "test -z" and

82 + "test -n".

83 +

84 +

85 +* js/perf-rebase-i (2016-05-13) 3 commits

86 + (merged to 'next' on 2016-05-13 at eb51ddd)

87 + + perf: run "rebase -i" under perf

88 + + perf: make the tests work in worktrees

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

90 +

91 + Add perf test for "rebase -i"

92 +

93 +

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

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

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

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

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

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

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

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

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

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

104 + + worktree.c: mark current worktree

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

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

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

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

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

110 +

111 + The experimental "multiple worktree" feature gains more safety to

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

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

114 +

115 +

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

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

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

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

120 + + t/t7507: improve test coverage

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

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

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

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

125 +

126 + "git commit" learned to pay attention to "commit.verbose"

127 + configuration variable and act as if "--verbose" option was

128 + given from the command line.

129 +

130 +

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

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

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

134 +

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

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

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

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

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

140 + result.

141 +

142 +

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

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

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

146 + + t0027: test cases for combined attributes

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

148 + + t0027: make commit_chk_wrnNNO() reliable

149 + (this branch is used by tb/convert-peek-in-index.)

150 +

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

152 +

153 +

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

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

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

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

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

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

160

35 - Some Windows SDK lacks pthread_sigmask() implementation and fails

36 - to compile the recently updated "git push" codepath that uses it.

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

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

163 + its output.

164

165 --------------------------------------------------

166 [New Topics]

167

41 -* jk/cat-file-buffered-batch-all (2016-05-18) 2 commits

42 - - cat-file: default to --buffer when --batch-all-objects is used

43 - - cat-file: avoid noop calls to sha1_object_info_extended

168 +* ak/t4204-shell-portability (2016-05-24) 1 commit

169 + - t4204: do not let $name variable clobbered

170 +

171 + Update a test to run also under ksh88.

172 +

173 + Will merge to 'next' and to 'master'.

174

45 - "git cat-file --batch-all" has been sped up, by taking advantage

46 - of the fact that it does not have to read a list of objects, in two

47 - ways.

175 +

176 +* et/pretty-format-c-auto (2016-05-25) 1 commit

177 + - format_commit_message: honor `color=auto` for `%C(auto)`

178 +

179 + Expecting a reroll.

180 + ($gmane/295601)

181 +

182 +

183 +* ew/daemon-socket-keepalive (2016-05-25) 1 commit

184 + - daemon: enable SO_KEEPALIVE for all sockets

185 +

186 + When "git daemon" is run without --[init-]timeout specified, a

187 + connection from a client that silently goes offline can hang around

188 + for a long time, wasting resources. The socket-level KEEPALIVE has

189 + been enabled to allow the OS to notice such failed connections.

190

191 Will merge to 'next'.

192

193

52 -* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit

53 - - pull: warn on --verify-signatures with --rebase

194 +* jk/upload-pack-hook (2016-05-24) 6 commits

195 + - upload-pack: provide a hook for running pack-objects

196 + - config: add a notion of "scope"

197 + - config: return configset value for current_config_ functions

198 + - config: set up config_source for command-line config

199 + - git_config_parse_parameter: refactor cleanup code

200 + - git_config_with_options: drop "found" counting

201

55 - "git pull --rebase --verify-signature" learned to warn the user

56 - that "--verify-signature" is a no-op.

202 + Allow a custom "git upload-pack" replacement to respond to

203 + "fetch/clone" request.

204

205 Will merge to 'next'.

206

207

61 -* ak/t0008-ksh88-workaround (2016-05-20) 1 commit

62 - - t0008: 4 tests fail with ksh88

208 +* kb/msys2-tty (2016-05-26) 1 commit

209 + - mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)

210

64 - Test portability workaround.

211 + The "are we talking with TTY, doing an interactive session?"

212 + detection has been updated to work better for "Git for Windows".

213 +

214 +

215 +* rs/xdiff-hunk-with-func-line (2016-05-26) 5 commits

216 + - grep: don't extend context to trailing empty lines with -W

217 + - xdiff: don't include common trailing empty lines with -W

218 + - xdiff: ignore empty lines before added functions with -W

219 + - xdiff: handle appended chunks better with -W

220 + - xdiff: factor out match_func_rec()

221 +

222 + "git show -W" (extend hunks to cover the entire function, delimited

223 + by lines that match the "funcname" pattern) used to show the entire

224 + file when a change added an entire function at the end of the file,

225 + which has been fixed.

226 +

227 +

228 +* sb/submodule-misc-cleanups (2016-05-25) 1 commit

229 + - submodule update: make use of the existing fetch_in_submodule function

230 +

231 + Minor simplification.

232

233 Will merge to 'next'.

234

235 +

236 +* sb/submodule-default-paths (2016-05-26) 7 commits

237 + - clone: add --init-submodule=<pathspec> switch

238 + - submodule update: add `--init-default-path` switch

239 + - Merge branch 'sb/pathspec-label' into sb/submodule-default-paths

240 + - Merge branch 'jc/attr' into sb/submodule-default-paths

241 + - Merge branch 'sb/clone-shallow-passthru' into sb/submodule-default-paths

242 + - Merge branch 'sb/submodule-deinit-all' into sb/submodule-default-paths

243 + - Merge branch 'sb/submodule-parallel-update' into sb/submodule-default-paths

244 + (this branch uses jc/attr and sb/pathspec-label.)

245 +

246 --------------------------------------------------

247 [Stalled]

248

71 -

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

250 - SQUASH???

251 - bisect: get back halfway shortcut

@@ -284,28 +461,48 @@ of the repositories listed at

461 --------------------------------------------------

462 [Cooking]

463

287 -* ep/http-curl-trace (2016-05-20) 2 commits

288 - . imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

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

464 +* jk/cat-file-buffered-batch-all (2016-05-18) 2 commits

465 + (merged to 'next' on 2016-05-26 at 4da062d)

466 + + cat-file: default to --buffer when --batch-all-objects is used

467 + + cat-file: avoid noop calls to sha1_object_info_extended

468

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

292 - trace.

469 + "git cat-file --batch-all" has been sped up, by taking advantage

470 + of the fact that it does not have to read a list of objects, in two

471 + ways.

472

294 - Rerolled.

473 + Will merge to 'master'.

474

475

297 -* da/difftool (2016-05-16) 2 commits

298 - (merged to 'next' on 2016-05-17 at ef5a435)

299 - + difftool: handle unmerged files in dir-diff mode

300 - + difftool: initialize variables for readability

476 +* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit

477 + - pull: warn on --verify-signatures with --rebase

478

302 - "git difftool" learned to handle unmerged paths correctly in

303 - dir-diff mode.

479 + "git pull --rebase --verify-signature" learned to warn the user

480 + that "--verify-signature" is a no-op.

481 +

482 + Will merge to 'next'.

483 +

484 +

485 +* ak/t0008-ksh88-workaround (2016-05-20) 1 commit

486 + (merged to 'next' on 2016-05-26 at 9a34a2a)

487 + + t0008: 4 tests fail with ksh88

488 +

489 + Test portability workaround.

490

491 Will merge to 'master'.

492

493

308 -* jc/attr (2016-05-18) 16 commits

494 +* ep/http-curl-trace (2016-05-24) 2 commits

495 + - imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

496 + - http.c: implement the GIT_TRACE_CURL environment variable

497 +

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

499 + trace.

500 +

501 + Rerolled.

502 +

503 +

504 +* jc/attr (2016-05-25) 18 commits

505 + - attr: support quoting pathname patterns in C style

506 - attr: expose validity check for attribute names

507 - attr: add counted string version of git_attr()

508 - attr: add counted string version of git_check_attr()

@@ -314,6 +511,7 @@ of the repositories listed at

511 - attr: convert git_all_attrs() to use "struct git_attr_check"

512 - attr: (re)introduce git_check_attr() and struct git_attr_check

513 - attr: rename function and struct related to checking attributes

514 + - attr.c: plug small leak in parse_attr_line()

515 - attr.c: tighten constness around "git_attr" structure

516 - attr.c: simplify macroexpand_one()

517 - attr.c: mark where #if DEBUG ends more clearly

@@ -322,7 +520,7 @@ of the repositories listed at

520 - attr.c: update a stale comment on "struct match_attr"

521 - attr.c: use strchrnul() to scan for one line

522 - commit.c: use strchrnul() to scan for one line

325 - (this branch is used by sb/pathspec-label.)

523 + (this branch is used by sb/pathspec-label and sb/submodule-default-paths.)

524

525 The attributes API has been updated so that it can later be

526 optimized using the knowledge of which attributes are queried.

@@ -332,34 +530,27 @@ of the repositories listed at

530

531

532 * fc/fast-import-broken-marks-file (2016-05-17) 1 commit

335 - - fast-import: do not truncate exported marks file

533 + (merged to 'next' on 2016-05-26 at 9962fcf)

534 + + fast-import: do not truncate exported marks file

535

536 "git fast-import --export-marks" would overwrite the existing marks

537 file even when it makes a dump from its custom die routine.

538 Prevent it from doing so when we have an import-marks file but

539 haven't finished reading it.

540

342 - Will merge to 'next'.

541 + Will merge to 'master'.

542

543

544 * es/t1500-modernize (2016-05-18) 5 commits

346 - - t1500: avoid setting environment variables outside of tests

347 - - t1500: avoid setting configuration options outside of tests

348 - - t1500: avoid changing working directory outside of tests

349 - - t1500: test_rev_parse: facilitate future test enhancements

350 - - t1500: be considerate to future potential tests

545 + (merged to 'next' on 2016-05-26 at 274e39c)

546 + + t1500: avoid setting environment variables outside of tests

547 + + t1500: avoid setting configuration options outside of tests

548 + + t1500: avoid changing working directory outside of tests

549 + + t1500: test_rev_parse: facilitate future test enhancements

550 + + t1500: be considerate to future potential tests

551

552 test updates to make it more readable and maintainable.

553

354 - Will merge to 'next'.

355 -

356 -

357 -* jc/rerere-multi (2016-05-19) 2 commits

358 - (merged to 'next' on 2016-05-19 at 0520c90)

359 - + rerere: remove an null statement

360 - (merged to 'next' on 2016-05-13 at f4d1d82)

361 - + rerere: plug memory leaks upon "rerere forget" failure

362 -

554 Will merge to 'master'.

555

556

@@ -424,28 +615,10 @@ of the repositories listed at

615 review the above first and give the remainder of the series a solid

616 base to build on.

617

427 - Will be rerolled.

428 -

429 -

430 -* jk/test-z-n-unquoted (2016-05-14) 6 commits

431 - (merged to 'next' on 2016-05-17 at 65372cf)

432 - + always quote shell arguments to test -z/-n

433 - + t9103: modernize test style

434 - + t9107: switch inverted single/double quotes in test

435 - + t9107: use "return 1" instead of "exit 1"

436 - + t9100,t3419: enclose all test code in single-quotes

437 - + t/lib-git-svn: drop $remote_git_svn and $git_svn_id

438 -

439 - t9xxx series has been updated primarily for readability, while

440 - fixing small bugs in it. A few scripted Porcelains have also been

441 - updated to fix possible bugs around their use of "test -z" and

442 - "test -n".

443 -

444 - Will merge to 'master'.

618 + Reroll exists, but hasn't seen any review yet ($gmane/295429).

619

620

447 -* pb/bisect (2016-05-13) 4 commits

448 - - t6030: explicitly test for bisection cleanup

621 +* pb/bisect (2016-05-24) 3 commits

622 - bisect--helper: `write_terms` shell function in C

623 - bisect: rewrite `check_term_format` shell function in C

624 - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

@@ -453,12 +626,12 @@ of the repositories listed at

626 Beginning of GSoC "git bisect" project.

627

628

456 -* sb/pathspec-label (2016-05-20) 4 commits

629 +* sb/pathspec-label (2016-05-25) 4 commits

630 - pathspec: allow querying for attributes

631 - pathspec: move prefix check out of the inner loop

632 - pathspec: move long magic parsing out of prefix_pathspec

633 - Documentation: fix a typo

461 - (this branch uses jc/attr.)

634 + (this branch is used by sb/submodule-default-paths; uses jc/attr.)

635

636 The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic

637 to limit paths that match $pattern further by attribute settings.

@@ -466,38 +639,13 @@ of the repositories listed at

639 Will merge to 'next'.

640

641

469 -* ar/diff-args-osx-precompose (2016-05-13) 1 commit

470 - (merged to 'next' on 2016-05-17 at 7b59b79)

471 - + diff: run arguments through precompose_argv

472 -

473 - Many commands normalize command line arguments from NFD to NFC

474 - variant of UTF-8 on OSX, but commands in the "diff" family did

475 - not, causing "git diff $path" to complain that no such path is

476 - known to Git. They have been taught to do the normalization.

477 -

478 - Will merge to 'master'.

479 -

480 -

481 -* js/perf-rebase-i (2016-05-13) 3 commits

482 - (merged to 'next' on 2016-05-13 at eb51ddd)

483 - + perf: run "rebase -i" under perf

484 - + perf: make the tests work in worktrees

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

486 -

487 - Add perf test for "rebase -i"

488 -

489 - Will merge to 'master'.

490 -

491 -

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

642 +* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits

643 - worktree: simplify prefixing paths

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

495 - - worktree.c: add clear_worktree()

645 - worktree.c: use is_dot_or_dotdot()

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

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

648 - completion: support git-worktree

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

649

650 Further preparatory clean-up for "worktree" feature.

651

@@ -505,63 +653,6 @@ of the repositories listed at

653 ($gmane/294136, etc.)

654

655

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

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

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

511 -

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

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

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

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

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

517 - result.

518 -

519 - Will merge to 'master'.

520 -

521 -

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

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

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

525 - + t0027: test cases for combined attributes

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

527 - + t0027: make commit_chk_wrnNNO() reliable

528 - (this branch is used by tb/convert-peek-in-index.)

529 -

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

531 -

532 - Will merge to 'master'.

533 -

534 -

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

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

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

538 - + t0040: remove unused test helpers

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

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

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

542 -

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

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

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

546 -

547 - Will merge to 'master'.

548 -

549 -

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

551 - (merged to 'next' on 2016-05-17 at 9032aa5)

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

553 -

554 - Find common mistakes when writing gitlink: in our documentation and

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

556 -

557 - I am not entirely happy with the way the script chooses what input

558 - file to validate, but it is not worse than not having anything, so

559 - let's move it forward and have the logic improved later when people

560 - care about it deeply.

561 -

562 - Will merge to 'master'.

563 -

564 -

656 * mh/split-under-lock (2016-05-13) 33 commits

657 - lock_ref_sha1_basic(): only handle REF_NODEREF mode

658 - commit_ref_update(): remove the flags parameter

@@ -626,47 +717,6 @@ of the repositories listed at

717 Will hold.

718

719

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

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

631 - + branch: do not rename a branch under bisect or rebase

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

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

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

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

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

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

638 - + path.c: refactor and add worktree_git_path()

639 - + worktree.c: mark current worktree

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

641 - + worktree.c: store "id" instead of "git_dir"

642 - + path.c: add git_common_path() and strbuf_git_common_path()

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

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

645 -

646 - The experimental "multiple worktree" feature gains more safety to

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

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

649 -

650 - Will merge to 'master'.

651 -

652 -

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

654 - + commit: add a commit.verbose config variable

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

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

657 - + t/t7507: improve test coverage

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

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

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

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

662 -

663 - "git commit" learned to pay attention to "commit.verbose"

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

665 - given from the command line.

666 -

667 - Will merge to 'master'.

668 -

669 -

720 * jc/send-email-skip-backup (2016-04-12) 1 commit

721 - send-email: detect and offer to skip backup files

722

@@ -705,20 +755,6 @@ of the repositories listed at

755 Needs review.

756

757

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

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

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

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

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

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

714 -

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

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

717 - its output.

718 -

719 - Will merge to 'master'.

720 -

721 -

758 * dt/index-helper (2016-05-20) 20 commits

759 - index-helper: indexhelper.exitafter config

760 - trace: measure where the time is spent in the index-heavy operations

What's cooking (2016/05 #08)