e55b374fb4 · 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, #06; Tue, 17)

4 -X-master-at: 1f66975deb8402131fbf7c14330d0c7cdebaeaa2

5 -X-next-at: 927f4258f48da33cf64d9a9f47fd3a0ac725a748

3 +Subject: What's cooking in git.git (May 2016, #07; Fri, 20)

4 +X-master-at: 3916adf9978b020f9a9b165f4c1c109046899560

5 +X-next-at: 0520c90a3eb69be4dcb02396166432df2ae280e5

6

7 -What's cooking in git.git (May 2016, #06; Tue, 17)

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

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

9

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

@@ -12,10 +12,11 @@ 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 390 non-merge commits in this cycle. On

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

17 -accumulates on it for 2.8.3, which probably should be tagged sometime

18 -late this week.

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

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

22 of the repositories listed at

@@ -25,373 +26,47 @@ of the repositories listed at

26 --------------------------------------------------

27 [Graduated to "master"]

28

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

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

30 - + hooks: allow customizing where the hook directory is

31 - + githooks.txt: minor improvements to the grammar & phrasing

32 - + githooks.txt: amend dangerous advice about 'update' hook ACL

33 - + githooks.txt: improve the intro section

34 -

35 - A new configuration variable core.hooksPath allows customizing

36 - where the hook directory is.

37 -

38 -

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

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

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

42 -

43 - Test fix.

44 -

45 -

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

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

48 - + config: consistently format $variables in monospaced font

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

50 -

51 - Doc formatting fixes.

52 -

53 -

54 -* bn/http-cookiefile-config (2016-05-04) 2 commits

55 - (merged to 'next' on 2016-05-09 at d519b13)

56 - + http: expand http.cookieFile as a path

57 - + Documentation: config: improve word ordering for http.cookieFile

58 -

59 - "http.cookieFile" configuration variable clearly wants a pathname,

60 - but we forgot to treat it as such by e.g. applying tilde expansion.

61 -

62 -

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

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

65 - + t6302: simplify non-gpg cases

66 -

67 - Test fix.

68 -

69 -

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

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

72 - + config: describe 'pathname' value type

73 - (this branch is used by bn/config-doc-tt-varnames.)

74 -

75 - Consolidate description of tilde-expansion that is done to

76 - configuration variables that take pathname to a single place.

77 -

78 -

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

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

81 - + fsck: detect and warn a commit with embedded NUL

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

83 -

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

85 - potential error and warn.

86 -

87 -

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

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

90 - + Documentation: fix linkgit references

91 -

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

93 - which are all fixed with this.

94 -

95 -

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

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

98 - + t6036: remove pointless test that expects failure

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

100 - + ll-merge: fix typo in comment

101 -

102 - "git rerere" can get confused by conflict markers deliberately left

103 - by the inner merge step, because they are indistinguishable from

104 - the real conflict markers left by the outermost merge which are

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

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

107 -

108 -

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

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

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

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

113 -

114 - Test fix.

115 -

116 -

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

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

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

120 -

121 - Portability enhancement for "rebase -i" to help platforms whose

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

123 -

124 -

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

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

127 - + submodule: stop sanitizing config options

128 - + submodule: use prepare_submodule_repo_env consistently

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

130 - + submodule: export sanitized GIT_CONFIG_PARAMETERS

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

132 - + t5550: fix typo in $HTTPD_URL

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

134 -

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

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

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

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

139 -

140 -

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

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

143 - + test-lib: set BASH_XTRACEFD automatically

144 -

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

146 - executions is a useful way to debug test scripts, but some tests

147 - that capture the standard error stream and check what the command

148 - said can be broken with the trace output mixed in. When running

149 - our tests under "bash", however, we can redirect the trace output

150 - to another file descriptor to keep the standard error of programs

151 - being tested intact.

152 -

153 -

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

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

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

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

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

159 - + tests: adjust the configuration for Apache 2.2

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

161 -

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

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

164 - more recent feature).

165 -

166 -

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

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

169 - + t3404: fix typo

170 -

171 - Test fix.

172 -

173 -

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

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

176 - + mingw: remove unnecessary definition

177 - + mingw: introduce the 'core.hideDotFiles' setting

178 -

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

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

181 - customize this behaviour.

182 -

183 -

184 -* kf/gpg-sig-verification-doc (2016-05-13) 1 commit

185 - (merged to 'next' on 2016-05-13 at 2cec353)

186 - + Documentation: clarify signature verification

187 -

188 - Documentation for "git merge --verify-signatures" has been updated

189 - to clarify that the signature of only the commit at the tip is

190 - verified. Also the phrasing used for signature and key validity is

191 - adjusted to align with that used by OpenPGP.

192 -

193 -

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

195 - (merged to 'next' on 2016-05-09 at 59683be)

196 - + typofix: assorted typofixes in comments, documentation and messages

197 -

198 - Typofixes.

199 -

200 -

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

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

203 - + travis-ci: build documentation

204 -

205 - CI test was taught to build documentation pages.

206 -

207 -

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

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

210 - + wrapper.c: use warning_errno()

211 - + vcs-svn: use error_errno()

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

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

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

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

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

217 - + sequencer.c: use error_errno()

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

219 - + rerere.c: use error_errno() and warning_errno()

220 - + reachable.c: use error_errno()

221 - + mailmap.c: use error_errno()

222 - + ident.c: use warning_errno()

223 - + http.c: use error_errno() and warning_errno()

224 - + grep.c: use error_errno()

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

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

227 - + entry.c: use error_errno()

228 - + editor.c: use error_errno()

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

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

231 - + copy.c: use error_errno()

232 - + connected.c: use error_errno()

233 - + config.c: use error_errno()

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

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

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

237 - + builtin/worktree.c: use error_errno()

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

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

240 - + builtin/rm.c: use warning_errno()

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

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

243 - + builtin/mailsplit.c: use error_errno()

244 - + builtin/help.c: use warning_errno()

245 - + builtin/fetch.c: use error_errno()

246 - + builtin/branch.c: use error_errno()

247 - + builtin/am.c: use error_errno()

248 - + bisect.c: use die_errno() and warning_errno()

249 - + usage.c: add warning_errno() and error_errno()

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

251 -

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

253 - error_errno() reporting helper is introduced.

254 -

255 -

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

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

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

259 -

260 - Message fix.

261 -

262 -

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

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

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

266 -

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

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

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

270 -

271 -

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

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

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

275 -

276 - Correct faulty recommendation to use "git submodule deinit ." when

277 - de-initialising all submodules, which would result in a strange

278 - error message in a pathological corner case.

279 -

280 -

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

282 - (merged to 'next' on 2016-05-03 at 8a5fce4)

283 - + submodule init: redirect stdout to stderr

284 - (merged to 'next' on 2016-04-29 at 3e81ee88)

285 - + submodule--helper update-clone: abort gracefully on missing .gitmodules

286 - + submodule init: fail gracefully with a missing .gitmodules file

287 - (merged to 'next' on 2016-04-27 at afaad81)

288 - + submodule: port init from shell to C

289 - + submodule: port resolve_relative_url from shell to C

290 - + Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init

291 - + Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init

292 -

293 - Update of "git submodule" to move pieces of logic to C continues.

294 -

295 -

296 -* sb/z-is-gnutar-ism (2016-05-09) 2 commits

297 - (merged to 'next' on 2016-05-09 at 51d527d)

298 - + t6041: do not compress backup tar file

299 - + t3513: do not compress backup tar file

300 -

301 - Test fix.

302 -

303 -

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

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

306 - + t5601: Remove trailing space in sed expression

307 -

308 - Test fix.

309 -

310 -

311 -* va/i18n-misc-updates (2016-05-12) 10 commits

312 - (merged to 'next' on 2016-05-13 at 0361b16)

313 - + i18n: unpack-trees: avoid substituting only a verb in sentences

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

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

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

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

318 - + i18n: branch: move comment for translators

319 - + i18n: branch: unmark string for translation

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

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

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

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

324 -

325 - Mark several messages for translation.

326 -

327 -

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

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

330 - + i18n: remote: add comment for translators

331 -

332 - Message fix.

333 -

334 -

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

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

337 - + Documentation/git-mailinfo: fix typo

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

34

339 - Typofix.

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

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

37

38 --------------------------------------------------

39 [New Topics]

40

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

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

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

347 - + difftool: initialize variables for readability

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

44

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

350 - dir-diff mode.

351 -

352 - Will merge to 'master'.

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.

48

49 + Will merge to 'next'.

50

355 -* jc/attr (2016-05-17) 14 commits

356 - - SQUASH???

357 - - attr: retire git_check_attrs() API

358 - - attr: convert git_check_attrs() callers to use the new API

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

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

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

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

363 - - attr.c: simplify macroexpand_one()

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

365 - - attr.c: complete a sentence in a comment

366 - - attr.c: explain the lack of attr-name syntax check in parse_attr()

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

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

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

51

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

372 - optimized using the knowledge of which attributes are queried.

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

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

54

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

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

57

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

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

58 + Will merge to 'next'.

59

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

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

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

381 - haven't finished reading it.

60

383 ---------------------------------------------------

384 -[Stalled]

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

62 + - t0008: 4 tests fail with ksh88

63

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

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

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

64 + Test portability workaround.

65

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

391 - trace.

66 + Will merge to 'next'.

67

393 - Expecting a reroll.

394 - ($gmane/292074, 293236)

68 +--------------------------------------------------

69 +[Stalled]

70

71

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

@@ -609,7 +284,65 @@ of the repositories listed at

284 --------------------------------------------------

285 [Cooking]

286

612 -* es/t1500-modernize (2016-05-17) 5 commits

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

290 +

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

292 + trace.

293 +

294 + Rerolled.

295 +

296 +

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

301 +

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

303 + dir-diff mode.

304 +

305 + Will merge to 'master'.

306 +

307 +

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

309 + - attr: expose validity check for attribute names

310 + - attr: add counted string version of git_attr()

311 + - attr: add counted string version of git_check_attr()

312 + - attr: retire git_check_attrs() API

313 + - attr: convert git_check_attrs() callers to use the new API

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

315 + - attr: (re)introduce git_check_attr() and struct git_attr_check

316 + - attr: rename function and struct related to checking attributes

317 + - attr.c: tighten constness around "git_attr" structure

318 + - attr.c: simplify macroexpand_one()

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

320 + - attr.c: complete a sentence in a comment

321 + - attr.c: explain the lack of attr-name syntax check in parse_attr()

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

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

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

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

326 +

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

328 + optimized using the knowledge of which attributes are queried.

329 +

330 + Let's merge the early "clean-up" half to 'next', after splitting it

331 + into a separate topic.

332 +

333 +

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

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

336 +

337 + "git fast-import --export-marks" would overwrite the existing marks

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

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

340 + haven't finished reading it.

341 +

342 + Will merge to 'next'.

343 +

344 +

345 +* 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

@@ -618,8 +351,12 @@ of the repositories listed at

351

352 test updates to make it more readable and maintainable.

353

354 + Will merge to 'next'.

355 +

356

622 -* jc/rerere-multi (2016-05-11) 1 commit

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

@@ -716,18 +453,17 @@ of the repositories listed at

453 Beginning of GSoC "git bisect" project.

454

455

719 -* sb/pathspec-label (2016-05-14) 5 commits

720 - . pathspec: record labels

721 - . pathspec: move prefix check out of the inner loop

722 - . pathspec: move long magic parsing out of prefix_pathspec

723 - . Documentation: correct typo in example for querying attributes

724 - . Documentation: fix a typo

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

457 + - pathspec: allow querying for attributes

458 + - pathspec: move prefix check out of the inner loop

459 + - pathspec: move long magic parsing out of prefix_pathspec

460 + - Documentation: fix a typo

461 + (this branch uses jc/attr.)

462

726 - The pathspec mechanism learned ":(label=X)$pattern" pathspec magic

727 - to limit paths that match $pattern further by labels defined by the

728 - attributes mechanism for the paths.

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

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

465

730 - (RFC/WIP)

466 + Will merge to 'next'.

467

468

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

@@ -789,6 +525,7 @@ of the repositories listed at

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

@@ -825,18 +562,6 @@ of the repositories listed at

562 Will merge to 'master'.

563

564

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

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

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

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

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

833 -

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

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

836 -

837 - Will merge to 'master'.

838 -

839 -

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

566 - lock_ref_sha1_basic(): only handle REF_NODEREF mode

567 - commit_ref_update(): remove the flags parameter

@@ -888,7 +613,9 @@ of the repositories listed at

613 Will discard.

614

615

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

616 +* ew/fast-import-unpack-limit (2016-05-19) 2 commits

617 + (merged to 'next' on 2016-05-19 at 50137c5)

618 + + (DO NOT MERGE YET) fast-import: discard object-table after closing a pack

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

620 + fast-import: implement unpack limit

621

@@ -896,7 +623,7 @@ of the repositories listed at

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

624 using *.unpackLimit configuration.

625

899 - Will merge to 'master'.

626 + Will hold.

627

628

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

@@ -992,8 +719,8 @@ of the repositories listed at

719 Will merge to 'master'.

720

721

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

996 - - untracked-cache: config option

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

723 + - index-helper: indexhelper.exitafter config

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

725 - index-helper: optionally automatically run

726 - index-helper: autorun mode

@@ -1019,8 +746,8 @@ of the repositories listed at

746 optionally interface with the watchman daemon to further reduce the

747 refresh cost.

748

1022 - Under review.

1023 - ($gmane/294470).

749 + Rerolled.

750 + ($gmane/295106).

751

752

753 * jc/bundle (2016-03-03) 6 commits

What's cooking (2016/05 #07)