1127c1b47e · matheusbsbs/matheus-bagliano

@@ -1,19 +1,21 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2015, #01; Tue, 1)

4 -X-master-at: fd13a2ecfbda734a54e22695e0219e89682bdd22

5 -X-next-at: a22bf4777ab14f7322ba61781952635899ef89e7

3 +Subject: What's cooking in git.git (Dec 2015, #02; Fri, 4)

4 +X-master-at: e5da8655b23737a8449868e1d99973a8d0e25fe3

5 +X-next-at: 362d2fc2f8ab9ee22072f76fb36ec16918511944

6

7 -What's cooking in git.git (Dec 2015, #01; Tue, 1)

7 +What's cooking in git.git (Dec 2015, #02; Fri, 4)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -This should by my final whats-cooking before handing things back to

15 -Junio. Thanks all for review help and for your patience during the past

16 -few weeks.

14 +A big thank-you to Peff for managing the list traffic during my

15 +absence for the past few weeks. I think my tree is now back in

16 +shape and I started merging a handful of topics to 'next' and

17 +'master'. What's in 'master' plus just a few trivial topics in

18 +'next' should be pretty much "it" for the upcoming release.

19

20 You can find the normal integration branches at:

21

@@ -25,294 +27,97 @@ and all topic branches at:

27

28 But note that I will _not_ be pushing to kernel.org.

29

28 ---------------------------------------------------

29 -[New Topics]

30 -

31 -* bc/object-id (2015-11-20) 12 commits

32 - - remote: convert functions to struct object_id

33 - - Remove get_object_hash.

34 - - Convert struct object to object_id

35 - - Add several uses of get_object_hash.

36 - - object: introduce get_object_hash macro.

37 - - ref_newer: convert to use struct object_id

38 - - push_refs_with_export: convert to struct object_id

39 - - get_remote_heads: convert to struct object_id

40 - - parse_fetch: convert to use struct object_id

41 - - add_sought_entry_mem: convert to struct object_id

42 - - Convert struct ref to use object_id.

43 - - sha1_file: introduce has_object_file helper.

44 -

45 - More transition from "unsigned char[40]" to "struct object_id".

46 -

47 - This needed a few merge fixups, but is mostly disentangled from other

48 - topics.

49 -

50 - Will merge to 'next'.

51 -

52 -

53 -* dt/fsck-verify-pack-error (2015-12-01) 1 commit

54 - - verify_pack: do not ignore return value of verification function

55 -

56 - The exit code of git-fsck would not reflect some types of errors found

57 - in packed objects.

58 -

59 - Will merge to 'next'.

60 -

61 -

62 -* kn/ref-filter-atom-parsing (2015-12-01) 10 commits

63 - - ref-filter: introduce objectname_atom_parser()

64 - - ref-filter: introduce contents_atom_parser()

65 - - ref-filter: introduce remote_ref_atom_parser()

66 - - ref-filter: introduce align_atom_parser()

67 - - strbuf: introduce strbuf_split_str_without_term()

68 - - ref-filter: introduce color_atom_parser()

69 - - ref-filter: skip deref specifier in match_atom_name()

70 - - ref-fitler: bump match_atom() name to the top

71 - - ref-filter: introduce struct used_atom

72 - - ref-filter: introduce a parsing function for each atom in valid_atom

73 -

74 - Refactoring of ref-filter's format-parsing code, in preparation

75 - for "branch --format" and friends.

76 -

77 - This replaces (for now) kn/for-each-ref-remainder, which will be built

78 - on top.

79 -

80 - Waiting for review.

81 -

82 -

83 -* ls/travis-yaml (2015-11-28) 1 commit

84 - - Add Travis CI support

85 -

86 - Provides the necessary infrastructure to build topics using the free

87 - Travis CI. Developers forking from this topic (and enabling Travis) can

88 - do their own builds, and we can turn on auto-builds for git/git

89 - (including build-status for pull requests that people open).

90 -

91 - I'm inclined to merge this up, as the worst case is that it becomes

92 - dormant cruft in the repository root.

93 -

94 - Will merge to 'next'.

95 -

96 -

97 -* rs/status-detached-head-memcmp (2015-11-28) 1 commit

98 - - wt-status: correct and simplify check for detached HEAD

99 -

100 - Fix some string-matching corner cases when digging in the reflog for

101 - "git status".

102 -

103 - Will merge to 'next', then 'maint'.

104 -

105 -

106 -* sg/lock-file-commit-error (2015-12-01) 1 commit

107 - - Make error message after failing commit_lock_file() less confusing

108 -

109 - Cosmetic improvement to lock-file error messages.

110 -

111 - Comments on the new messages?

112 -

113 - Will merge to 'next' after giving time for bikeshedding.

114 -

115 -

30 --------------------------------------------------

31 [Graduated to "master"]

32

119 -* ar/doc-env-variable-format (2015-11-11) 1 commit

120 - (merged to 'next' on 2015-11-24 at 5ddf33e)

121 - + Documentation: make environment variable formatting more consistent

122 -

123 - Minor documentation fixup.

124 -

125 - Will merge to 'master'.

126 -

127 -

128 -* cb/hook-sigpipe (2015-11-16) 1 commit

129 - (merged to 'next' on 2015-11-24 at 0bf4228)

130 - + allow hooks to ignore their standard input stream

131 -

132 - We now consistently allow all hooks to ignore their standard input,

133 - rather than having git complain of SIGPIPE.

134 -

135 - Will merge to 'master'.

136 -

137 -

138 -* cb/ssl-config-pathnames (2015-11-24) 1 commit

139 - (merged to 'next' on 2015-11-24 at 658a9c9)

140 - + http: treat config options sslCAPath and sslCAInfo as paths

141 -

142 - Allow tilde-expansion in some http config variables.

143 -

144 - Will merge to 'master'.

145 -

146 -

147 -* dg/subtree-test-cleanup (2015-11-13) 7 commits

148 - (merged to 'next' on 2015-11-24 at 1297941)

149 - + contrib/subtree: Handle '--prefix' argument with a slash appended

150 - + contrib/subtree: Make each test self-contained

151 - + contrib/subtree: Add split tests

152 - + contrib/subtree: Add merge tests

153 - + contrib/subtree: Add tests for subtree add

154 - + contrib/subtree: Add test for missing subtree

155 - + contrib/subtree: Clean and refactor test code

156 -

157 - Test cleanups for the subtree project.

158 -

159 - Will merge to 'master'.

160 -

161 -

162 -* dk/check-ignore-docs (2015-11-24) 1 commit

163 - (merged to 'next' on 2015-11-24 at 0cce5c5)

164 - + check-ignore: correct documentation about output

165 -

166 - Documentation clarification for "check-ignore" without "--verbose".

167 -

168 - Will merge to 'master'.

169 -

170 -

171 -* dk/rerere-train-quoting (2015-11-20) 1 commit

172 - (merged to 'next' on 2015-11-24 at f9fa96e)

173 - + Escape Git's exec path in contrib/rerere-train.sh script

174 -

175 - Fix shell quoting in contrib script.

176 -

177 - Will merge to 'master'.

178 -

179 -

180 -* dk/t5813-unc-paths (2015-11-20) 1 commit

181 - (merged to 'next' on 2015-11-24 at 204e4a8)

182 - + t5813: avoid creating urls that break on cygwin

183 -

184 - Test portability fix for a topic in v2.6.1.

185 -

186 - Will merge to 'master'.

187 -

188 -

189 -* dt/http-range (2015-11-11) 1 commit

190 - (merged to 'next' on 2015-11-24 at d342999)

191 - + http: fix some printf format warnings

192 -

193 - Portability fix for a topic already in 'master'.

194 -

195 - Will merge to 'master'.

196 -

197 -

198 -* eg/p4-submit-catch-failure (2015-11-24) 1 commit

199 - (merged to 'next' on 2015-11-24 at cf2dc76)

200 - + git-p4: clean up after p4 submit failure

201 -

202 - Just like the working tree is cleaned up when the user cancelled

203 - submission in P4Submit.applyCommit(), clean up the mess if "p4

204 - submit" fails.

205 -

206 - Will merge to 'master'.

207 -

208 -

209 -* fm/shell-path-whitespace (2015-11-13) 1 commit

210 - (merged to 'next' on 2015-11-24 at c2b8bdf)

211 - + rebase-i-exec: Allow space in SHELL_PATH

212 -

213 - Portability fix for Windows, which may rewrite $SHELL variable using

214 - non-POSIX paths.

215 -

216 - Will merge to 'master'.

217 -

218 -

219 -* jk/send-email-ca-path (2015-11-24) 1 commit

220 - (merged to 'next' on 2015-11-24 at 923b803)

221 - + send-email: die if CA path doesn't exist

222 -

223 - Use a safer behavior when we hit errors verifying remote certificates.

224 -

225 - Will merge to 'master'.

226 -

227 -

228 -* jk/send-email-expand-paths (2015-11-20) 1 commit

229 - (merged to 'next' on 2015-11-24 at d32fa4d)

230 - + send-email: expand path in sendemail.smtpsslcertpath config

231 -

232 - Expand paths in some send-email config variables.

233 -

234 - Will merge to 'master'.

235 -

33 +* ad/sha1-update-chunked (2015-11-05) 2 commits

34 + (merged to 'next' on 2015-12-01 at a22bf47)

35 + + sha1: allow limiting the size of the data passed to SHA1_Update()

36 + + sha1: provide another level of indirection for the SHA-1 functions

37

237 -* js/test-modernize-t9300 (2015-11-20) 7 commits

238 - (merged to 'next' on 2015-11-24 at d399494)

239 - + modernize t9300: move test preparations into test_expect_success

240 - + modernize t9300: mark here-doc words to ignore tab indentation

241 - + modernize t9300: use test_when_finished for clean-up

242 - + modernize t9300: wrap lines after &&

243 - + modernize t9300: use test_must_be_empty

244 - + modernize t9300: use test_must_fail

245 - + modernize t9300: single-quote placement and indentation

38 + Apple's common crypto implementation of SHA1_Update() does not take

39 + more than 4GB at a time, and we now have a compile-time workaround

40 + for it.

41

247 - Clean up style in an ancient test.

248 -

249 - Will merge to 'master'.

42

43 +* jk/filter-branch-no-index (2015-11-06) 1 commit

44 + (merged to 'next' on 2015-11-24 at e31946e)

45 + + filter-branch: skip index read/write when possible

46

252 -* ld/p4-detached-head (2015-11-24) 3 commits

253 - (merged to 'next' on 2015-11-24 at 36ab36a)

254 - + git-p4: work with a detached head

255 - + git-p4: add option to system() to return subshell status

256 - + git-p4: add failing test for submit from detached head

47 + Speed up filter-branch for cases where we only care about rewriting

48 + commits, not tree data.

49

258 - Make git-p4 work on a detached head.

50

260 - Will merge to 'master'.

51 +* jk/send-email-complete-aliases (2015-11-20) 2 commits

52 + (merged to 'next' on 2015-11-24 at a50094f)

53 + + completion: add support for completing email aliases

54 + + sendemail: teach git-send-email to dump alias names

55

56 + Teach send-email to dump mail aliases, so that we can do tab completion

57 + on the command line.

58

263 -* ls/p4-test-timeouts (2015-11-20) 3 commits

264 - (merged to 'next' on 2015-11-24 at 905cff8)

265 - + git-p4: add trap to kill p4d on test exit

266 - + git-p4: add p4d timeout in tests

267 - + git-p4: retry kill/cleanup operations in tests with timeout

59

269 - Work around some test flakiness with p4d.

60 +* np/credential-cache-sighup (2015-11-20) 1 commit

61 + (merged to 'next' on 2015-11-24 at 410167f)

62 + + credential-cache: new option to ignore sighup

63

271 - Will merge to 'master'.

64 + Workaround for using credential-cache with emacs.

65

66

274 -* mg/doc-word-diff-example (2015-11-24) 1 commit

275 - (merged to 'next' on 2015-11-24 at 5ba28db)

276 - + Documentation/diff: give --word-diff-regex=. example

67 +* rs/parseopt-short-help (2015-11-20) 5 commits

68 + (merged to 'next' on 2015-11-24 at f22b6e0)

69 + + show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP

70 + + grep: stop using PARSE_OPT_NO_INTERNAL_HELP

71 + + parse-options: allow -h as a short option

72 + + parse-options: inline parse_options_usage() at its only remaining caller

73 + + parse-options: deduplicate parse_options_usage() calls

74

278 - Will merge to 'master'.

75 + Make "-h" command line option work more consistently in all commands.

76

77

281 -* mk/blame-first-parent (2015-11-24) 1 commit

282 - (merged to 'next' on 2015-11-24 at a2ee2a4)

283 - + blame: fix object casting regression

78 +* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits

79 + (merged to 'next' on 2015-11-24 at ac6eb1c)

80 + + bash prompt: indicate dirty index even on orphan branches

81 + + bash prompt: remove a redundant 'git diff' option

82 + + bash prompt: test dirty index and worktree while on an orphan branch

83

285 - Regression fix for a topic already in master.

84 + Produce correct "dirty" marker for shell prompts, even when we

85 + are on an orphan or an unborn branch.

86

287 - Will merge to 'master'.

87 +--------------------------------------------------

88 +[New Topics]

89

90 +* cb/t3404-shellquote (2015-12-04) 1 commit

91 + - t3404: fix quoting of redirect for some versions of bash

92

290 -* pt/http-socks-proxy (2015-11-20) 1 commit

291 - (merged to 'next' on 2015-11-20 at dc6ae48)

292 - + remote-http(s): support SOCKS proxies

93 + Will merge to 'next'.

94

294 - Add support for talking http/https over socks proxy.

95

296 - Will merge to 'master'.

96 +* nd/clear-gitenv-upon-use-of-alias (2015-12-04) 2 commits

97 + - setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..

98 + - git.c: make it clear save_env() is for alias handling only

99

100 + d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like

101 + $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias

102 + handling by overwriting GIT_WORK_TREE environment variable to

103 + affect subprocesses when set_git_work_tree() gets called, which

104 + resulted in a rather unpleasant regression to "clone" and "init".

105 + Try to address the same issue by always restoring the environment

106 + and respawning the real underlying command when handling alias.

107

299 -* rs/fsck-nul-header (2015-11-20) 2 commits

300 - (merged to 'next' on 2015-11-24 at 093b3d6)

301 - + fsck: treat a NUL in a tag header as an error

302 - + t1450: add tests for NUL in headers of commits and tags

108 + Waiting for review.

109

304 - Fsck did not correctly detect a NUL-truncated header in a tag.

110

306 - Will merge to 'master'.

111 +* nd/doc-check-ref-format-typo (2015-12-04) 1 commit

112 + - git-check-ref-format.txt: typo, s/avoids/avoid/

113

114 + Will merge to 'next'.

115

309 -* sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit

310 - (merged to 'next' on 2015-11-24 at fe596a6)

311 - + filter-branch: deal with object name vs. pathname ambiguity in tree-filter

116

313 - Fix for a corner case in filter-branch.

117 +* sb/doc-submodule-sync-recursive (2015-12-04) 1 commit

118 + - document submodule sync --recursive

119

315 - Will merge to 'master'.

120 + Will merge to 'next'.

121

122 --------------------------------------------------

123 [Stalled]

@@ -381,12 +186,102 @@ But note that I will _not_ be pushing to kernel.org.

186 --------------------------------------------------

187 [Cooking]

188

189 +* bc/object-id (2015-11-20) 12 commits

190 + (merged to 'next' on 2015-12-04 at 2d3f5f2)

191 + + remote: convert functions to struct object_id

192 + + Remove get_object_hash.

193 + + Convert struct object to object_id

194 + + Add several uses of get_object_hash.

195 + + object: introduce get_object_hash macro.

196 + + ref_newer: convert to use struct object_id

197 + + push_refs_with_export: convert to struct object_id

198 + + get_remote_heads: convert to struct object_id

199 + + parse_fetch: convert to use struct object_id

200 + + add_sought_entry_mem: convert to struct object_id

201 + + Convert struct ref to use object_id.

202 + + sha1_file: introduce has_object_file helper.

203 +

204 + More transition from "unsigned char[40]" to "struct object_id".

205 +

206 + This needed a few merge fixups, but is mostly disentangled from other

207 + topics.

208 +

209 + Will merge to 'master'.

210 +

211 +

212 +* dt/fsck-verify-pack-error (2015-12-01) 1 commit

213 + (merged to 'next' on 2015-12-04 at fbd82d1)

214 + + verify_pack: do not ignore return value of verification function

215 +

216 + The exit code of git-fsck would not reflect some types of errors found

217 + in packed objects.

218 +

219 + Will merge to 'master'.

220 +

221 +

222 +* kn/ref-filter-atom-parsing (2015-12-01) 10 commits

223 + - ref-filter: introduce objectname_atom_parser()

224 + - ref-filter: introduce contents_atom_parser()

225 + - ref-filter: introduce remote_ref_atom_parser()

226 + - ref-filter: introduce align_atom_parser()

227 + - strbuf: introduce strbuf_split_str_without_term()

228 + - ref-filter: introduce color_atom_parser()

229 + - ref-filter: skip deref specifier in match_atom_name()

230 + - ref-fitler: bump match_atom() name to the top

231 + - ref-filter: introduce struct used_atom

232 + - ref-filter: introduce a parsing function for each atom in valid_atom

233 +

234 + Refactoring of ref-filter's format-parsing code, in preparation

235 + for "branch --format" and friends.

236 +

237 + This replaces (for now) kn/for-each-ref-remainder, which will be built

238 + on top.

239 +

240 + Waiting for review.

241 +

242 +

243 +* ls/travis-yaml (2015-11-28) 1 commit

244 + (merged to 'next' on 2015-12-04 at e7852e1)

245 + + Add Travis CI support

246 +

247 + Provides the necessary infrastructure to build topics using the free

248 + Travis CI. Developers forking from this topic (and enabling Travis) can

249 + do their own builds, and we can turn on auto-builds for git/git

250 + (including build-status for pull requests that people open).

251 +

252 + I'm inclined to merge this up, as the worst case is that it becomes

253 + dormant cruft in the repository root.

254 +

255 + Will merge to 'master'.

256 +

257 +

258 +* rs/status-detached-head-memcmp (2015-11-28) 1 commit

259 + (merged to 'next' on 2015-12-04 at 60232db)

260 + + wt-status: correct and simplify check for detached HEAD

261 +

262 + Fix some string-matching corner cases when digging in the reflog for

263 + "git status".

264 +

265 + Will merge to 'master' and then 'maint'.

266 +

267 +

268 +* sg/lock-file-commit-error (2015-12-01) 1 commit

269 + - Make error message after failing commit_lock_file() less confusing

270 +

271 + Cosmetic improvement to lock-file error messages.

272 +

273 + Comments on the new messages?

274 +

275 + Will merge to 'next' after giving time for bikeshedding.

276 +

277 +

278 * bb/merge-marker-crlf (2015-11-24) 1 commit

279 - merge-file: consider core.crlf when writing merge markers

280

281 Write out merge markers using system end-of-line convention.

282

283 Waiting for a re-roll to handle gitattributes.

284 + ($gmane/281701)

285

286

287 * dk/gc-more-wo-pack (2015-11-24) 3 commits

@@ -405,23 +300,8 @@ But note that I will _not_ be pushing to kernel.org.

300

301 Improve error reporting when SMTP TLS fails.

302

408 - Waiting for re-roll.

409 -

410 -

411 -* mr/ff-refs (2015-11-28) 6 commits

412 - - builtin/ff-refs.c: mark some file-local variables static

413 - - ff-refs: Add tests

414 - - ff-refs: Add documentation

415 - - ff-refs: add --dry-run and --skip-worktree options

416 - - ff-refs: update each updatable ref

417 - - ff-refs: builtin cmd to check and fast forward local refs to their upstream

418 -

419 - Specialized command to fast-forward refs to match their upstream.

420 -

421 - I remain skeptical that this is necessary or sufficient. Comments

422 - welcome.

423 -

424 - Will hold.

303 + Waiting for a reroll.

304 + ($gmane/281693)

305

306

307 * ps/rebase-keep-empty (2015-11-24) 2 commits

@@ -443,18 +323,6 @@ But note that I will _not_ be pushing to kernel.org.

323 Waiting for review from subtree folks.

324

325

446 -* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits

447 - (merged to 'next' on 2015-11-24 at ac6eb1c)

448 - + bash prompt: indicate dirty index even on orphan branches

449 - + bash prompt: remove a redundant 'git diff' option

450 - + bash prompt: test dirty index and worktree while on an orphan branch

451 -

452 - Produce correct "dirty" marker for shell prompts, even when we

453 - are on an orphan branch.

454 -

455 - Will merge to 'master'.

456 -

457 -

326 * sg/sh-require-clean-orphan (2015-11-24) 2 commits

327 - sh-setup: make require_clean_work_tree() work on orphan branches

328 - Add tests for git-sh-setup's require_clean_work_tree()

@@ -466,8 +334,6 @@ But note that I will _not_ be pushing to kernel.org.

334 option-flag forever. I'm not sure if we need to do so. Comments

335 welcome.

336

469 - Waiting for re-roll?

470 -

337

338 * tb/ls-files-eol (2015-11-28) 2 commits

339 - convert.c: mark a file-local function static

@@ -486,28 +352,7 @@ But note that I will _not_ be pushing to kernel.org.

352 Usability fix for annotate-specific "<file> <rev>" syntax with deleted

353 files.

354

489 - Needs review.

490 -

491 -

492 -* jk/filter-branch-no-index (2015-11-06) 1 commit

493 - (merged to 'next' on 2015-11-24 at e31946e)

494 - + filter-branch: skip index read/write when possible

495 -

496 - Speed up filter-branch for cases where we only care about rewriting

497 - commits, not tree data.

498 -

499 - Will merge to 'master'.

500 -

501 -

502 -* jk/send-email-complete-aliases (2015-11-20) 2 commits

503 - (merged to 'next' on 2015-11-24 at a50094f)

504 - + completion: add support for completing email aliases

505 - + sendemail: teach git-send-email to dump alias names

506 -

507 - Teach send-email to dump mail aliases, so that we can do tab completion

508 - on the command line.

509 -

510 - Will merge to 'master'.

355 + Waiting for review.

356

357

358 * ls/test-must-fail-sigpipe (2015-11-28) 2 commits

@@ -518,10 +363,12 @@ But note that I will _not_ be pushing to kernel.org.

363 Fix some racy client/server tests by treating SIGPIPE the same as a

364 normal non-zero exit.

365

521 - Will merge to 'master' two cycles from now.

366 + Will merge to 'master' by -rc0.

367

368

524 -* mc/push-recurse-submodules-config (2015-11-20) 1 commit

369 +* mc/push-recurse-submodules-config (2015-12-04) 3 commits

370 + - push: follow the "last one wins" convention for --recurse-submodules

371 + - push: test that --recurse-submodules on command line overrides config

372 (merged to 'next' on 2015-11-24 at 3644d4b)

373 + push: add recurseSubmodules config option

374

@@ -530,28 +377,6 @@ But note that I will _not_ be pushing to kernel.org.

377 Waiting for review from submodule folks.

378

379

533 -* np/credential-cache-sighup (2015-11-20) 1 commit

534 - (merged to 'next' on 2015-11-24 at 410167f)

535 - + credential-cache: new option to ignore sighup

536 -

537 - Workaround for using credential-cache with emacs.

538 -

539 - Will merge to 'master'.

540 -

541 -

542 -* rs/parseopt-short-help (2015-11-20) 5 commits

543 - (merged to 'next' on 2015-11-24 at f22b6e0)

544 - + show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP

545 - + grep: stop using PARSE_OPT_NO_INTERNAL_HELP

546 - + parse-options: allow -h as a short option

547 - + parse-options: inline parse_options_usage() at its only remaining caller

548 - + parse-options: deduplicate parse_options_usage() calls

549 -

550 - Make "-h" command line option work more consistently in all commands.

551 -

552 - Will merge to 'master'.

553 -

554 -

380 * dt/refs-backend-pre-vtable (2015-11-20) 10 commits

381 (merged to 'next' on 2015-11-24 at 8fd7293)

382 + refs: break out ref conflict checks

@@ -567,30 +392,19 @@ But note that I will _not_ be pushing to kernel.org.

392

393 Code preparation for pluggable ref backends.

394

570 - Will merge to 'master' two cycles from now.

571 -

572 -

573 -* ad/sha1-update-chunked (2015-11-05) 2 commits

574 - (merged to 'next' on 2015-12-01 at a22bf47)

575 - + sha1: allow limiting the size of the data passed to SHA1_Update()

576 - + sha1: provide another level of indirection for the SHA-1 functions

395 + Will merge to 'master' by -rc0.

396

578 - Apple's common crypto implementation of SHA1_Update() does not take

579 - more than 4GB at a time, and we now have a compile-time workaround

580 - for it.

581 -

582 - Will merge to 'master'.

397

584 -

585 -* vl/grep-configurable-threads (2015-11-01) 1 commit

586 - - grep: add --threads=<num> option and grep.threads configuration

398 +* vl/grep-configurable-threads (2015-12-04) 1 commit

399 + . grep: add --threads=<num> option and grep.threads configuration

400

401 "git grep" can now be configured (or told from the command line)

402 how many threads to use when searching in the working tree files.

403

591 - There was some review from Eric.

404 + There was some review from Eric. Also this seems to break a test.

405

593 - Waiting for re-roll?

406 + Waiting for a reroll, or at least a response.

407 + ($gmane/281160)

408

409

410 * kf/http-proxy-auth-methods (2015-11-04) 3 commits

@@ -610,7 +424,7 @@ But note that I will _not_ be pushing to kernel.org.

424 be re-rolled on top.

425

426 Still being worked on.

613 - ($gmane/280925).

427 + ($gmane/280925)

428

429

430 * sb/submodule-parallel-update (2015-11-20) 27 commits

@@ -686,7 +500,7 @@ But note that I will _not_ be pushing to kernel.org.

500 list of object names from the standard input instead of from the

501 command line, and does not involve files in the working tree.

502

689 - Waiting for reviews.

503 + Waiting for review.

504

505

506 * ep/ident-with-getaddrinfo (2015-11-28) 1 commit

@@ -697,7 +511,7 @@ But note that I will _not_ be pushing to kernel.org.

511 user's hostname, instead of getaddrinfo() that is used in other

512 codepaths in such a build.

513

700 - Will merge to 'master' two cycles from now.

514 + Will merge to 'master' by -rc0.

515

516

517 * mh/notes-allow-reading-treeish (2015-10-08) 3 commits

@@ -811,7 +625,8 @@ But note that I will _not_ be pushing to kernel.org.

625

626

627 * sb/submodule-parallel-fetch (2015-11-24) 17 commits

814 - - run-command: detect finished children by closed pipe rather than waitpid

628 + (merged to 'next' on 2015-12-04 at 2c5ea47)

629 + + run-command: detect finished children by closed pipe rather than waitpid

630 (merged to 'next' on 2015-11-20 at 89fc723)

631 + strbuf: update documentation for strbuf_read_once()

632 + run-command: remove set_nonblocking()

@@ -836,7 +651,7 @@ But note that I will _not_ be pushing to kernel.org.

651 Add a framework to spawn a group of processes in parallel, and use

652 it to run "git fetch --recurse-submodules" in parallel.

653

839 - Will merge top commit to 'next'.

654 + Waiting for review.

655

656

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

@@ -873,3 +688,19 @@ But note that I will _not_ be pushing to kernel.org.

688 before this final step can proceed.

689

690 Will keep in 'next'.

691 +

692 +

693 +--------------------------------------------------

694 +[Discarded]

695 +

696 +* mr/ff-refs (2015-11-28) 6 commits

697 + . builtin/ff-refs.c: mark some file-local variables static

698 + . ff-refs: Add tests

699 + . ff-refs: Add documentation

700 + . ff-refs: add --dry-run and --skip-worktree options

701 + . ff-refs: update each updatable ref

702 + . ff-refs: builtin cmd to check and fast forward local refs to their upstream

703 +

704 + Specialized command to fast-forward refs to match their upstream.

705 +

706 +

What's cooking (2015/12 #02)