0d90f175f1 · 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 (Aug 2019, #04; Wed, 14)

4 -X-master-at: ff66981f4593aec0f3b3eeace0eacb7dbe44fd8c

5 -X-next-at: e5444969c986fc1503282c63d33931021c78d991

3 +Subject: What's cooking in git.git (Aug 2019, #05; Wed, 21)

4 +X-master-at: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9

5 +X-next-at: 17f5b7556cbe9867bed85982f386e41d9db77e19

6

7 -What's cooking in git.git (Aug 2019, #04; Wed, 14)

7 +What's cooking in git.git (Aug 2019, #05; Wed, 21)

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

9

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

@@ -12,15 +12,11 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -We have a handful of topics in 'next', but as far as I can tell,

16 -there is not anything that is so urgent and needs to go in the

17 -upcoming release. Hence the upcoming 2.23 release would hopefully

18 -be pretty much the same as the tip of the 'master' as of today.

19 -

20 -Unless we find something else that is glaringly wrong there in the

21 -next few days, that is. But in such a case it is likely we'd need

22 -to delay the release to deal with the issue. Let's hope there isn't

23 -such a serious regression.

15 +The first batch of topics post 2.23 will be merged to 'master' and

16 +'next' will be rewound to become empty, soon. After that, 'next'

17 +will grow merging only smaller fixes and cleanup topics first.

18 +Bigger stuff will then follow after the dust settles. All of the

19 +above hopefully will happen before the end of the month.

20

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

22 of the repositories listed at

@@ -28,191 +24,263 @@ of the repositories listed at

24 http://git-blame.blogspot.com/p/git-public-repositories.html

25

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

31 -[Graduated to "master"]

27 +[New Topics]

28

33 -* bc/hash-independent-tests-part-4 (2019-08-08) 2 commits

34 - (merged to 'next' on 2019-08-08 at fd54f4fafc)

35 - + t0000: reword comments for "local" test

36 - + t: decrease nesting in test_oid_to_path

29 +* cb/curl-use-xmalloc (2019-08-15) 1 commit

30 + - http: use xmalloc with cURL

31 + (this branch uses jk/drop-release-pack-memory.)

32

38 - Test fix.

33 + Tell cURL library to use the same malloc() implementation, with the

34 + xmalloc() wrapper, as the rest of the system, for consistency.

35

36 + Will merge to 'next'.

37

41 -* ds/commit-graph-incremental (2019-08-07) 1 commit

42 - (merged to 'next' on 2019-08-07 at 9094f5b305)

43 - + commit-graph: release strbufs after use

38

45 - Leakfix.

39 +* sg/diff-indent-heuristic-non-experimental (2019-08-15) 1 commit

40 + - diff: 'diff.indentHeuristic' is no longer experimental

41

42 + We promoted the "indent heuristics" that decides where to split

43 + diff hunks from experimental to the default a few years ago, but

44 + some stale documentation still marked it as experimental, which has

45 + been corrected.

46

48 -* ds/commit-graph-octopus-fix (2019-08-05) 1 commit

49 - (merged to 'next' on 2019-08-07 at 9f8eaf7c4e)

50 - + commit-graph: fix bug around octopus merges

47 + Will merge to 'next'.

48

52 - commit-graph did not handle commits with more than two parents

53 - correctly, which has been corrected.

49

50 +* en/checkout-mismerge-fix (2019-08-16) 1 commit

51 + - checkout: remove duplicate code

52

56 -* en/disable-dir-rename-in-recursive-merge (2019-08-06) 1 commit

57 - (merged to 'next' on 2019-08-07 at f1efcbfd99)

58 - + merge-recursive: avoid directory rename detection in recursive case

53 + Fix a mismerge that happened in 2.22 timeframe.

54

60 - "merge-recursive" hit a BUG() when building a virtual merge base

61 - detected a directory rename.

55 + Will merge to 'next'.

56

57

64 -* ja/l10n-fixes (2019-08-06) 1 commit

65 - (merged to 'next' on 2019-08-07 at 24aa435a4b)

66 - + l10n: reformat some localized strings for v2.23.0

58 +* en/merge-recursive-cleanup (2019-08-19) 24 commits

59 + - merge-recursive: alphabetize include list

60 + - merge-recursive: add sanity checks for relevant merge_options

61 + - merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*

62 + - merge-recursive: split internal fields into a separate struct

63 + - merge-recursive: avoid losing output and leaking memory holding that output

64 + - merge-recursive: comment and reorder the merge_options fields

65 + - merge-recursive: consolidate unnecessary fields in merge_options

66 + - merge-recursive: move some definitions around to clean up the header

67 + - merge-recursive: rename merge_options argument to opt in header

68 + - merge-recursive: rename 'mrtree' to 'result_tree', for clarity

69 + - merge-recursive: use common name for ancestors/common/base_list

70 + - merge-recursive: fix some overly long lines

71 + - cache-tree: share code between functions writing an index as a tree

72 + - merge-recursive: don't force external callers to do our logging

73 + - merge-recursive: remove useless parameter in merge_trees()

74 + - merge-recursive: exit early if index != head

75 + - Ensure index matches head before invoking merge machinery, round N

76 + - merge-recursive: remove another implicit dependency on the_repository

77 + - merge-recursive: future-proof update_file_flags() against memory leaks

78 + - merge-recursive: introduce an enum for detect_directory_renames values

79 + - merge-recursive: provide a better label for diff3 common ancestor

80 + - merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()

81 + - checkout: provide better conflict hunk description with detached HEAD

82 + - merge-recursive: be consistent with assert

83 +

84 + The merge-recursive machiery is one of the most complex parts of

85 + the system that accumulated cruft over time. This large series

86 + cleans up the implementation quite a bit.

87

68 - A few messages have been updated to help localization better.

88 + Will merge to 'next'.

89

90

71 -* mr/doc-can-not-to-cannot (2019-08-05) 1 commit

72 - (merged to 'next' on 2019-08-07 at 128135f4e4)

73 - + doc: typo: s/can not/cannot/ and s/is does/does/

91 +* bc/hash-independent-tests-part-5 (2019-08-20) 14 commits

92 + - t4009: make hash size independent

93 + - t4002: make hash independent

94 + - t4000: make hash size independent

95 + - t3903: abstract away SHA-1-specific constants

96 + - t3800: make hash-size independent

97 + - t3600: make hash size independent

98 + - t3506: make hash independent

99 + - t3430: avoid hard-coded object IDs

100 + - t3404: abstract away SHA-1-specific constants

101 + - t3306: abstract away SHA-1-specific constants

102 + - t3305: make hash size independent

103 + - t3301: abstract away SHA-1-specific constants

104 + - t3206: abstract away hash size constants

105 + - t3201: abstract away SHA-1-specific constants

106 +

107 + Preparation for SHA-256 upgrade continues in the test department.

108

75 - Docfix.

109 + Expecting a reroll.

110 + cf. <20190818203417.GG365197@genre.crustytoothpaste.net>

111 +

112 +

113 +* bc/object-id-part17 (2019-08-19) 26 commits

114 + - midx: switch to using the_hash_algo

115 + - builtin/show-index: replace sha1_to_hex

116 + - rerere: replace sha1_to_hex

117 + - builtin/receive-pack: replace sha1_to_hex

118 + - builtin/index-pack: replace sha1_to_hex

119 + - packfile: replace sha1_to_hex

120 + - wt-status: convert struct wt_status to object_id

121 + - cache: remove null_sha1

122 + - builtin/worktree: switch null_sha1 to null_oid

123 + - builtin/repack: write object IDs of the proper length

124 + - pack-write: use hash_to_hex when writing checksums

125 + - sequencer: convert to use the_hash_algo

126 + - bisect: switch to using the_hash_algo

127 + - sha1-lookup: switch hard-coded constants to the_hash_algo

128 + - config: use the_hash_algo in abbrev comparison

129 + - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

130 + - bundle: switch to use the_hash_algo

131 + - connected: switch GIT_SHA1_HEXSZ to the_hash_algo

132 + - show-index: switch hard-coded constants to the_hash_algo

133 + - blame: remove needless comparison with GIT_SHA1_HEXSZ

134 + - builtin/rev-parse: switch to use the_hash_algo

135 + - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo

136 + - builtin/receive-pack: switch to use the_hash_algo

137 + - fetch-pack: use parse_oid_hex

138 + - patch-id: convert to use the_hash_algo

139 + - builtin/replace: make hash size independent

140 +

141 + Preparation for SHA-256 upgrade continues.

142 +

143 + Looked mostly OK, with a possible update.

144 + cf. <20190820223606.GJ365197@genre.crustytoothpaste.net>

145 +

146 +

147 +* bm/repository-layout-typofix (2019-08-19) 1 commit

148 + - repository-layout.txt: correct pluralization of 'object'

149 +

150 + Typofix.

151

152 + Will merge to 'next'.

153

78 -* mt/dir-iterator-updates (2019-08-07) 2 commits

79 - (merged to 'next' on 2019-08-07 at 68e9a16b4a)

80 - + test-dir-iterator: use path argument directly

81 - + dir-iterator: release strbuf after use

154

83 - Leakfix.

155 +* bw/rebase-autostash-keep-current-branch (2019-08-21) 1 commit

156 + - rebase.c: make sure the active branch isn't moved when autostashing

157

158 + "git rebase --autostash <upstream> <branch>", when <branch> is

159 + different from the current branch, incorrectly moved the tip of the

160 + current branch, which has been corrected.

161

86 -* nd/switch-and-restore (2019-08-05) 1 commit

87 - (merged to 'next' on 2019-08-07 at 6a047a8092)

88 - + restore: fix typo in docs

162

90 - Docfix.

163 +* dl/format-patch-cover-letter-subject (2019-08-21) 1 commit

164 + - format-patch: learn --infer-cover-subject option

165 + (this branch uses dl/format-patch-doc-test-cleanup.)

166

167 + "git format-patch --cover-letter" learned to optionally use the

168 + first paragraph (typically a single-liner) of branch.*.description

169 + as the subject of the cover letter.

170

93 -* rs/plug-strbuf-reak-in-read-alt-refs (2019-08-07) 1 commit

94 - (merged to 'next' on 2019-08-07 at bd704faa3e)

95 - + sha1-file: release strbuf after use

171

97 - Leakfix.

172 +* dl/format-patch-doc-test-cleanup (2019-08-21) 14 commits

173 + - config/format.txt: specify default value of format.coverLetter

174 + - SQUASH???

175 + - Doc: add more detail for git-format-patch

176 + - SQUASH???

177 + - t4014: stop losing return codes of git commands

178 + - t4014: remove confusing pipe in check_threading()

179 + - t4014: use test_line_count() where possible

180 + - t4014: drop redirections to /dev/null

181 + - t4014: use indentable here-docs

182 + - t4014: remove spaces after redirect operators

183 + - t4014: use sq for test case names

184 + - t4014: move closing sq onto its own line

185 + - t4014: s/expected/expect/

186 + - t4014: drop unnecessary blank lines from test cases

187 + (this branch is used by dl/format-patch-cover-letter-subject.)

188

99 ---------------------------------------------------

100 -[New Topics]

189 + The documentation and tests for "git format-patch" have been

190 + cleaned up.

191

102 -* py/git-gui-do-quit (2019-08-07) 2 commits

103 - - Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit

104 - - git-gui: call do_quit before destroying the main window

192

106 - "git gui" learned to call the clean-up procedure before exiting.

193 +* ds/midx-expire-repack (2019-08-20) 1 commit

194 + - packfile.h: drop extern from function declaration

195 +

196 + Code cleanup.

197

198 Will merge to 'next'.

199

200

111 -* rs/nedalloc-fixlets (2019-08-07) 2 commits

112 - (merged to 'next' on 2019-08-09 at 0e9286fb70)

113 - + nedmalloc: avoid compiler warning about unused value

114 - + nedmalloc: do assignments only after the declaration section

201 +* jt/diff-lazy-fetch-submodule-fix (2019-08-20) 1 commit

202 + - diff: skip GITLINK when lazy fetching missing objs

203

116 - Compilation fix.

204 + On-demand object fetching in lazy clone incorrectly tried to fetch

205 + commits from submodule projects, while still working in the

206 + superproject, which has been corrected.

207

118 - Will cook in 'next'.

208 + Will merge to 'next'.

209

210

121 -* jk/perf-no-dups (2019-08-12) 1 commit

122 - (merged to 'next' on 2019-08-14 at 3010a7d19f)

123 - + t/perf: rename duplicate-numbered test script

211 +* mp/for-each-ref-missing-name-or-email (2019-08-19) 1 commit

212 + - ref-filter: initialize empty name or email fields

213

125 - Test & perf scripts must use unique numeric prefix, but a pair

126 - shared the same number, which is fixed here.

214 + "for-each-ref" and friends that shows refs did not protect themselves

215 + against ancient tags that did not record tagger names when asked to

216 + show "%(taggername)", which have been corrected.

217

128 - Will cook in 'next'.

218 + May want a test or two.

219

220

131 -* en/fast-import-merge-doc (2019-08-12) 1 commit

132 - (merged to 'next' on 2019-08-14 at 65efc63345)

133 - + git-fast-import.txt: clarify that multiple merge commits are allowed

221 +* nd/diff-parseopt (2019-08-20) 1 commit

222 + - parseopt: move definition of enum parse_opt_result up

223

135 - Doc update.

224 + Compilation fix.

225

137 - Will cook in 'next'.

226 + Will merge to 'next'.

227

228

140 -* bc/reread-attributes-during-rebase (2019-08-13) 3 commits

141 - - SQUASH???

142 - - apply: reload .gitattributes after patching it

143 - - path: add a function to check for path suffix

229 +* pw/rebase-i-show-HEAD-to-reword (2019-08-19) 3 commits

230 + - sequencer: simplify root commit creation

231 + - rebase -i: check for updated todo after squash and reword

232 + - rebase -i: always update HEAD before rewording

233

145 - The "git am" based backend of "git rebase" ignored the result of

146 - updating ".gitattributes" done in one step when replaying

147 - subsequent steps.

234 + "git rebase -i" showed a wrong HEAD while "reword" open the editor.

235

149 - Will squash the tip commit in and then merge to 'next'.

236 + May want to split out the last one into a separate topic.

237 + Will merge to 'next'.

238

239

152 -* jk/drop-release-pack-memory (2019-08-13) 1 commit

153 - - packfile: drop release_pack_memory()

240 +* rs/pax-extended-header-length-fix (2019-08-19) 4 commits

241 + - archive-tar: turn length miscalculation warning into BUG

242 + - archive-tar: use size_t in strbuf_append_ext_header()

243 + - archive-tar: fix pax extended header length calculation

244 + - archive-tar: report wrong pax extended header length

245

155 - xmalloc() used to have a mechanism to ditch memory and address

156 - space resources as the last resort upon seeing an allocation

157 - failure from the underlying malloc(), which made the code complex

158 - and thread-unsafe with dubious benefit, as major memory resource

159 - users already do limit their uses with various other mechanisms.

160 - It has been simplified away.

246 + "git archive" recorded incorrect length in extended pax header in

247 + some corner cases, which has been corrected.

248

249 Will merge to 'next'.

250

251

165 -* sg/complete-configuration-variables (2019-08-13) 11 commits

166 - - completion: complete config variables and values for 'git clone --config='

167 - - completion: complete config variables names and values for 'git clone -c'

168 - - completion: complete values of configuration variables after 'git -c var='

169 - - completion: complete configuration sections and variable names for 'git -c'

170 - - completion: split _git_config()

171 - - completion: simplify inner 'case' pattern in __gitcomp()

172 - - completion: use 'sort -u' to deduplicate config variable names

173 - - completion: deduplicate configuration sections

174 - - completion: add tests for 'git config' completion

175 - - completion: complete more values of more 'color.*' configuration variables

176 - - completion: fix a typo in a comment

252 +* rs/sort-oid-array-thread-safe (2019-08-20) 1 commit

253 + - sha1-name: make sort_ambiguous_oid_array() thread-safe

254

178 - Command line completion updates for "git -c var.name=val"

255 + Prepare get_short_oid() codepath to be thread-safe.

256

257 Will merge to 'next'.

258

259

183 -* sg/worktree-remove-errormsg (2019-08-13) 1 commit

184 - (merged to 'next' on 2019-08-14 at e5444969c9)

185 - + worktree remove: clarify error message on dirty worktree

260 +* sb/userdiff-dts (2019-08-19) 1 commit

261 + - userdiff: Add a builtin pattern for dts files

262

187 - Error message update/clarification.

263 + Device-tree files learned their own userdiff patterns.

264

189 - Will cook in 'next'.

265 + Will merge to 'next'.

266

267

192 -* mt/threaded-grep-in-object-store (2019-08-13) 4 commits

193 - - grep: re-enable threads in some non-worktree cases

194 - - grep: disable grep_read_mutex when possible

195 - - grep: allow locks to be enabled individually

196 - - object-store: add lock to read_object_file_extended()

268 +* sg/line-log-tree-diff-optim (2019-08-21) 2 commits

269 + - line-log: avoid unnecessary full tree diffs

270 + - line-log: extract pathspec parsing from line ranges into a helper function

271

272 + Optimize unnecessary full-tree diff away from "git log -L" machinery.

273

199 -* pd/fetch-jobs (2019-08-13) 5 commits

200 - . fetch: make --jobs control submodules and remotes

201 - . fetch: add the --submodule-fetch-jobs option

202 - . fetch: add the fetch.jobs config key

203 - . fetch: add the "--fetch-jobs" option

204 - . fetch: rename max_children to max_children_for_submodules

274 + Will merge to 'next'.

275

206 - "git fetch --jobs" is getting taught to also run fetch jobs in

207 - parallel when fetching from multiple remote repositories.

276

277 +* tg/t0021-racefix (2019-08-21) 1 commit

278 + - t0021: make sure clean filter runs

279

210 -* cb/fetch-set-upstream (2019-08-14) 1 commit

211 - - pull, fetch: add --set-upstream option

280 + A test fix.

281 +

282 + Will merge to 'next'.

283

213 - "git fetch" learned "--set-upstream" option to help those who first

214 - clone from their private fork they intend to push to, add the true

215 - upstream via "git remote add" and then "git fetch" from it.

284

285 --------------------------------------------------

286 [Stalled]

@@ -298,6 +366,122 @@ of the repositories listed at

366 --------------------------------------------------

367 [Cooking]

368

369 +* py/git-gui-do-quit (2019-08-07) 2 commits

370 + - Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit

371 + - git-gui: call do_quit before destroying the main window

372 +

373 + "git gui" learned to call the clean-up procedure before exiting.

374 +

375 + Will merge to 'next'.

376 +

377 +

378 +* rs/nedalloc-fixlets (2019-08-07) 2 commits

379 + (merged to 'next' on 2019-08-09 at 0e9286fb70)

380 + + nedmalloc: avoid compiler warning about unused value

381 + + nedmalloc: do assignments only after the declaration section

382 +

383 + Compilation fix.

384 +

385 + Will merge to 'master'.

386 +

387 +

388 +* jk/perf-no-dups (2019-08-12) 1 commit

389 + (merged to 'next' on 2019-08-14 at 3010a7d19f)

390 + + t/perf: rename duplicate-numbered test script

391 +

392 + Test & perf scripts must use unique numeric prefix, but a pair

393 + shared the same number, which is fixed here.

394 +

395 + Will merge to 'master'.

396 +

397 +

398 +* en/fast-import-merge-doc (2019-08-12) 1 commit

399 + (merged to 'next' on 2019-08-14 at 65efc63345)

400 + + git-fast-import.txt: clarify that multiple merge commits are allowed

401 +

402 + Doc update.

403 +

404 + Will merge to 'master'.

405 +

406 +

407 +* bc/reread-attributes-during-rebase (2019-08-19) 2 commits

408 + - apply: reload .gitattributes after patching it

409 + - path: add a function to check for path suffix

410 +

411 + The "git am" based backend of "git rebase" ignored the result of

412 + updating ".gitattributes" done in one step when replaying

413 + subsequent steps.

414 +

415 + Will merge to 'next'.

416 +

417 +

418 +* jk/drop-release-pack-memory (2019-08-13) 1 commit

419 + - packfile: drop release_pack_memory()

420 + (this branch is used by cb/curl-use-xmalloc.)

421 +

422 + xmalloc() used to have a mechanism to ditch memory and address

423 + space resources as the last resort upon seeing an allocation

424 + failure from the underlying malloc(), which made the code complex

425 + and thread-unsafe with dubious benefit, as major memory resource

426 + users already do limit their uses with various other mechanisms.

427 + It has been simplified away.

428 +

429 + Will merge to 'next'.

430 +

431 +

432 +* sg/complete-configuration-variables (2019-08-13) 11 commits

433 + - completion: complete config variables and values for 'git clone --config='

434 + - completion: complete config variables names and values for 'git clone -c'

435 + - completion: complete values of configuration variables after 'git -c var='

436 + - completion: complete configuration sections and variable names for 'git -c'

437 + - completion: split _git_config()

438 + - completion: simplify inner 'case' pattern in __gitcomp()

439 + - completion: use 'sort -u' to deduplicate config variable names

440 + - completion: deduplicate configuration sections

441 + - completion: add tests for 'git config' completion

442 + - completion: complete more values of more 'color.*' configuration variables

443 + - completion: fix a typo in a comment

444 +

445 + Command line completion updates for "git -c var.name=val"

446 +

447 + Will merge to 'next'.

448 +

449 +

450 +* sg/worktree-remove-errormsg (2019-08-13) 1 commit

451 + (merged to 'next' on 2019-08-14 at e5444969c9)

452 + + worktree remove: clarify error message on dirty worktree

453 +

454 + Error message update/clarification.

455 +

456 + Will merge to 'master'.

457 +

458 +

459 +* mt/threaded-grep-in-object-store (2019-08-13) 4 commits

460 + - grep: re-enable threads in some non-worktree cases

461 + - grep: disable grep_read_mutex when possible

462 + - grep: allow locks to be enabled individually

463 + - object-store: add lock to read_object_file_extended()

464 +

465 +

466 +* pd/fetch-jobs (2019-08-13) 5 commits

467 + . fetch: make --jobs control submodules and remotes

468 + . fetch: add the --submodule-fetch-jobs option

469 + . fetch: add the fetch.jobs config key

470 + . fetch: add the "--fetch-jobs" option

471 + . fetch: rename max_children to max_children_for_submodules

472 +

473 + "git fetch --jobs" is getting taught to also run fetch jobs in

474 + parallel when fetching from multiple remote repositories.

475 +

476 +

477 +* cb/fetch-set-upstream (2019-08-19) 1 commit

478 + - pull, fetch: add --set-upstream option

479 +

480 + "git fetch" learned "--set-upstream" option to help those who first

481 + clone from their private fork they intend to push to, add the true

482 + upstream via "git remote add" and then "git fetch" from it.

483 +

484 +

485 * sg/commit-graph-validate (2019-08-05) 3 commits

486 (merged to 'next' on 2019-08-09 at 87f61abb73)

487 + commit-graph: error out on invalid commit oids in 'write --stdin-commits'

@@ -307,7 +491,7 @@ of the repositories listed at

491 The code to write commit-graph over given commit object names has

492 been made a bit more robust.

493

310 - Will cook in 'next'.

494 + Will merge to 'master'.

495

496

497 * sg/show-failed-test-names (2019-08-05) 2 commits

@@ -318,7 +502,7 @@ of the repositories listed at

502 The first line of verbose output from each test piece now carries

503 the test name and number to help scanning with eyeballs.

504

321 - Will cook in 'next'.

505 + Will merge to 'master'.

506

507

508 * js/pre-merge-commit-hook (2019-08-07) 4 commits

@@ -384,7 +568,10 @@ of the repositories listed at

568 "git pack-refs" can lose refs that are created while running, which

569 is getting corrected.

570

387 - Will cook in 'next'.

571 + Will merge to 'master'.

572 + Performance impact unclear but let's let correctness take priority

573 + for now.

574 + cf. <20190816204906.GA29853@sigill.intra.peff.net>

575

576

577 * vn/restore-empty-ita-corner-case-fix (2019-08-02) 2 commits

@@ -398,7 +585,7 @@ of the repositories listed at

585 the corresponding working tree file was empty. This has been

586 corrected.

587

401 - Will cook in 'next'.

588 + Will merge to 'master'.

589

590

591 * ds/feature-macros (2019-08-13) 6 commits

@@ -423,7 +610,7 @@ of the repositories listed at

610 files looked at the contents in the index in submodules, instead of

611 files in the working tree.

612

426 - Will cook in 'next'.

613 + Will merge to 'master'.

614

615

616 * jk/tree-walk-overflow (2019-08-01) 6 commits

@@ -438,7 +625,7 @@ of the repositories listed at

625 Codepaths to walk tree objects have been audited for integer

626 overflows and hardened.

627

441 - Will cook in 'next'.

628 + Will merge to 'master'.

629

630

631 * sg/t5510-test-i18ngrep-fix (2019-07-31) 1 commit

@@ -448,7 +635,7 @@ of the repositories listed at

635

636 Test fix.

637

451 - Will cook in 'next'.

638 + Will merge to 'master'.

639

640

641 * sg/do-not-skip-non-httpd-tests (2019-08-02) 3 commits

@@ -460,7 +647,7 @@ of the repositories listed at

647

648 Test fix.

649

463 - Will cook in 'next'.

650 + Will merge to 'master'.

651

652

653 * vn/reset-deleted-ita (2019-07-26) 1 commit

@@ -472,8 +659,8 @@ of the repositories listed at

659 Expecting a reroll.

660

661

475 -* ra/rebase-i-more-options (2019-08-13) 6 commits

476 - - rebase: add --author-date-is-committer-date

662 +* ra/rebase-i-more-options (2019-08-20) 6 commits

663 + - rebase: add --reset-author-date

664 - rebase -i: support --ignore-date

665 - sequencer: rename amend_author to author_to_rename

666 - rebase -i: support --committer-date-is-author-date

@@ -483,7 +670,7 @@ of the repositories listed at

670 "git rebase -i" learned a few options that are known by "git

671 rebase" proper.

672

486 - Almost there.

673 + Looking good.

674

675

676 * js/rebase-r-strategy (2019-07-31) 16 commits

@@ -536,27 +723,8 @@ of the repositories listed at

723 A tutorial on object enumeration.

724

725

539 -* ab/no-kwset (2019-07-01) 10 commits

540 - (merged to 'next' on 2019-07-15 at ed0479ce3d)

541 - + grep: use PCRE v2 for optimized fixed-string search

542 - + grep: remove the kwset optimization

543 - + grep: drop support for \0 in --fixed-strings <pattern>

544 - + grep: make the behavior for NUL-byte in patterns sane

545 - + grep tests: move binary pattern tests into their own file

546 - + grep tests: move "grep binary" alongside the rest

547 - + grep: inline the return value of a function call used only once

548 - + t4210: skip more command-line encoding tests on MinGW

549 - + grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"

550 - + log tests: test regex backends in "--encode=<enc>" tests

551 - (this branch is used by ab/pcre-jit-fixes.)

552 -

553 - Retire use of kwset library, which is an optimization for looking

554 - for fixed strings, with use of pcre2 JIT.

555 -

556 - Kicked out of 'next' to give the topic a chance to get rebooted.

557 -

558 -

559 -* ab/pcre-jit-fixes (2019-07-26) 7 commits

726 +* ab/pcre-jit-fixes (2019-08-19) 8 commits

727 + - grep: under --debug, show whether PCRE JIT is enabled

728 - grep: do not enter PCRE2_UTF mode on fixed matching

729 - grep: stess test PCRE v2 on invalid UTF-8 data

730 - grep: create a "is_fixed" member in "grep_pat"

@@ -639,3 +807,26 @@ of the repositories listed at

807 On hold.

808 cf. <20190508001252.15752-1-avarab@gmail.com>

809 cf. <20190719210156.GA9688@archbookpro.localdomain>

810 +

811 +

812 +--------------------------------------------------

813 +[Discarded]

814 +

815 +* ab/no-kwset (2019-07-01) 10 commits

816 + (merged to 'next' on 2019-07-15 at ed0479ce3d)

817 + + grep: use PCRE v2 for optimized fixed-string search

818 + + grep: remove the kwset optimization

819 + + grep: drop support for \0 in --fixed-strings <pattern>

820 + + grep: make the behavior for NUL-byte in patterns sane

821 + + grep tests: move binary pattern tests into their own file

822 + + grep tests: move "grep binary" alongside the rest

823 + + grep: inline the return value of a function call used only once

824 + + t4210: skip more command-line encoding tests on MinGW

825 + + grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"

826 + + log tests: test regex backends in "--encode=<enc>" tests

827 + (this branch is used by ab/pcre-jit-fixes.)

828 +

829 + Retire use of kwset library, which is an optimization for looking

830 + for fixed strings, with use of pcre2 JIT.

831 +

832 + Kicked out of 'next' to give the topic a chance to get rebooted.

What's cooking (2019/08 #05)