8fee0378a2 · matheusbsbs/matheus-bagliano

@@ -1,28 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jun 2015, #03; Wed, 10)

4 -X-master-at: 7974889a053574e449b55ca543a486e38e74864f

5 -X-next-at: 1a18470cb8c6fbcf40b535cf669aa165844706d5

3 +Subject: What's cooking in git.git (Jun 2015, #04; Tue, 16)

4 +X-master-at: 16da57c7c6c1fe92b32645202dd19657a89dd67d

5 +X-next-at: d7bed1d571a3164716149e236b028e1e8ae2619b

6

7 -What's cooking in git.git (Jun 2015, #03; Wed, 10)

7 +What's cooking in git.git (Jun 2015, #04; Tue, 16)

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 -Somehow we are getting quite a many new topics in the past few

15 -weeks. All the new contributors we acquired recently, including but

16 -not limited to the GSoC and Matthieu's students, are making good

17 -progress, throwing patches and responding to reviews in a reasonable

18 -way, proving themselves to be real assets to the community.

19 -

20 -Which, I am very happy about, even though I am a bit behind catching

21 -up with them. "Let's skip commute to gain an extra productive hour"

22 -I tried yesterday did not help enough X-<. I am sure I've either

23 -missed or postponed more than a few topics. I'll try to get to them

24 -but some of them may fall in the cracks; please help by reviewing on

25 -uncommented patches.

14 +Hopefully the pre-release freeze can start late next week, and the

15 +next cycle would reopen mid next month. In the meantime, let's

16 +shift the focus on making sure that what has already been merged to

17 +'master' are good (i.e. regression hunting and fixes).

18

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

20 of the repositories listed at

@@ -32,221 +24,260 @@ of the repositories listed at

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

25 [New Topics]

26

35 -* af/tcsh-completion-noclobber (2015-06-09) 1 commit

36 - - git-completion.tcsh: fix redirect with noclobber

27 +* jk/pkt-log-pack (2015-06-16) 3 commits

28 + - pkt-line: support tracing verbatim pack contents

29 + - pkt-line: tighten sideband PACK check when tracing

30 + - pkt-line: simplify starts_with checks in packet tracing

31

38 - The tcsh completion writes a bash scriptlet but that would have

39 - failed for users with noclobber set.

32 + Enhance packet tracing machinery to allow capturing an incoming

33 + pack data to a file for debugging.

34

41 - Will merge to 'next'.

35

36 +* jk/stash-require-clean-index (2015-06-15) 1 commit

37 + (merged to 'next' on 2015-06-16 at beb4883)

38 + + Revert "stash: require a clean index to apply"

39

44 -* es/utf8-stupid-compiler-workaround (2015-06-05) 1 commit

45 - - utf8: NO_ICONV: silence uninitialized variable warning

40 + A hotfix for the topic already in 'master'.

41

47 - A compilation workaround.

42 + Will merge to 'master'.

43

49 - Will merge to 'next'.

44

45 +* kb/i18n-doc (2015-06-15) 1 commit

46 + - Documentation/i18n.txt: clarify character encoding support

47

52 -* fk/doc-format-patch-vn (2015-06-10) 1 commit

53 - - doc: format-patch: fix typo

48 + Comments?

49

55 - Docfix.

50

57 - Will merge to 'next'.

51 +* kb/use-nsec-doc (2015-06-15) 1 commit

52 + - Makefile / racy-git.txt: clarify USE_NSEC prerequisites

53

54 + Comments?

55

60 -* gp/status-rebase-i-info (2015-06-09) 5 commits

61 - - SQUASH??? fix misindent

62 - - status: add new tests for status during rebase -i

63 - - status: give more information during rebase -i

64 - - status: differentiate interactive from non-interactive rebases

65 - - status: factor two rebase-related messages together

56

67 - Teach "git status" to show a more detailed information regarding

68 - the "rebase -i" session in progress.

57 +* kn/for-each-ref (2015-06-15) 11 commits

58 + - ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname

59 + - for-each-ref: introduce filter_refs()

60 + - ref-filter: move code from 'for-each-ref'

61 + - ref-filter: add 'ref-filter.h'

62 + - for-each-ref: rename variables called sort to sorting

63 + - for-each-ref: rename some functions and make them public

64 + - for-each-ref: introduce 'ref_array_clear()'

65 + - for-each-ref: introduce new structures for better organisation

66 + - for-each-ref: rename 'refinfo' to 'ref_array_item'

67 + - for-each-ref: clean up code

68 + - for-each-ref: extract helper functions out of grab_single_ref()

69

70 - Expecting a reroll.

70 + GSoC project to rebuild ref listing by branch and tag based on the

71 + for-each-ref machinery.

72

73 + Will merge to 'next'.

74

73 -* jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit

74 - - git-prompt.sh: document GIT_PS1_STATESEPARATOR

75

76 - Docfix.

76 +* mh/init-delete-refs-api (2015-06-15) 13 commits

77 + - SQUASH avoid die(variable)

78 + - refs: move the remaining ref module declarations to refs.h

79 + - initial_ref_transaction_commit(): check for ref D/F conflicts

80 + - initial_ref_transaction_commit(): check for duplicate refs

81 + - refs: remove some functions from the module's public interface

82 + - initial_ref_transaction_commit(): function for initial ref creation

83 + - repack_without_refs(): make function private

84 + - prune_remote(): use delete_refs()

85 + - delete_refs(): improve error message

86 + - delete_refs(): new function for the refs API

87 + - delete_ref(): handle special case more explicitly

88 + - remove_branches(): remove temporary

89 + - delete_ref(): move declaration to refs.h

90

78 - Will merge to 'next'.

91 + Clean up refs API and make "git clone" less intimate with the

92 + implementation detail.

93

94 + Needs reroll.

95

81 -* jk/index-pack-reduce-recheck (2015-06-09) 1 commit

82 - - index-pack: avoid excessive re-reading of pack directory

96

84 - Disable "have we lost a race with competing repack?" check while

85 - receiving a huge object transfer that runs index-pack.

97 +* mh/replace-refs (2015-06-12) 1 commit

98 + - Allow to control where the replace refs are looked for

99

87 - Will merge to 'next'.

100 + Add an environment variable to tell Git to look into refs hierarchy

101 + other than refs/replace/ for the object replacement data.

102

103

90 -* js/sleep-without-select (2015-06-05) 4 commits

91 - - lockfile: wait using sleep_millisec() instead of select()

92 - - lockfile: convert retry timeout computations to millisecond

93 - - help.c: wrap wait-only poll() invocation in sleep_millisec()

94 - - lockfile: replace random() by rand()

104 +* nd/multiple-work-trees (2015-06-12) 1 commit

105 + - checkout: don't check worktrees when not necessary

106

96 - Portability fix.

107 + "git checkout [<tree-ish>] <paths>" spent unnecessary cycles

108 + checking if the current branch was checked out elsewhere, when we

109 + know we are not switching the branches ourselves.

110

111 Will merge to 'next'.

112

113

101 -* ld/p4-changes-block-size (2015-06-10) 4 commits

102 - - git-p4: fixing --changes-block-size handling

103 - - git-p4: add tests for non-numeric revision range

104 - - git-p4: test with limited p4 server results

105 - - git-p4: additional testing of --changes-block-size

114 +* pa/auto-gc-mac-osx (2015-06-12) 1 commit

115 + (merged to 'next' on 2015-06-16 at 151ec95)

116 + + hooks/pre-auto-gc: adjust power checking for newer OS X

117

107 - More Perforce row number limit workaround for "git p4".

118 + Recent Mac OS X updates breaks the logic to detect that the machine

119 + is on the AC power in the sample pre-auto-gc script.

120

109 - Will merge to 'next'.

121 + Will merge to 'master'.

122

123

112 -* mh/fsck-reflog-entries (2015-06-08) 2 commits

113 - - fsck: report errors if reflog entries point at invalid objects

114 - - fsck_handle_reflog_sha1(): new function

124 +* pt/t0302-needs-sanity (2015-06-12) 1 commit

125 + (merged to 'next' on 2015-06-16 at f0d8e17)

126 + + t0302: "unreadable" test needs SANITY prereq

127

116 - "git fsck" used to ignore missing or invalid objects recorded in reflog.

128 + Will merge to 'master'.

129

118 - Will merge to 'next'.

130 +--------------------------------------------------

131 +[Graduated to "master"]

132

133 +* ah/send-email-sendmail-alias (2015-05-27) 2 commits

134 + (merged to 'next' on 2015-06-04 at 9d9bd68)

135 + + t9001: write $HOME/, not ~/, to help shells without tilde expansion

136 + + send-email: add sendmail email aliases format

137 + (this branch is used by es/send-email-sendmail-alias.)

138

121 -* mk/utf8-no-iconv-warn (2015-06-08) 1 commit

122 - - utf8.c: print warning about disabled iconv

139 + "git send-email" learned the alias file format used by the sendmail

140 + program (in an abbreviated form).

141

124 - Warn when a reencoding is requested in a build without iconv

125 - support, as the end user is likely to get an unexpected result. I

126 - think the same level of safety should be added to a build with

127 - iconv support when the specified encoding is not available, but the

128 - patch does not go there.

142

130 - Expecting a reroll.

143 +* jc/diff-ws-error-highlight (2015-05-26) 4 commits

144 + (merged to 'next' on 2015-06-01 at 6046560)

145 + + diff.c: --ws-error-highlight=<kind> option

146 + + diff.c: add emit_del_line() and emit_context_line()

147 + + t4015: separate common setup and per-test expectation

148 + + t4015: modernise style

149

150 + Allow whitespace breakages in deleted and context lines to be also

151 + painted in the output.

152

133 -* mr/rebase-i-customize-insn-sheet (2015-06-08) 1 commit

134 - - git-rebase--interactive.sh: add config option for custom instruction format

153

136 - Breaks tests.

154 +* jk/clone-dissociate (2015-05-27) 2 commits

155 + (merged to 'next' on 2015-06-01 at 19e3ec3)

156 + + clone: reorder --dissociate and --reference options

157 + + clone: use OPT_STRING_LIST for --reference

158

138 - Expecting a reroll.

159 + Code clean-up.

160

161

141 -* nd/untracked-cache (2015-06-08) 1 commit

142 - - read-cache: fix untracked cache invalidation when split-index is used

162 +* jk/color-diff-plain-is-context (2015-05-27) 2 commits

163 + (merged to 'next' on 2015-06-01 at bcd8f1d)

164 + + diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT

165 + + diff: accept color.diff.context as a synonym for "plain"

166

144 - Hotfix for a topic already in 'master'.

167 + "color.diff.plain" was a misnomer; give it 'color.diff.context' as

168 + a more logical synonym.

169

146 - Will merge to 'next'.

170

171 +* jk/diagnose-config-mmap-failure (2015-05-28) 5 commits

172 + (merged to 'next' on 2015-06-01 at ca750d5)

173 + + xmmap(): drop "Out of memory?"

174 + + config.c: rewrite ENODEV into EISDIR when mmap fails

175 + + config.c: avoid xmmap error messages

176 + + config.c: fix mmap leak when writing config

177 + + read-cache.c: drop PROT_WRITE from mmap of index

178

149 -* pt/am-abort-fix (2015-06-08) 6 commits

150 - - am --abort: keep unrelated commits on unborn branch

151 - - am --abort: support aborting to unborn branch

152 - - am --abort: revert changes introduced by failed 3way merge

153 - - am --skip: support skipping while on unborn branch

154 - - am -3: support 3way merge on unborn branch

155 - - am --skip: revert changes introduced by failed 3way merge

179 + The configuration reader/writer uses mmap(2) interface to access

180 + the files; when we find a directory, it barfed with "Out of memory?".

181

157 - Various fixes around "git am" that applies a patch to a history

158 - that is not there yet.

182

160 - Will merge to 'next'.

183 +* jk/die-on-bogus-worktree-late (2015-05-29) 1 commit

184 + (merged to 'next' on 2015-06-04 at fac7a83)

185 + + setup_git_directory: delay core.bare/core.worktree errors

186

187 + The setup code used to die when core.bare and core.worktree are set

188 + inconsistently, even for commands that do not need working tree.

189

163 -* pt/am-foreign (2015-06-08) 6 commits

164 - - SQUASH??? do not cat a single file into a pipe

165 - - am: teach mercurial patch parser how to read from stdin

166 - - am: use gmtime() to parse mercurial patch date

167 - - t4150: test applying StGit series

168 - - am: teach StGit patch parser how to read from stdin

169 - - t4150: test applying StGit patch

190

171 - Various enhancements around "git am" reading patches generated by

172 - foreign SCM.

191 +* jk/make-fix-dependencies (2015-05-29) 3 commits

192 + (merged to 'next' on 2015-06-04 at 28daf19)

193 + + Makefile: silence perl/PM.stamp recipe

194 + + Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS

195 + + Makefile: drop dependency between git-instaweb and gitweb

196

174 - Expecting a reroll.

197 + Build clean-up.

198

199

177 -* pt/pull-builtin (2015-06-09) 20 commits

178 - . SQUASH??? adjust to new world order after 9e3751d4 (remote.c: drop "remote" pointer from "struct branch", 2015-05-21)

179 - . pull: remove redirection to git-pull.sh

180 - . pull --rebase: error on no merge candidate cases

181 - . pull --rebase: exit early when the working directory is dirty

182 - . pull: configure --rebase via branch.<name>.rebase or pull.rebase

183 - . pull: teach git pull about --rebase

184 - . pull: set reflog message

185 - . pull: implement pulling into an unborn branch

186 - . pull: fast-forward working tree if head is updated

187 - . pull: check if in unresolved merge state

188 - - pull: support pull.ff config

189 - - pull: error on no merge candidates

190 - - pull: pass git-fetch's options to git-fetch

191 - - pull: pass git-merge's options to git-merge

192 - - pull: pass verbosity, --progress flags to fetch and merge

193 - - pull: implement fetch + merge

194 - - pull: implement skeletal builtin pull

195 - - argv-array: implement argv_array_pushv()

196 - - parse-options-cb: implement parse_opt_pass_argv_array()

197 - - parse-options-cb: implement parse_opt_pass_strbuf()

200 +* jk/squelch-missing-link-warning-for-unreachable (2015-06-01) 3 commits

201 + (merged to 'next' on 2015-06-01 at 9ddc5d1)

202 + + suppress errors on missing UNINTERESTING links

203 + + silence broken link warnings with revs->ignore_missing_links

204 + + add quieter versions of parse_{tree,commit}

205

199 - Expecting a reroll.

206 + Recent "git prune" traverses young unreachable objects to safekeep

207 + old objects in the reachability chain from them, which sometimes

208 + caused error messages that are unnecessarily alarming.

209

210

202 -* rl/send-email-aliases (2015-06-08) 5 commits

203 - - send-email: refactor address list process

204 - - send-email: allow multiple emails using --cc, --to and --bcc

205 - - t9001-send-email: refactor header variable fields replacement

206 - - send-email: allow aliases in patch header and command script outputs

207 - - t9001-send-email: move script creation in a setup test

211 +* mh/verify-lock-error-report (2015-05-27) 5 commits

212 + (merged to 'next' on 2015-06-01 at 7b450a7)

213 + + ref_transaction_commit(): do not capitalize error messages

214 + + verify_lock(): do not capitalize error messages

215 + + verify_lock(): report errors via a strbuf

216 + + verify_lock(): on errors, let the caller unlock the lock

217 + + verify_lock(): return 0/-1 rather than struct ref_lock *

218

209 - "git send-email" now performs alias-expansion on names that are

210 - given via --cccmd, etc.

219 + Bring consistency to error reporting mechanism used in "refs" API.

220

212 - Expecting a reroll.

221

222 +* mt/p4-depotFile-at-version (2015-05-27) 1 commit

223 + (merged to 'next' on 2015-06-01 at 33e8622)

224 + + p4: retrieve the right revision of the file in UTF-16 codepath

225

215 -* sg/commit-cleanup-scissors (2015-06-09) 1 commit

216 - - commit: cope with scissors lines in commit message

226

218 - "git commit --cleanup=scissors" was not careful enough to protect

219 - against getting fooled by a line that looked like scissors.

227 +* nd/slim-index-pack-memory-usage (2015-06-04) 1 commit

228 + (merged to 'next' on 2015-06-04 at 328fd50)

229 + + index-pack: fix truncation of off_t in comparison

230

221 - Will merge to 'next'.

231 + An earlier optimization broke index-pack for a large object

232 + transfer; this fixes it before the breakage hits any released

233 + version.

234

235

224 -* sg/completion-commit-cleanup (2015-06-08) 1 commit

225 - - completion: teach 'scissors' mode to 'git commit --cleanup='

236 +* pt/pull-tests (2015-05-29) 8 commits

237 + (merged to 'next' on 2015-06-01 at c98370b)

238 + + t5520: check reflog action in fast-forward merge

239 + + t5521: test --dry-run does not make any changes

240 + + t5520: test --rebase failure on unborn branch with index

241 + + t5520: test --rebase with multiple branches

242 + + t5520: test work tree fast-forward when fetch updates head

243 + + t5520: test for failure if index has unresolved entries

244 + + t5520: test no merge candidates cases

245 + + t5520: prevent field splitting in content comparisons

246 + (this branch is used by pt/pull-optparse.)

247

227 - Will merge to 'next'.

248 + Add more test coverage to "git pull".

249

250

230 -* wp/sha1-name-negative-match (2015-06-08) 2 commits

231 - - sha1_name.c: introduce '^{/!-<negative pattern>}' notation

232 - - test for '!' handling in rev-parse's named commits

251 +* sb/glossary-submodule (2015-05-29) 1 commit

252 + (merged to 'next' on 2015-06-01 at 84de87b)

253 + + glossary: add "remote", "submodule", "superproject"

254

234 - Introduce "branch^{/!-<pattern>}" notation to name a commit

235 - reachable from branch that does not match the given pattern.

255

237 - Expecting a reroll.

256 +* sb/pack-protocol-mention-smart-http (2015-06-02) 1 commit

257 + (merged to 'next' on 2015-06-04 at 8041cf6)

258 + + Documentation/technical/pack-protocol: mention http as possible protocol

259

260 + Doc updates.

261

240 -* bc/object-id (2015-06-10) 7 commits

241 - - ref_newer: convert to use struct object_id

242 - - parse_fetch: convert to use struct object_id

243 - - add_sought_entry_mem: convert to struct object_id

244 - - Add a utility function to make parsing hex values easier.

245 - - Convert struct ref to use object_id.

246 - - sha1_file: introduce has_object_file helper.

247 - - refs: convert some internal functions to use object_id

262

249 - (incomplete)

263 +* sb/submodule-doc-intro (2015-05-28) 1 commit

264 + (merged to 'next' on 2015-06-01 at b6798de)

265 + + submodule doc: reorder introductory paragraphs

266 +

267 +

268 +* sg/merge-summary-config (2015-05-28) 1 commit

269 + (merged to 'next' on 2015-06-04 at 8c0946c)

270 + + Documentation: include 'merge.branchdesc' for merge and config as well

271 +

272 + Doc updates.

273 +

274 +

275 +* tb/complete-sequencing (2015-06-01) 1 commit

276 + (merged to 'next' on 2015-06-01 at b7604e8)

277 + + completion: suggest sequencer commands for revert

278 +

279 + The bash completion script (in contrib/) learned a few options that

280 + "git revert" takes.

281

282 --------------------------------------------------

283 [Stalled]

@@ -455,381 +486,432 @@ of the repositories listed at

486 --------------------------------------------------

487 [Cooking]

488

458 -* jc/ll-merge-expose-path (2015-06-04) 1 commit

459 - - ll-merge: pass the original path to external drivers

489 +* af/tcsh-completion-noclobber (2015-06-09) 1 commit

490 + (merged to 'next' on 2015-06-16 at 621f205)

491 + + git-completion.tcsh: fix redirect with noclobber

492

461 - Traditionally, external low-level 3-way merge drivers are expected

462 - to produce their results based solely on the contents of the three

463 - variants given in temporary files named by %O, %A and %B on their

464 - command line. Additionally allow them to look at the final path

465 - (given by %P).

493 + The tcsh completion writes a bash scriptlet but that would have

494 + failed for users with noclobber set.

495

467 - Will merge to 'next'.

496 + Will merge to 'master'.

497

498

470 -* jk/log-missing-default-HEAD (2015-06-03) 1 commit

471 - - log: diagnose empty HEAD more clearly

499 +* es/utf8-stupid-compiler-workaround (2015-06-05) 1 commit

500 + (merged to 'next' on 2015-06-11 at dc0f2d2)

501 + + utf8: NO_ICONV: silence uninitialized variable warning

502

473 - "git init empty && git -C empty log" said "bad default revision 'HEAD'",

474 - which was found to be a bit confusing to new users.

503 + A compilation workaround.

504

476 - What's the status of this one?

505 + Will merge to 'master'.

506

507

479 -* nd/slim-index-pack-memory-usage (2015-06-04) 1 commit

480 - (merged to 'next' on 2015-06-04 at 328fd50)

481 - + index-pack: fix truncation of off_t in comparison

508 +* fk/doc-format-patch-vn (2015-06-10) 1 commit

509 + (merged to 'next' on 2015-06-16 at 9be3516)

510 + + doc: format-patch: fix typo

511

483 - An earlier optimization broke index-pack for a large object

484 - transfer; this fixes it before the breakage hits any released

485 - version.

512 + Docfix.

513

514 Will merge to 'master'.

515

516

490 -* gr/rebase-i-drop-warn (2015-06-01) 2 commits

491 - - git rebase -i: warn about removed commits

492 - - git-rebase -i: add command "drop" to remove a commit

517 +* gp/status-rebase-i-info (2015-06-09) 5 commits

518 + - SQUASH??? fix misindent

519 + - status: add new tests for status during rebase -i

520 + - status: give more information during rebase -i

521 + - status: differentiate interactive from non-interactive rebases

522 + - status: factor two rebase-related messages together

523

494 - Add "drop commit-object-name subject" command as another way to

495 - skip replaying of a commit in "rebase -i", and then punish those

496 - who do not use it (and instead just remove the lines) by throwing

497 - a warning.

524 + Teach "git status" to show a more detailed information regarding

525 + the "rebase -i" session in progress.

526

527 Expecting a reroll.

528

529

502 -* jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit

503 - - strbuf_read(): skip unnecessary strbuf_grow() at eof

530 +* jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit

531 + - git-prompt.sh: document GIT_PS1_STATESEPARATOR

532

505 - Avoid one extra iteration and strbuf_grow() of 8kB in

506 - strbuf_read().

533 + Docfix.

534

508 - Looked reasonable; perhaps a log message clarification is needed.

535 + Will merge to 'next'.

536

510 - Expecting a reroll.

537

538 +* jk/index-pack-reduce-recheck (2015-06-09) 1 commit

539 + (merged to 'next' on 2015-06-16 at ff83705)

540 + + index-pack: avoid excessive re-reading of pack directory

541

513 -* jk/squelch-missing-link-warning-for-unreachable (2015-06-01) 3 commits

514 - (merged to 'next' on 2015-06-01 at 9ddc5d1)

515 - + suppress errors on missing UNINTERESTING links

516 - + silence broken link warnings with revs->ignore_missing_links

517 - + add quieter versions of parse_{tree,commit}

542 + Disable "have we lost a race with competing repack?" check while

543 + receiving a huge object transfer that runs index-pack.

544

519 - Recent "git prune" traverses young unreachable objects to safekeep

520 - old objects in the reachability chain from them, which causes

521 - error messages that are unnecessarily alarming.

545 + Will merge to 'master'.

546 +

547 +

548 +* js/sleep-without-select (2015-06-05) 4 commits

549 + (merged to 'next' on 2015-06-11 at 278edb1)

550 + + lockfile: wait using sleep_millisec() instead of select()

551 + + lockfile: convert retry timeout computations to millisecond

552 + + help.c: wrap wait-only poll() invocation in sleep_millisec()

553 + + lockfile: replace random() by rand()

554 +

555 + Portability fix.

556

557 Will merge to 'master'.

558

559

526 -* mh/reporting-broken-refs-from-for-each-ref (2015-06-08) 4 commits

527 - - read_loose_refs(): treat NULL_SHA1 loose references as broken

528 - - read_loose_refs(): simplify function logic

529 - - for-each-ref: report broken references correctly

530 - - t6301: new tests of for-each-ref error handling

560 +* ld/p4-changes-block-size (2015-06-10) 4 commits

561 + (merged to 'next' on 2015-06-16 at 09b7daa)

562 + + git-p4: fixing --changes-block-size handling

563 + + git-p4: add tests for non-numeric revision range

564 + + git-p4: test with limited p4 server results

565 + + git-p4: additional testing of --changes-block-size

566

532 - "git for-each-ref" reported "missing object" for 0{40} when it

533 - encounters a broken ref. The lack of object whose name is 0{40} is

534 - not the problem; the ref being broken is.

567 + More Perforce row number limit workaround for "git p4".

568

536 - Will merge to 'next'.

569 + Will merge to 'master'.

570

571

539 -* tb/complete-sequencing (2015-06-01) 1 commit

540 - (merged to 'next' on 2015-06-01 at b7604e8)

541 - + completion: suggest sequencer commands for revert

572 +* mh/fsck-reflog-entries (2015-06-08) 2 commits

573 + (merged to 'next' on 2015-06-16 at 44e3202)

574 + + fsck: report errors if reflog entries point at invalid objects

575 + + fsck_handle_reflog_sha1(): new function

576

543 - The bash completion script (in contrib/) learned a few options that

544 - "git revert" takes.

577 + "git fsck" used to ignore missing or invalid objects recorded in reflog.

578

579 Will merge to 'master'.

580

581

549 -* jc/apply-reject-noop-hunk (2015-06-01) 1 commit

550 - - apply: reject a hunk that does not do anything

582 +* mk/utf8-no-iconv-warn (2015-06-08) 1 commit

583 + - utf8.c: print warning about disabled iconv

584

552 - "git apply" cannot diagnose a patch corruption when the breakage is

553 - to mark the length of the hunk shorter than it really is on the

554 - hunk header line "@@ -l,k +m,n @@"; one special case it could is

555 - when the hunk becomes no-op (e.g. k == n == 2 for two-line context

556 - patch output), and it learned how to do so.

585 + Warn when a reencoding is requested in a build without iconv

586 + support, as the end user is likely to get an unexpected result. I

587 + think the same level of safety should be added to a build with

588 + iconv support when the specified encoding is not available, but the

589 + patch does not go there.

590

558 - Will merge to 'next'.

591 + Expecting a reroll.

592

593

561 -* es/configure-getdelim (2015-06-03) 2 commits

562 - - configure: add getdelim() check

563 - - config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

594 +* mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit

595 + - git-rebase--interactive.sh: add config option for custom instruction format

596

565 - Auto-detect availability of getdelim() that helps optimized version

566 - of strbuf_getwholeline().

597 + "git rebase -i"'s list of todo is made configurable.

598

599 Will merge to 'next'.

600

601

571 -* es/osx-header-pollutes-mask-macro (2015-06-03) 2 commits

572 - - ewah: use less generic macro name

573 - - ewah/bitmap: silence warning about MASK macro redefinition

602 +* nd/untracked-cache (2015-06-08) 1 commit

603 + (merged to 'next' on 2015-06-16 at 5e7df1d)

604 + + read-cache: fix untracked cache invalidation when split-index is used

605

575 - Will merge to 'next'.

606 + Hotfix for the 'untracked-cache' topic that is already in 'master'.

607

608 + Will merge to 'master'.

609

578 -* es/send-email-sendmail-alias (2015-06-01) 10 commits

579 - - send-email: further warn about unsupported sendmail aliases features

580 - - t9001: add sendmail aliases line continuation tests

581 - - t9001: refactor sendmail aliases test infrastructure

582 - - send-email: implement sendmail aliases line continuation support

583 - - send-email: simplify sendmail aliases comment and blank line recognizer

584 - - send-email: refactor sendmail aliases parser

585 - - send-email: fix style: cuddle 'elsif' and 'else' with closing brace

586 - - send-email: drop noise comments which merely repeat what code says

587 - - send-email: visually distinguish sendmail aliases parser warnings

588 - - send-email: further document missing sendmail aliases functionality

589 - (this branch uses ah/send-email-sendmail-alias.)

610

591 - "git send-email" learned to handle more forms of sendmail style

592 - aliases file.

611 +* pt/am-abort-fix (2015-06-08) 6 commits

612 + (merged to 'next' on 2015-06-16 at 9cac1de)

613 + + am --abort: keep unrelated commits on unborn branch

614 + + am --abort: support aborting to unborn branch

615 + + am --abort: revert changes introduced by failed 3way merge

616 + + am --skip: support skipping while on unborn branch

617 + + am -3: support 3way merge on unborn branch

618 + + am --skip: revert changes introduced by failed 3way merge

619

594 - Will merge to 'next'.

620 + Various fixes around "git am" that applies a patch to a history

621 + that is not there yet.

622

623 + Will merge to 'master'.

624

597 -* jc/do-not-feed-tags-to-clear-commit-marks (2015-06-01) 1 commit

598 - - format-patch: do not feed tags to clear_commit_marks()

625

600 - "git format-patch --ignore-if-upstream A..B" did not like to be fed

601 - tags as boundary commits.

626 +* pt/am-foreign (2015-06-15) 5 commits

627 + - am: teach mercurial patch parser how to read from stdin

628 + - am: use gmtime() to parse mercurial patch date

629 + - t4150: test applying StGit series

630 + - am: teach StGit patch parser how to read from stdin

631 + - t4150: test applying StGit patch

632 +

633 + Various enhancements around "git am" reading patches generated by

634 + foreign SCM.

635

636 Will merge to 'next'.

637

638

606 -* mg/index-read-error-messages (2015-06-01) 2 commits

607 - - messages: uniform error messages for index write

608 - - show-index: uniform error messages for index read

639 +* pt/pull-builtin (2015-06-15) 19 commits

640 + - pull: remove redirection to git-pull.sh

641 + - pull --rebase: error on no merge candidate cases

642 + - pull --rebase: exit early when the working directory is dirty

643 + - pull: configure --rebase via branch.<name>.rebase or pull.rebase

644 + - pull: teach git pull about --rebase

645 + - pull: set reflog message

646 + - pull: implement pulling into an unborn branch

647 + - pull: fast-forward working tree if head is updated

648 + - pull: check if in unresolved merge state

649 + - pull: support pull.ff config

650 + - pull: error on no merge candidates

651 + - pull: pass git-fetch's options to git-fetch

652 + - pull: pass git-merge's options to git-merge

653 + - pull: pass verbosity, --progress flags to fetch and merge

654 + - pull: implement fetch + merge

655 + - pull: implement skeletal builtin pull

656 + - argv-array: implement argv_array_pushv()

657 + - parse-options-cb: implement parse_opt_passthru_argv()

658 + - parse-options-cb: implement parse_opt_passthru()

659

610 - The tip was RFC.

611 - Expecting a reroll.

660 + Reimplement 'git pull' in C.

661

662

614 -* pt/pull-optparse (2015-06-02) 3 commits

615 - - pull: use git-rev-parse --parseopt for option parsing

616 - - pull: handle git-fetch's options as well

617 - - Merge branch 'pt/pull-tests' into pt/pull-optparse

618 - (this branch uses pt/pull-tests.)

663 +* rl/send-email-aliases (2015-06-08) 5 commits

664 + - send-email: refactor address list process

665 + - send-email: allow multiple emails using --cc, --to and --bcc

666 + - t9001-send-email: refactor header variable fields replacement

667 + - send-email: allow aliases in patch header and command script outputs

668 + - t9001-send-email: move script creation in a setup test

669

620 - "git pull" has become more aware of the options meant for

621 - underlying "git fetch" and then learned to use parse-options

622 - parser.

670 + "git send-email" now performs alias-expansion on names that are

671 + given via --cccmd, etc.

672

624 - Will merge to 'next'.

673 + What's the doneness of this one?

674

675

627 -* qn/blame-show-email (2015-06-01) 1 commit

628 - - blame: add blame.showEmail configuration

676 +* sg/commit-cleanup-scissors (2015-06-09) 1 commit

677 + (merged to 'next' on 2015-06-16 at 988e23d)

678 + + commit: cope with scissors lines in commit message

679

630 - "git blame" learned blame.showEmail configuration variable.

680 + "git commit --cleanup=scissors" was not careful enough to protect

681 + against getting fooled by a line that looked like scissors.

682

632 - Will merge to 'next'.

683 + Will merge to 'master'.

684

685

635 -* rl/am-3way-config (2015-06-04) 3 commits

636 - - git-am: add am.threeWay config variable

637 - - t4150-am: refactor am -3 tests

638 - - git-am.sh: fix initialization of the threeway variable

686 +* sg/completion-commit-cleanup (2015-06-08) 1 commit

687 + (merged to 'next' on 2015-06-16 at a9d1c77)

688 + + completion: teach 'scissors' mode to 'git commit --cleanup='

689

640 - "git am" learned am.threeWay configuration variable.

690 + Will merge to 'master'.

691

642 - Will merge to 'next'.

692

693 +* wp/sha1-name-negative-match (2015-06-08) 2 commits

694 + - sha1_name.c: introduce '^{/!-<negative pattern>}' notation

695 + - test for '!' handling in rev-parse's named commits

696

645 -* sb/pack-protocol-mention-smart-http (2015-06-02) 1 commit

646 - (merged to 'next' on 2015-06-04 at 8041cf6)

647 - + Documentation/technical/pack-protocol: mention http as possible protocol

697 + Introduce "branch^{/!-<pattern>}" notation to name a commit

698 + reachable from branch that does not match the given pattern.

699

649 - Doc updates.

700 + Expecting a reroll.

701

651 - Will merge to 'master'.

702

703 +* bc/object-id (2015-06-15) 8 commits

704 + - remote.c: use struct object_id in ref_newer()

705 + - transport-helper.c: use struct object_id in push_refs_with_export()

706 + - connect.c: use struct object_id in get_remote_heads()

707 + - remote-curl: use struct object_id in parse_fetch()

708 + - fetch-pack: use struct object_id in add_sought_entry_mem()

709 + - object_id: convert struct ref to use object_id.

710 + - sha1_file: introduce has_object_file() helper

711 + - refs: convert some internal functions to use object_id

712

654 -* hv/submodule-config (2015-06-02) 4 commits

655 - - do not die on error of parsing fetchrecursesubmodules option

656 - - use new config API for worktree configurations of submodules

657 - - extract functions for submodule config set and lookup

658 - - implement submodule config cache for lookup of submodule names

713 + (incomplete - the last two not queued yet)

714

660 - The gitmodules API accessed from the C code learned to cache stuff

661 - lazily.

715

663 - What's the doneness of this one?

716 +* jc/ll-merge-expose-path (2015-06-04) 1 commit

717 + (merged to 'next' on 2015-06-11 at 5c5fe41)

718 + + ll-merge: pass the original path to external drivers

719

720 + Traditionally, external low-level 3-way merge drivers are expected

721 + to produce their results based solely on the contents of the three

722 + variants given in temporary files named by %O, %A and %B on their

723 + command line. Additionally allow them to look at the final path

724 + (given by %P).

725

666 -* jc/diff-ws-error-highlight (2015-05-26) 4 commits

667 - (merged to 'next' on 2015-06-01 at 6046560)

668 - + diff.c: --ws-error-highlight=<kind> option

669 - + diff.c: add emit_del_line() and emit_context_line()

670 - + t4015: separate common setup and per-test expectation

671 - + t4015: modernise style

726 + Will merge to 'master'.

727

673 - Allow whitespace breakages in deleted and context lines to be also

674 - painted in the output.

728

676 - Will merge to 'master'.

729 +* jk/log-missing-default-HEAD (2015-06-03) 1 commit

730 + - log: diagnose empty HEAD more clearly

731

732 + "git init empty && git -C empty log" said "bad default revision 'HEAD'",

733 + which was found to be a bit confusing to new users.

734

679 -* jk/clone-dissociate (2015-05-27) 2 commits

680 - (merged to 'next' on 2015-06-01 at 19e3ec3)

681 - + clone: reorder --dissociate and --reference options

682 - + clone: use OPT_STRING_LIST for --reference

735 + What's the status of this one?

736

684 - Code clean-up.

737

686 - Will merge to 'master'.

738 +* gr/rebase-i-drop-warn (2015-06-01) 2 commits

739 + - git rebase -i: warn about removed commits

740 + - git-rebase -i: add command "drop" to remove a commit

741 +

742 + Add "drop commit-object-name subject" command as another way to

743 + skip replaying of a commit in "rebase -i", and then punish those

744 + who do not use it (and instead just remove the lines) by throwing

745 + a warning.

746

747 + What's the status of this one?

748

689 -* jk/color-diff-plain-is-context (2015-05-27) 2 commits

690 - (merged to 'next' on 2015-06-01 at bcd8f1d)

691 - + diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT

692 - + diff: accept color.diff.context as a synonym for "plain"

749

694 - "color.diff.plain" was a misnomer; give it 'color.diff.context' as

695 - a more logical synonym.

750 +* jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit

751 + - strbuf_read(): skip unnecessary strbuf_grow() at eof

752

697 - Will merge to 'master'.

753 + Avoid one extra iteration and strbuf_grow() of 8kB in

754 + strbuf_read().

755

756 + Looked reasonable; perhaps a log message clarification is needed.

757

700 -* jk/diagnose-config-mmap-failure (2015-05-28) 5 commits

701 - (merged to 'next' on 2015-06-01 at ca750d5)

702 - + xmmap(): drop "Out of memory?"

703 - + config.c: rewrite ENODEV into EISDIR when mmap fails

704 - + config.c: avoid xmmap error messages

705 - + config.c: fix mmap leak when writing config

706 - + read-cache.c: drop PROT_WRITE from mmap of index

758 + Expecting a reroll.

759

708 - The configuration reader/writer uses mmap(2) interface to access

709 - the files; when we find a directory, it barfed with "Out of memory?".

760 +

761 +* mh/reporting-broken-refs-from-for-each-ref (2015-06-08) 4 commits

762 + (merged to 'next' on 2015-06-16 at 31af2b8)

763 + + read_loose_refs(): treat NULL_SHA1 loose references as broken

764 + + read_loose_refs(): simplify function logic

765 + + for-each-ref: report broken references correctly

766 + + t6301: new tests of for-each-ref error handling

767 +

768 + "git for-each-ref" reported "missing object" for 0{40} when it

769 + encounters a broken ref. The lack of object whose name is 0{40} is

770 + not the problem; the ref being broken is.

771

772 Will merge to 'master'.

773

774

714 -* mh/verify-lock-error-report (2015-05-27) 5 commits

715 - (merged to 'next' on 2015-06-01 at 7b450a7)

716 - + ref_transaction_commit(): do not capitalize error messages

717 - + verify_lock(): do not capitalize error messages

718 - + verify_lock(): report errors via a strbuf

719 - + verify_lock(): on errors, let the caller unlock the lock

720 - + verify_lock(): return 0/-1 rather than struct ref_lock *

775 +* jc/apply-reject-noop-hunk (2015-06-01) 1 commit

776 + (merged to 'next' on 2015-06-11 at 8063665)

777 + + apply: reject a hunk that does not do anything

778

722 - Bring consistency to error reporting mechanism used in "refs" API.

779 + "git apply" cannot diagnose a patch corruption when the breakage is

780 + to mark the length of the hunk shorter than it really is on the

781 + hunk header line "@@ -l,k +m,n @@"; one special case it could is

782 + when the hunk becomes no-op (e.g. k == n == 2 for two-line context

783 + patch output), and it learned how to do so.

784

785 Will merge to 'master'.

786

787

727 -* mt/p4-depotFile-at-version (2015-05-27) 1 commit

728 - (merged to 'next' on 2015-06-01 at 33e8622)

729 - + p4: retrieve the right revision of the file in UTF-16 codepath

788 +* es/configure-getdelim (2015-06-03) 2 commits

789 + (merged to 'next' on 2015-06-11 at cdead14)

790 + + configure: add getdelim() check

791 + + config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases

792 +

793 + Auto-detect availability of getdelim() that helps optimized version

794 + of strbuf_getwholeline().

795

796 Will merge to 'master'.

797

798

734 -* sb/glossary-submodule (2015-05-29) 1 commit

735 - (merged to 'next' on 2015-06-01 at 84de87b)

736 - + glossary: add "remote", "submodule", "superproject"

799 +* es/osx-header-pollutes-mask-macro (2015-06-03) 2 commits

800 + (merged to 'next' on 2015-06-11 at cd8c39e)

801 + + ewah: use less generic macro name

802 + + ewah/bitmap: silence warning about MASK macro redefinition

803

804 Will merge to 'master'.

805

806

741 -* sg/config-name-only (2015-05-28) 3 commits

742 - - completion: use new 'git config' options to reliably list variable names

743 - - SQUASH

744 - - config: add options to list only variable names

745 -

746 - "git config --list" output was hard to parse when values consist of

747 - multiple lines. Introduce a way to show only the keys.

807 +* es/send-email-sendmail-alias (2015-06-01) 10 commits

808 + (merged to 'next' on 2015-06-11 at b5e310e)

809 + + send-email: further warn about unsupported sendmail aliases features

810 + + t9001: add sendmail aliases line continuation tests

811 + + t9001: refactor sendmail aliases test infrastructure

812 + + send-email: implement sendmail aliases line continuation support

813 + + send-email: simplify sendmail aliases comment and blank line recognizer

814 + + send-email: refactor sendmail aliases parser

815 + + send-email: fix style: cuddle 'elsif' and 'else' with closing brace

816 + + send-email: drop noise comments which merely repeat what code says

817 + + send-email: visually distinguish sendmail aliases parser warnings

818 + + send-email: further document missing sendmail aliases functionality

819

749 - Adding a single --name-only option may be a better way to go than

750 - adding two new options.

820 + "git send-email" learned to handle more forms of sendmail style

821 + aliases file.

822

752 - Expecting reroll.

823 + Will merge to 'master'.

824

825

755 -* sg/merge-summary-config (2015-05-28) 1 commit

756 - (merged to 'next' on 2015-06-04 at 8c0946c)

757 - + Documentation: include 'merge.branchdesc' for merge and config as well

826 +* jc/do-not-feed-tags-to-clear-commit-marks (2015-06-01) 1 commit

827 + (merged to 'next' on 2015-06-11 at 65b4308)

828 + + format-patch: do not feed tags to clear_commit_marks()

829

759 - Doc updates.

830 + "git format-patch --ignore-if-upstream A..B" did not like to be fed

831 + tags as boundary commits.

832

833 Will merge to 'master'.

834

835

764 -* jc/push-tags-also (2015-05-29) 1 commit

765 - - push --tags: push tags *in addition to* other stuff

836 +* mg/index-read-error-messages (2015-06-01) 2 commits

837 + - messages: uniform error messages for index write

838 + - show-index: uniform error messages for index read

839

767 - "git fetch --tags" learned to fetch tags in addition to other stuff

768 - a few years ago, but "git push --tags" didn't. Now it does.

840 + The tip was RFC.

841 + Expecting a reroll.

842

843

771 -* jk/die-on-bogus-worktree-late (2015-05-29) 1 commit

772 - (merged to 'next' on 2015-06-04 at fac7a83)

773 - + setup_git_directory: delay core.bare/core.worktree errors

844 +* pt/pull-optparse (2015-06-02) 3 commits

845 + (merged to 'next' on 2015-06-11 at e252b4c)

846 + + pull: use git-rev-parse --parseopt for option parsing

847 + + pull: handle git-fetch's options as well

848 + + Merge branch 'pt/pull-tests' into pt/pull-optparse

849

775 - The setup code used to die when core.bare and core.worktree are set

776 - inconsistently, even for commands that do not need working tree.

850 + "git pull" has become more aware of the options meant for

851 + underlying "git fetch" and then learned to use parse-options

852 + parser.

853

854 Will merge to 'master'.

855

856

781 -* jk/make-fix-dependencies (2015-05-29) 3 commits

782 - (merged to 'next' on 2015-06-04 at 28daf19)

783 - + Makefile: silence perl/PM.stamp recipe

784 - + Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS

785 - + Makefile: drop dependency between git-instaweb and gitweb

857 +* qn/blame-show-email (2015-06-01) 1 commit

858 + (merged to 'next' on 2015-06-11 at b4998e2)

859 + + blame: add blame.showEmail configuration

860

787 - Build clean-up.

861 + "git blame" learned blame.showEmail configuration variable.

862

863 Will merge to 'master'.

864

865

792 -* ah/send-email-sendmail-alias (2015-05-27) 2 commits

793 - (merged to 'next' on 2015-06-04 at 9d9bd68)

794 - + t9001: write $HOME/, not ~/, to help shells without tilde expansion

795 - + send-email: add sendmail email aliases format

796 - (this branch is used by es/send-email-sendmail-alias.)

866 +* rl/am-3way-config (2015-06-04) 3 commits

867 + (merged to 'next' on 2015-06-11 at 9b9910d)

868 + + git-am: add am.threeWay config variable

869 + + t4150-am: refactor am -3 tests

870 + + git-am.sh: fix initialization of the threeway variable

871

798 - "git send-email" learned the alias file format used by the sendmail

799 - program (in an abbreviated form).

872 + "git am" learned am.threeWay configuration variable.

873

874 Will merge to 'master'.

875

876

804 -* jc/commit-slab (2015-05-22) 1 commit

805 - - commit-slab: introduce slabname##_peek() function

877 +* hv/submodule-config (2015-06-15) 4 commits

878 + - do not die on error of parsing fetchrecursesubmodules option

879 + - use new config API for worktree configurations of submodules

880 + - extract functions for submodule config set and lookup

881 + - implement submodule config API for lookup of .gitmodules values

882

807 - Memory use reduction when commit-slab facility is used to annotate

808 - sparsely (which is not recommended in the first place).

883 + The gitmodules API accessed from the C code learned to cache stuff

884 + lazily.

885

886 + Looked reasonable from a cursory read.

887

811 -* sb/submodule-doc-intro (2015-05-28) 1 commit

812 - (merged to 'next' on 2015-06-01 at b6798de)

813 - + submodule doc: reorder introductory paragraphs

888

815 - Will merge to 'master'.

889 +* sg/config-name-only (2015-05-28) 3 commits

890 + - completion: use new 'git config' options to reliably list variable names

891 + - SQUASH

892 + - config: add options to list only variable names

893

894 + "git config --list" output was hard to parse when values consist of

895 + multiple lines. Introduce a way to show only the keys.

896

818 -* pt/pull-tests (2015-05-29) 8 commits

819 - (merged to 'next' on 2015-06-01 at c98370b)

820 - + t5520: check reflog action in fast-forward merge

821 - + t5521: test --dry-run does not make any changes

822 - + t5520: test --rebase failure on unborn branch with index

823 - + t5520: test --rebase with multiple branches

824 - + t5520: test work tree fast-forward when fetch updates head

825 - + t5520: test for failure if index has unresolved entries

826 - + t5520: test no merge candidates cases

827 - + t5520: prevent field splitting in content comparisons

828 - (this branch is used by pt/pull-optparse.)

897 + Adding a single --name-only option may be a better way to go than

898 + adding two new options.

899

830 - Add more test coverage to "git pull".

900 + Expecting reroll.

901

832 - Will merge to 'master'.

902 +

903 +* jc/push-tags-also (2015-05-29) 1 commit

904 + - push --tags: push tags *in addition to* other stuff

905 +

906 + "git fetch --tags" learned to fetch tags in addition to other stuff

907 + a few years ago, but "git push --tags" didn't. Now it does.

908 +

909 +

910 +* jc/commit-slab (2015-05-22) 1 commit

911 + - commit-slab: introduce slabname##_peek() function

912 +

913 + Memory use reduction when commit-slab facility is used to annotate

914 + sparsely (which is not recommended in the first place).

915

916

917 * jc/clone-bundle (2015-04-30) 1 commit

@@ -838,7 +920,7 @@ of the repositories listed at

920 Still an early WIP

921

922

841 -* ee/clean-remove-dirs (2015-06-09) 5 commits

923 +* ee/clean-remove-dirs (2015-06-15) 5 commits

924 - clean: improve performance when removing lots of directories

925 - p7300: add performance tests for clean

926 - t7300: add tests to document behavior of clean and nested git

@@ -849,7 +931,7 @@ of the repositories listed at

931 be touched?" check "git clean" does by checking if it has .git/HEAD

932 using the submodule-related code with a more optimized check.

933

852 - Haven't seen reviews on this updated round, and I haven't read it myself.

934 + Looked reasonable from a cursory read.

935

936

937 * jc/merge-drop-old-syntax (2015-04-29) 1 commit

What's cooking (2015/06 #04)