7af04ad560 · 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 (Oct 2015, #06; Mon, 26)

4 -X-master-at: 37023ba381b6d251d7140a997b39b566dbc63c42

5 -X-next-at: 063f6400bc25ef9c258bf5470b0d2f8188f104b5

3 +Subject: What's cooking in git.git (Oct 2015, #07; Fri, 30)

4 +X-master-at: 2635c2b8bfc9aec07b7f023d8e3b3d02df715344

5 +X-next-at: 3dda608c19069845846bd7fd57000a99f97b9c9d

6

7 -What's cooking in git.git (Oct 2015, #06; Mon, 26)

7 +What's cooking in git.git (Oct 2015, #07; Fri, 30)

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

9

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

@@ -24,179 +24,319 @@ of the repositories listed at

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

25 [Graduated to "master"]

26

27 -* dk/p4-import-ctypes (2015-10-20) 1 commit

28 - (merged to 'next' on 2015-10-22 at 5760144)

29 - + git-p4: import the ctypes module

27 +* ar/clone-dissociate (2015-10-22) 1 commit

28 + (merged to 'next' on 2015-10-23 at 6bf746f)

29 + + clone: allow "--dissociate" without reference

30

31 - "git-p4" tried to use from ctypes module without first importing

32 - it.

31 + "git clone --dissociate" used to require that "--reference" was

32 + used at the same time, but you can create a new repository that

33 + borrows objects from another without using "--reference", namely

34 + with "clone --local" from a repository that borrows objects from

35 + other repositories.

36

37

35 -* dt/t7063-fix-flaky-test (2015-10-19) 1 commit

36 - (merged to 'next' on 2015-10-20 at 156af72)

37 - + t7063: fix flaky untracked-cache test

38 +* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit

39 + (merged to 'next' on 2015-10-22 at 15eb519)

40 + + name-hash: don't reuse cache_entry in dir_entry

41

42 + The name-hash subsystem that is used to cope with case insensitive

43 + filesystems keeps track of directories and their on-filesystem

44 + cases for all the paths in the index by holding a pointer to a

45 + randomly chosen cache entry that is inside the directory (for its

46 + ce->ce_name component). This pointer was not updated even when the

47 + cache entry was removed from the index, leading to use after free.

48 + This was fixed by recording the path for each directory instead of

49 + borrowing cache entries and restructuring the API somewhat.

50

40 -* es/worktree-add (2015-10-18) 1 commit

41 - (merged to 'next' on 2015-10-20 at ccadb70)

42 - + worktree: usage: denote <branch> as optional with 'add'

51

52 +* gr/rebase-i-drop-warn (2015-10-28) 2 commits

53 + (merged to 'next' on 2015-10-29 at 4bfda25)

54 + + rebase-i: work around Windows CRLF line endings

55 + + t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

56

45 -* jc/am-3-fallback-regression-fix (2015-10-09) 1 commit

46 - (merged to 'next' on 2015-10-15 at 7dde994)

47 - + am -3: do not let failed merge from completing the error codepath

48 - (this branch is used by js/am-3-merge-recursive-direct.)

57 + Recent update to "rebase -i" that tries to sanity check the edited

58 + insn sheet before it uses it has become too picky on Windows where

59 + CRLF left by the editor is turned into a trailing CR on the line

60 + read via the "read" built-in command.

61

50 - "git am -3" had a small regression where it is aborted in its error

51 - handling codepath when underlying merge-recursive failed in certain

52 - ways, as it assumed that the internal call to merge-recursive will

53 - never die, which is not the case (yet).

62

63 +* jc/add-u-A-default-to-top (2015-10-24) 1 commit

64 + (merged to 'next' on 2015-10-29 at 15aea9c)

65 + + add: simplify -u/-A without pathspec

66 +

67 + "git --literal-pathspecs add -u/-A" without any command line

68 + argument misbehaved ever since Git 2.0.

69

56 -* jc/usage-stdin (2015-10-16) 1 commit

57 - (merged to 'next' on 2015-10-20 at 937d4aa)

58 - + usage: do not insist that standard input must come from a file

70

60 - The synopsis text and the usage string of subcommands that read

61 - list of things from the standard input are often shown as if they

62 - only take input from a file on a filesystem, which was misleading.

71 +* jc/am-mailinfo-direct (2015-10-21) 1 commit

72 + (merged to 'next' on 2015-10-22 at ca15014)

73 + + am: make direct call to mailinfo

74 + (this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)

75 +

76 + "git am" used to spawn "git mailinfo" via run_command() API once

77 + per each patch, but learned to make a direct call to mailinfo()

78 + instead.

79 +

80 +

81 +* jc/em-dash-in-doc (2015-10-22) 1 commit

82 + (merged to 'next' on 2015-10-23 at 31a08ce)

83 + + Documentation: AsciiDoc spells em-dash as double-dashes, not triple

84

85 + AsciiDoc markup fixes.

86

65 -* jk/repository-extension (2015-06-24) 2 commits

66 - (merged to 'next' on 2015-10-22 at 116c8ce)

67 - + introduce "preciousObjects" repository extension

68 - + introduce "extensions" form of core.repositoryformatversion

87

70 - Prepare for Git on-disk repository representation to undergo

71 - backward incompatible changes by introducing a new repository

72 - format version "1", with an extension mechanism.

88 +* jc/everyday-markup (2015-10-22) 1 commit

89 + (merged to 'next' on 2015-10-22 at 0a2702d)

90 + + Documentation/everyday: match undefline with the text

91

92 + AsciiDoc markup fixes.

93

75 -* kn/for-each-tag (2015-10-18) 1 commit

76 - (merged to 'next' on 2015-10-20 at 7afd374)

77 - + tag.c: use the correct algorithm for the '--contains' option

94

79 - Recent update to "git tag --contains" caused a performance

80 - regression.

95 +* jc/mailinfo-lib (2015-10-21) 34 commits

96 + (merged to 'next' on 2015-10-22 at 405bd66)

97 + + mailinfo: remove calls to exit() and die() deep in the callchain

98 + + mailinfo: handle charset conversion errors in the caller

99 + + mailinfo: libify

100 + + mailinfo: keep the parsed log message in a strbuf

101 + + mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak

102 + + mailinfo: move content/content_top to struct mailinfo

103 + + mailinfo: move [ps]_hdr_data to struct mailinfo

104 + + mailinfo: move cmitmsg and patchfile to struct mailinfo

105 + + mailinfo: move charset to struct mailinfo

106 + + mailinfo: move transfer_encoding to struct mailinfo

107 + + mailinfo: move check for metainfo_charset to convert_to_utf8()

108 + + mailinfo: move metainfo_charset to struct mailinfo

109 + + mailinfo: move use_scissors and use_inbody_headers to struct mailinfo

110 + + mailinfo: move add_message_id and message_id to struct mailinfo

111 + + mailinfo: move patch_lines to struct mailinfo

112 + + mailinfo: move filter/header stage to struct mailinfo

113 + + mailinfo: move global "FILE *fin, *fout" to struct mailinfo

114 + + mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo

115 + + mailinfo: introduce "struct mailinfo" to hold globals

116 + + mailinfo: move global "line" into mailinfo() function

117 + + mailinfo: do not let find_boundary() touch global "line" directly

118 + + mailinfo: do not let handle_boundary() touch global "line" directly

119 + + mailinfo: do not let handle_body() touch global "line" directly

120 + + mailinfo: get rid of function-local static states

121 + + mailinfo: move definition of MAX_HDR_PARSED closer to its use

122 + + mailinfo: move cleanup_space() before its users

123 + + mailinfo: move check_header() after the helpers it uses

124 + + mailinfo: move read_one_header_line() closer to its callers

125 + + mailinfo: move handle_boundary() lower

126 + + mailinfo: plug strbuf leak during continuation line handling

127 + + mailinfo: explicitly close file handle to the patch output

128 + + mailinfo: fix an off-by-one error in the boundary stack

129 + + mailinfo: fold decode_header_bq() into decode_header()

130 + + mailinfo: remove a no-op call convert_to_utf8(it, "")

131 + (this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)

132

133 + The implementation of "git mailinfo" was refactored so that a

134 + mailinfo() function can be directly called from inside a process.

135

83 -* mr/worktree-list (2015-10-08) 5 commits

84 - (merged to 'next' on 2015-10-20 at 7cb272d)

85 - + worktree: add 'list' command

86 - + worktree: add details to the worktree struct

87 - + worktree: add a function to get worktree details

88 - + worktree: refactor find_linked_symref function

89 - + worktree: add top-level worktree.c

136

91 - Add the "list" subcommand to "git worktree".

137 +* jk/delete-modechange-conflict (2015-10-26) 3 commits

138 + (merged to 'next' on 2015-10-29 at 59ce69d)

139 + + merge: detect delete/modechange conflict

140 + + t6031: generalize for recursive and resolve strategies

141 + + t6031: move triple-rename test to t3030

142

143 + Merging a branch that removes a path and another that changes the

144 + mode bits on the same path should have conflicted at the path, but

145 + it didn't and silently favoured the removal.

146

94 -* rt/placeholder-in-usage (2015-10-16) 1 commit

95 - (merged to 'next' on 2015-10-20 at 5189b23)

96 - + am, credential-cache: add angle brackets to usage string

147

98 - A couple of commands still showed "[options]" in their usage string

99 - to note where options should come on their command line, but we

100 - spell that "[<options>]" in most places these days.

148 +* jk/merge-file-exit-code (2015-10-29) 1 commit

149 + (merged to 'next' on 2015-10-29 at 6ae613f)

150 + + merge-file: clamp exit code to maximum 127

151

152 + "git merge-file" tried to signal how many conflicts it found, which

153 + obviously would not work well when there are too many of them.

154

103 -* tk/stripspace (2015-10-16) 2 commits

104 - (merged to 'next' on 2015-10-20 at 327a997)

105 - + stripspace: use parse-options for command-line parsing

106 - + strbuf: make stripspace() part of strbuf

155

108 - The internal stripspace() function has been moved to where it

109 - logically belongs to, i.e. strbuf API, and the command line parser

110 - of "git stripspace" has been updated to use the parse_options API.

156 +* jk/war-on-sprintf (2015-10-23) 2 commits

157 + (merged to 'next' on 2015-10-23 at 3a94851)

158 + + compat/mingw.c: remove printf format warning

159 + + read_branches_file: plug a FILE* leak

160

112 ---------------------------------------------------

113 -[New Topics]

161

115 -* gr/rebase-i-drop-warn (2015-10-26) 1 commit

116 - - rebase-i: work around Windows CRLF line endings

162 +* js/imap-send-curl-compilation-fix (2015-10-26) 1 commit

163 + (merged to 'next' on 2015-10-29 at 9c4f3eb)

164 + + imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available

165

118 - Recent update to "rebase -i" that tries to sanity check the edited

119 - insn sheet before it uses it has become too picky on Windows where

120 - CRLF left by the editor is turned into a trailing CR on the line

121 - read via the "read" built-in command.

166 + "git imap-send" did not compile well with older version of cURL library.

167

123 - Waiting for comments.

168

169 +* js/misc-fixes (2015-10-26) 3 commits

170 + (merged to 'next' on 2015-10-29 at 8990f29)

171 + + Correct fscanf formatting string for I64u values

172 + + Silence GCC's "cast of pointer to integer of a different size" warning

173 + + Squelch warning about an integer overflow

174

126 -* jc/add-u-A-default-to-top (2015-10-24) 1 commit

127 - - add: simplify -u/-A without pathspec

175 + Various compilation fixes and squelching of warnings.

176

129 - "git --literal-pathspecs add -u/-A" without any command line

130 - argument misbehaved ever since Git 2.0.

177

132 - Waiting for comments.

178 +* mk/blame-error-message (2015-10-26) 1 commit

179 + (merged to 'next' on 2015-10-29 at 82a1b18)

180 + + blame: fix option name in error message

181

182 + The error message from "git blame --contents --reverse" incorrectly

183 + talked about "--contents --children".

184

135 -* jk/delete-modechange-conflict (2015-10-26) 3 commits

136 - - merge: detect delete/modechange conflict

137 - - t6031: generalize for recursive and resolve strategies

138 - - t6031: move triple-rename test to t3030

185

140 - Merging a branch that removes a path and another that changes the

141 - mode bits on the same path should have conflicted at the path, but

142 - it didn't and silently favoured the removal.

186 +* rp/link-curl-before-ssl (2015-10-21) 3 commits

187 + (merged to 'next' on 2015-10-22 at dad4fc6)

188 + + configure.ac: detect ssl need with libcurl

189 + + Makefile: make curl-config path configurable

190 + + Makefile: link libcurl before zlib

191

144 - Will merge to 'next'.

192 + The linkage order of libraries was wrong in places around libcurl.

193

194

147 -* jk/war-on-sprintf (2015-10-23) 2 commits

148 - (merged to 'next' on 2015-10-23 at 3a94851)

149 - + compat/mingw.c: remove printf format warning

150 - + read_branches_file: plug a FILE* leak

195 +* rs/pop-commit (2015-10-26) 1 commit

196 + (merged to 'next' on 2015-10-29 at f24d8ed)

197 + + use pop_commit() for consuming the first entry of a struct commit_list

198

152 - Will merge to 'master'.

199 + Code simplification.

200

201

155 -* js/imap-send-curl-compilation-fix (2015-10-26) 1 commit

156 - - imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available

202 +* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits

203 + (merged to 'next' on 2015-10-22 at b049f0a)

204 + + shallow: remove unused #include "sigchain.h"

205 + + read-cache: remove unused #include "sigchain.h"

206 + + diff: remove unused #include "sigchain.h"

207 + + credential-cache--daemon: remove unused #include "sigchain.h"

208

158 - "git imap-send" did not compile well with older version of cURL library.

209 + Remove no-longer used #include.

210

160 - Will merge to 'next'.

211

212 +* xf/user-manual-ff (2015-10-26) 1 commit

213 + (merged to 'next' on 2015-10-29 at 488c4f8)

214 + + user-manual: fix the description of fast-forward

215

163 -* js/misc-fixes (2015-10-26) 3 commits

164 - - Correct fscanf formatting string for I64u values

165 - - Silence GCC's "cast of pointer to integer of a different size" warning

166 - - Squelch warning about an integer overflow

216

168 - Various compilation fixes and squelching of warnings.

217 +* xf/user-manual-markup (2015-10-22) 3 commits

218 + (merged to 'next' on 2015-10-22 at cd33c83)

219 + + Documentation: match undefline with the text in old release notes

220 + + Documentation: match underline with the text

221 + + Documentation: fix header markup

222

170 - Will merge to 'next'.

223 + AsciiDoc markup fixes.

224

225 +--------------------------------------------------

226 +[New Topics]

227

173 -* mk/blame-error-message (2015-10-26) 1 commit

174 - - blame: fix option name in error message

228 +* sb/submodule-parallel-update (2015-10-29) 9 commits

229 + - clone: allow an explicit argument for parallel submodule clones

230 + - submodule update: expose parallelism to the user

231 + - git submodule update: have a dedicated helper for cloning

232 + - fetching submodules: respect `submodule.jobs` config option

233 + - submodule config: update parse_config()

234 + - submodule config: remove name_and_item_from_var

235 + - submodule config: keep update strategy around

236 + - run_processes_parallel: add output to tracing messages

237 + - Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update

238 + (this branch uses sb/submodule-parallel-fetch.)

239

176 - Will merge to 'next'.

240 + Builds on top of the "fetch --recurse-submodules" work to introduce

241 + parallel downloading into multiple submodules for "submodule update".

242

243 + Waiting for reviews.

244

179 -* pt/http-socks-proxy (2015-10-26) 1 commit

180 - - remote-http(s): support SOCKS proxies

245

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

246 +* jc/strbuf-gets (2015-10-28) 17 commits

247 + - test-sha1-array: read command stream with strbuf_gets()

248 + - grep: read -f file with strbuf_gets()

249 + - send-pack: read list of refs with strbuf_gets()

250 + - column: read lines with strbuf_gets()

251 + - cat-file: read batch stream with strbuf_gets()

252 + - transport-helper: read helper response with strbuf_gets()

253 + - clone/sha1_file: read info/alternates with strbuf_gets()

254 + - remote.c: read $GIT_DIR/remotes/* with strbuf_gets()

255 + - ident.c: read /etc/mailname with strbuf_gets()

256 + - rev-parse: read parseopt spec with strbuf_gets()

257 + - revision: read --stdin with strbuf_gets()

258 + - hash-object: read --stdin-paths with strbuf_gets()

259 + - mktree: read textual tree representation with strbuf_gets()

260 + - update-index: read list of paths with strbuf_gets() under --stdin

261 + - update-index: read --index-info with strbuf_gets()

262 + - check-attr, check-ignore, checkout-index: read paths with strbuf_gets()

263 + - strbuf: add strbuf_gets()

264

184 - Will merge to 'next'.

265 + Teach codepaths that communicate with users by reading text files

266 + to be more lenient to editors that write CRLF-terminated lines.

267 + Note that this is only about communication with Git, like feeding

268 + list of object names from the standard input instead of from the

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

270

271 + Waiting for reviews.

272

187 -* rs/pop-commit (2015-10-26) 1 commit

188 - - use pop_commit() for consuming the first entry of a struct commit_list

273

190 - Code simplification.

274 +* eg/p4-submit-catch-failure (2015-10-30) 1 commit

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

276 +

277 + Just like the working tree is cleaned up when the user cancelled

278 + submission in P4Submit.applyCommit(), clean up the mess if "p4

279 + submit" fails.

280 +

281 + Needs an update to test.

282 +

283 +

284 +* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit

285 + - add_submodule_odb: initialize alt_odb list earlier

286 +

287 + We peek objects from submodule's object store by linking it to the

288 + list of alternate object databases, but the code to do so forgot to

289 + correctly initialize the list.

290

291 Will merge to 'next'.

292

293

195 -* xf/user-manual-ff (2015-10-26) 1 commit

196 - - user-manual: fix the description of fast-forward

294 +* ep/ident-with-getaddrinfo (2015-10-30) 1 commit

295 + - (NEEDSWORK $gmane/280507) ident.c: add support for IPv6

296 +

297 + A build without NO_IPv6 used to use gethostbyname() when guessing

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

299 + codepaths in such a build.

300 +

301 + Waiting for a reroll.

302 + ($gmane/280507)

303 +

304 +

305 +* js/git-gdb (2015-10-30) 1 commit

306 + - test: facilitate debugging Git executables in tests with gdb

307 +

308 + Allow easier debugging of a single "git" invocation in our test

309 + scripts.

310

311 Will merge to 'next'.

312

313 +

314 +* kn/for-each-branch (2015-10-30) 1 commit

315 + - ref-filter: fallback on alphabetical comparison

316 +

317 + Using the timestamp based criteria in "git branch --sort" did not

318 + tiebreak branches that point at commits with the same timestamp (or

319 + the same commit), making the resulting output unstable.

320 +

321 + Will merge to 'next' and then quickly to 'master'.

322 +

323 +

324 +* ea/checkout-progress (2015-10-30) 2 commits

325 + - SQUASH???

326 + - checkout: add --progress option

327 +

328 + "git checkout" did not follow the usual "--[no-]progress"

329 + convention and implemented only "--quiet" that is essentially

330 + "--no-progress".

331 +

332 + Waiting for a reroll.

333 +

334 +

335 +* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit

336 + - test: accept death by SIGPIPE as a valid failure mode

337 +

338 + Waiting for reviews.

339 +

340 --------------------------------------------------

341 [Stalled]

342

@@ -283,85 +423,25 @@ of the repositories listed at

423 --------------------------------------------------

424 [Cooking]

425

286 -* ar/clone-dissociate (2015-10-22) 1 commit

287 - (merged to 'next' on 2015-10-23 at 6bf746f)

288 - + clone: allow "--dissociate" without reference

289 -

290 - "git clone --dissociate" used to require that "--reference" was

291 - used at the same time, but you can create a new repository that

292 - borrows objects from another without using "--reference", namely

293 - with "clone --local" from a repository that borrows objects from

294 - other repositories.

295 -

296 - Will merge to 'master'.

297 -

298 -

299 -* da/difftool (2015-10-21) 1 commit

300 - - difftool: gracefully handle symlinks to directories

301 -

302 - The code to reuse checked out files for comparison was too

303 - aggressive and forgot that symbolic links cannot be reused

304 - for comparison.

305 -

306 - Smells wrong that this special-cases based on the target of

307 - symbolic link.

308 -

309 -

310 -* dt/name-hash-dir-entry-fix (2015-10-21) 1 commit

311 - (merged to 'next' on 2015-10-22 at 15eb519)

312 - + name-hash: don't reuse cache_entry in dir_entry

313 -

314 - The name-hash subsystem that is used to cope with case insensitive

315 - filesystems keeps track of directories and their on-filesystem

316 - cases for all the paths in the index by holding a pointer to a

317 - randomly chosen cache entry that is inside the directory (for its

318 - ce->ce_name component). This pointer was not updated even when the

319 - cache entry was removed from the index, leading to use after free.

320 - This was fixed by recording the path for each directory instead of

321 - borrowing cache entries and restructuring the API somewhat.

322 -

323 - Will merge to 'master'.

324 -

325 -

326 -* jc/everyday-markup (2015-10-22) 1 commit

327 - (merged to 'next' on 2015-10-22 at 0a2702d)

328 - + Documentation/everyday: match undefline with the text

329 -

330 - AsciiDoc markup fixes.

331 -

332 - Will merge to 'master'.

333 -

334 -

335 -* tk/sigchain-unnecessary-post-tempfile (2015-10-22) 4 commits

336 - (merged to 'next' on 2015-10-22 at b049f0a)

337 - + shallow: remove unused #include "sigchain.h"

338 - + read-cache: remove unused #include "sigchain.h"

339 - + diff: remove unused #include "sigchain.h"

340 - + credential-cache--daemon: remove unused #include "sigchain.h"

341 -

342 - Remove no-longer used #include.

343 -

344 - Will merge to 'master'.

345 -

346 -

347 -* xf/user-manual-markup (2015-10-22) 3 commits

348 - (merged to 'next' on 2015-10-22 at cd33c83)

349 - + Documentation: match undefline with the text in old release notes

350 - + Documentation: match underline with the text

351 - + Documentation: fix header markup

426 +* pt/http-socks-proxy (2015-10-26) 1 commit

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

428

353 - AsciiDoc markup fixes.

429 + Add support for talking http/https over socks proxy.

430

355 - Will merge to 'master'.

431 + Will merge to 'next'.

432

433

358 -* jc/em-dash-in-doc (2015-10-22) 1 commit

359 - (merged to 'next' on 2015-10-23 at 31a08ce)

360 - + Documentation: AsciiDoc spells em-dash as double-dashes, not triple

434 +* da/difftool (2015-10-29) 1 commit

435 + - difftool: ignore symbolic links in use_wt_file

436

362 - AsciiDoc markup fixes.

437 + The code to prepare the working tree side of temporary directory

438 + for the "dir-diff" feature forgot that symbolic links need not be

439 + copied (or symlinked) to the temporary area, as the code already

440 + special cases and overwrites them. Besides, it was wrong to try

441 + computing the object name of the target of symbolic link, which may

442 + not even exist or may be a directory.

443

364 - Will merge to 'master'.

444 + Waiting for response.

445

446

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

@@ -416,13 +496,11 @@ of the repositories listed at

496 backend implementation(s) and then finally plug a new backend that

497 is different from the file backend.

498

419 - Expecting a reroll after an review of the remainder.

420 - ($gmane/279897).

499 + Reroll exists, but haven't picked up yet.

500

501

502 * jc/mailinfo (2015-10-21) 1 commit

503 - mailinfo: ignore in-body header that we do not care about

425 - (this branch uses jc/am-mailinfo-direct and jc/mailinfo-lib.)

504

505 Some people write arbitrary garbage at the beginning of a piece of

506 e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log

@@ -436,62 +514,6 @@ of the repositories listed at

514 Comments?

515

516

439 -* jc/am-mailinfo-direct (2015-10-21) 1 commit

440 - (merged to 'next' on 2015-10-22 at ca15014)

441 - + am: make direct call to mailinfo

442 - (this branch is used by jc/mailinfo; uses jc/mailinfo-lib.)

443 -

444 - "git am" used to spawn "git mailinfo" via run_command() API once

445 - per each patch, but learned to make a direct call to mailinfo()

446 - instead.

447 -

448 - Will merge to 'master'.

449 -

450 -

451 -* jc/mailinfo-lib (2015-10-21) 34 commits

452 - (merged to 'next' on 2015-10-22 at 405bd66)

453 - + mailinfo: remove calls to exit() and die() deep in the callchain

454 - + mailinfo: handle charset conversion errors in the caller

455 - + mailinfo: libify

456 - + mailinfo: keep the parsed log message in a strbuf

457 - + mailinfo: handle_commit_msg() shouldn't be called after finding patchbreak

458 - + mailinfo: move content/content_top to struct mailinfo

459 - + mailinfo: move [ps]_hdr_data to struct mailinfo

460 - + mailinfo: move cmitmsg and patchfile to struct mailinfo

461 - + mailinfo: move charset to struct mailinfo

462 - + mailinfo: move transfer_encoding to struct mailinfo

463 - + mailinfo: move check for metainfo_charset to convert_to_utf8()

464 - + mailinfo: move metainfo_charset to struct mailinfo

465 - + mailinfo: move use_scissors and use_inbody_headers to struct mailinfo

466 - + mailinfo: move add_message_id and message_id to struct mailinfo

467 - + mailinfo: move patch_lines to struct mailinfo

468 - + mailinfo: move filter/header stage to struct mailinfo

469 - + mailinfo: move global "FILE *fin, *fout" to struct mailinfo

470 - + mailinfo: move keep_subject & keep_non_patch_bracket to struct mailinfo

471 - + mailinfo: introduce "struct mailinfo" to hold globals

472 - + mailinfo: move global "line" into mailinfo() function

473 - + mailinfo: do not let find_boundary() touch global "line" directly

474 - + mailinfo: do not let handle_boundary() touch global "line" directly

475 - + mailinfo: do not let handle_body() touch global "line" directly

476 - + mailinfo: get rid of function-local static states

477 - + mailinfo: move definition of MAX_HDR_PARSED closer to its use

478 - + mailinfo: move cleanup_space() before its users

479 - + mailinfo: move check_header() after the helpers it uses

480 - + mailinfo: move read_one_header_line() closer to its callers

481 - + mailinfo: move handle_boundary() lower

482 - + mailinfo: plug strbuf leak during continuation line handling

483 - + mailinfo: explicitly close file handle to the patch output

484 - + mailinfo: fix an off-by-one error in the boundary stack

485 - + mailinfo: fold decode_header_bq() into decode_header()

486 - + mailinfo: remove a no-op call convert_to_utf8(it, "")

487 - (this branch is used by jc/am-mailinfo-direct and jc/mailinfo.)

488 -

489 - The implementation of "git mailinfo" was refactored so that a

490 - mailinfo() function can be directly called from inside a process.

491 -

492 - Will merge to 'master'.

493 -

494 -

517 * js/am-3-merge-recursive-direct (2015-10-12) 2 commits

518 (merged to 'next' on 2015-10-23 at dc631e5)

519 + am: make a direct call to merge_recursive

@@ -501,7 +523,7 @@ of the repositories listed at

523 call from inside a process. "git am -3" was taught to make a direct

524 call to the function when falling back to three-way merge.

525

504 - Will cook in 'next'.

526 + Will keep in 'next' during the 2.7 cycle.

527

528

529 * sg/pretty-more-date-mode-format (2015-10-07) 1 commit

@@ -531,17 +553,6 @@ of the repositories listed at

553 ($gmane/278926)

554

555

534 -* rp/link-curl-before-ssl (2015-10-21) 3 commits

535 - (merged to 'next' on 2015-10-22 at dad4fc6)

536 - + configure.ac: detect ssl need with libcurl

537 - + Makefile: make curl-config path configurable

538 - + Makefile: link libcurl before zlib

539 -

540 - The linkage order of libraries was wrong in places around libcurl.

541 -

542 - Will merge to 'master'.

543 -

544 -

556 * jk/graph-format-padding (2015-09-14) 1 commit

557 - pretty: pass graph width to pretty formatting for use in '%>|(N)'

558

@@ -561,11 +572,7 @@ of the repositories listed at

572 ($gmane/278326)

573

574

564 -* sb/submodule-parallel-fetch (2015-10-23) 18 commits

565 - - (NEEDSWORK) clone: allow an explicit argument for parallel submodule clones

566 - - submodule update: expose parallelism to the user

567 - - git submodule update: have a dedicated helper for cloning

568 - - submodule config: keep update strategy around

575 +* sb/submodule-parallel-fetch (2015-10-21) 14 commits

576 (merged to 'next' on 2015-10-23 at 8f04bbd)

577 + run-command: fix missing output from late callbacks

578 + test-run-command: increase test coverage

@@ -582,6 +589,7 @@ of the repositories listed at

589 + xread_nonblock: add functionality to read from fds without blocking

590 + xread: poll on non blocking fds

591 + submodule.c: write "Fetching submodule <foo>" to stderr

592 + (this branch is used by sb/submodule-parallel-update.)

593

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

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

@@ -617,8 +625,10 @@ of the repositories listed at

625

626 Originally merged to 'next' on 2015-05-28

627

620 - Stop supporting "git merge <message> HEAD <commit>" syntax that

621 - has been deprecated since October 2007.

628 + Stop supporting "git merge <message> HEAD <commit>" syntax that has

629 + been deprecated since October 2007. It has been reported that

630 + git-gui still uses the deprecated syntax, which needs to be fixed

631 + before this final step can proceed.

632

633 Will keep in 'next' during the 2.7 cycle.

634

What's cooking (2015/10 #07)