0eadf92077 · 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, #03; Tue, 6)

4 -X-master-at: 7c20df84bd21ec0215358381844274fa10515017

5 -X-next-at: deed80330f2f849fecaf1d22eaf715b93ef96954

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

4 +X-master-at: ff66981f4593aec0f3b3eeace0eacb7dbe44fd8c

5 +X-next-at: e5444969c986fc1503282c63d33931021c78d991

6

7 -What's cooking in git.git (Aug 2019, #03; Tue, 6)

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

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

9

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

@@ -12,11 +12,15 @@ 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 -There are a few last-minute fix-up topics in flight, which I'll be

16 -merging to 'next' and then down to 'master' soonish, before rc2.

17 -They are marked as "Will merge to 'next' and then to 'master'" in

18 -this report; please raise hand if some of them are not ready or

19 -appropriate, to stop me before too late.

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.

24

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

26 of the repositories listed at

@@ -24,105 +28,206 @@ of the repositories listed at

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

29

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

27 -[New Topics]

31 +[Graduated to "master"]

32 +

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

37 +

38 + Test fix.

39 +

40 +

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

44 +

45 + Leakfix.

46 +

47

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

30 - - commit-graph: fix bug around octopus merges

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

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

51

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

53 correctly, which has been corrected.

54

35 - Will merge to 'next' and then to 'master'.

55 +

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

59 +

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

61 + detected a directory rename.

62 +

63 +

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

67 +

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

69

70

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

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

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

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

74

75 Docfix.

76

43 - Will merge to 'next' and then to 'master'.

77 +

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

82 +

83 + Leakfix.

84

85

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

47 - - restore: fix typo in docs

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

88 + + restore: fix typo in docs

89

90 Docfix.

91

51 - Will merge to 'next' and then to 'master'.

92

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

96

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

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

56 - - commit-graph: turn a group of write-related macro flags into an enum

57 - - t5318-commit-graph: use 'test_expect_code'

97 + Leakfix.

98

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

60 - been made a bit more robust.

99 +--------------------------------------------------

100 +[New Topics]

101 +

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

105 +

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

107

108 Will merge to 'next'.

109

110

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

66 - - tests: show the test name and number at the start of verbose output

67 - - t0000-basic: use realistic test script names in the verbose tests

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

115

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

70 - the test name and number to help scanning with eyeballs.

116 + Compilation fix.

117

72 - Will merge to 'next'.

118 + Will cook in 'next'.

119

120

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

76 - - merge-recursive: avoid directory rename detection in recursive case

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

124

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

79 - detected a directory rename.

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

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

127

81 - Will merge to 'next' and then to 'master'.

128 + Will cook in 'next'.

129

130

84 -* js/pre-merge-commit-hook (2019-08-06) 4 commits

85 - - merge: --no-verify to bypass pre-merge-commit hook

86 - - git-merge: honor pre-merge-commit hook

87 - - merge: do no-verify like commit

88 - - t7503: verify proper hook execution

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

134

90 - A new "pre-merge-commit" hook has been introduced.

135 + Doc update.

136

137 + Will cook in 'next'.

138

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

94 - - l10n: reformat some localized strings for v2.23.0

139

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

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

144

98 - Will merge to 'next' and then to 'master'.

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.

148

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

150

101 -* jk/eoo (2019-08-06) 3 commits

102 - - gitcli: document --end-of-options

103 - - parse-options: allow --end-of-options as a synonym for "--"

104 - - revision: allow --end-of-options to end option parsing

151

106 - The command line parser learned "--end-of-options" notation; the

107 - standard convention for scripters to have hardcoded set of options

108 - first on the command line, and force the command to treat end-user

109 - input as non-options, has been to use "--" as the delimiter, but

110 - that would not work for commands that use "--" as a delimiter

111 - between revs and pathspec.

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

153 + - packfile: drop release_pack_memory()

154 +

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.

161

162 Will merge to 'next'.

163

164

116 -* jk/repo-init-cleanup (2019-08-06) 3 commits

117 - - config: stop checking whether the_repository is NULL

118 - - common-main: delay trace2 initialization

119 - - t1309: use short branch name in includeIf.onbranch test

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

177

121 - Further clean-up of the initialization code.

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

179 +

180 + Will merge to 'next'.

181 +

182 +

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

186 +

187 + Error message update/clarification.

188 +

189 + Will cook in 'next'.

190 +

191 +

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()

197 +

198 +

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

205 +

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

207 + parallel when fetching from multiple remote repositories.

208 +

209 +

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

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

212 +

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.

216

217 --------------------------------------------------

218 [Stalled]

219

220 +* js/trace2-json-schema (2019-07-25) 3 commits

221 + . ci: run trace2 schema validation in the CI suite

222 + . trace2: add a schema validator for trace2 events

223 + . trace2: add a JSON schema for trace2 events

224 +

225 + The JSON output produced by "trace2" subsystem now has JSON schema

226 + defined on it, to allow us validate the output and catch deviation.

227 +

228 + The CI integration may be a bit too heavy-handed.

229 +

230 +

231 * jn/unknown-index-extensions (2018-11-21) 2 commits

232 - index: offer advice for unknown index extensions

233 - index: do not warn about unrecognized extensions

@@ -193,6 +298,63 @@ of the repositories listed at

298 --------------------------------------------------

299 [Cooking]

300

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

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

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

304 + + commit-graph: turn a group of write-related macro flags into an enum

305 + + t5318-commit-graph: use 'test_expect_code'

306 +

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

308 + been made a bit more robust.

309 +

310 + Will cook in 'next'.

311 +

312 +

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

314 + (merged to 'next' on 2019-08-09 at c49ece8a0d)

315 + + tests: show the test name and number at the start of verbose output

316 + + t0000-basic: use realistic test script names in the verbose tests

317 +

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

319 + the test name and number to help scanning with eyeballs.

320 +

321 + Will cook in 'next'.

322 +

323 +

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

325 + - merge: --no-verify to bypass pre-merge-commit hook

326 + - git-merge: honor pre-merge-commit hook

327 + - merge: do no-verify like commit

328 + - t7503: verify proper hook execution

329 +

330 + A new "pre-merge-commit" hook has been introduced.

331 +

332 + Will merge to 'next'.

333 +

334 +

335 +* jk/eoo (2019-08-06) 3 commits

336 + - gitcli: document --end-of-options

337 + - parse-options: allow --end-of-options as a synonym for "--"

338 + - revision: allow --end-of-options to end option parsing

339 +

340 + The command line parser learned "--end-of-options" notation; the

341 + standard convention for scripters to have hardcoded set of options

342 + first on the command line, and force the command to treat end-user

343 + input as non-options, has been to use "--" as the delimiter, but

344 + that would not work for commands that use "--" as a delimiter

345 + between revs and pathspec.

346 +

347 + Will merge to 'next'.

348 +

349 +

350 +* jk/repo-init-cleanup (2019-08-06) 3 commits

351 + - config: stop checking whether the_repository is NULL

352 + - common-main: delay trace2 initialization

353 + - t1309: use short branch name in includeIf.onbranch test

354 +

355 + Further clean-up of the initialization code.

356 +

357 +

358 * cb/pcre2-chartables-leakfix (2019-08-06) 3 commits

359 - grep: avoid leak of chartables in PCRE2

360 - grep: make PCRE2 aware of custom allocator

@@ -201,28 +363,57 @@ of the repositories listed at

363 WIP.

364

365

204 -* jh/trace2-pretty-output (2019-08-01) 3 commits

366 +* jh/trace2-pretty-output (2019-08-09) 7 commits

367 + - trace2: cleanup whitespace in perf format

368 + - trace2: cleanup whitespace in normal format

369 + - quote: add sq_append_quote_argv_pretty()

370 + - trace2: trim trailing whitespace in normal format error message

371 + - trace2: remove dead code in maybe_add_string_va()

372 - trace2: trim whitespace in region messages in perf target format

206 - - trace2: trim whitespace in start message in perf target format

373 - trace2: cleanup column alignment in perf target format

374

375 + Output from trace2 subsystem is formatted more prettily now.

376 +

377 + Will merge to 'next'.

378 +

379

380 * sc/pack-refs-deletion-racefix (2019-08-02) 1 commit

211 - - pack-refs: always refresh after taking the lock file

381 + (merged to 'next' on 2019-08-09 at 6bd6c85fbb)

382 + + pack-refs: always refresh after taking the lock file

383 +

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

385 + is getting corrected.

386 +

387 + Will cook in 'next'.

388

389

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

215 - - restore: add test for deleted ita files

216 - - checkout.c: unstage empty deleted ita files

391 + (merged to 'next' on 2019-08-09 at ad2d7630d1)

392 + + restore: add test for deleted ita files

393 + + checkout.c: unstage empty deleted ita files

394 +

395 + "git checkout" and "git restore" to re-populate the index from a

396 + tree-ish (typically HEAD) did not work correctly for a path that

397 + was removed and then added again with the intent-to-add bit, when

398 + the corresponding working tree file was empty. This has been

399 + corrected.

400

401 + Will cook in 'next'.

402

219 -* ds/feature-macros (2019-07-30) 5 commits

403 +

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

405 - repo-settings: create feature.experimental setting

406 - repo-settings: create feature.manyFiles setting

407 - repo-settings: parse core.untrackedCache

223 - - repo-settings: add feature.manyCommits setting

408 + - commit-graph: turn on commit-graph by default

409 + - t6501: use 'git gc' in quiet mode

410 - repo-settings: consolidate some config settings

411

412 + A mechanism to affect the default setting for a (related) group of

413 + configuration variables is introduced.

414 +

415 + Will merge to 'next'.

416 +

417

418 * mt/grep-submodules-working-tree (2019-07-30) 1 commit

419 (merged to 'next' on 2019-08-02 at e1a46a195f)

@@ -281,8 +472,10 @@ of the repositories listed at

472 Expecting a reroll.

473

474

284 -* ra/rebase-i-more-options (2019-07-23) 4 commits

285 - - SQUASH???

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

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

477 + - rebase -i: support --ignore-date

478 + - sequencer: rename amend_author to author_to_rename

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

480 - sequencer: add NULL checks under read_author_script

481 - rebase -i: add --ignore-whitespace flag

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

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

484 rebase" proper.

485

293 - Needs a bit of fixups, at least.

486 + Almost there.

487

488

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

@@ -314,16 +507,7 @@ of the repositories listed at

507 "git rebase --rebase-merges" learned to drive different merge

508 strategies and pass strategy specific options to them.

509

317 -

318 -* js/trace2-json-schema (2019-07-25) 3 commits

319 - . ci: run trace2 schema validation in the CI suite

320 - . trace2: add a schema validator for trace2 events

321 - . trace2: add a JSON schema for trace2 events

322 -

323 - The JSON output produced by "trace2" subsystem now has JSON schema

324 - defined on it, to allow us validate the output and catch deviation.

325 -

326 - The CI integration may be a bit too heavy-handed.

510 + Will merge to 'next'.

511

512

513 * js/builtin-add-i (2019-07-18) 11 commits

@@ -341,11 +525,15 @@ of the repositories listed at

525

526 The beginning of rewriting "git add -i" in C.

527

528 + Expecting a response and possibly a reroll.

529 + cf. <xmqqwofyozka.fsf@gitster-ct.c.googlers.com>

530 + cf. <xmqqsgqmoyz1.fsf@gitster-ct.c.googlers.com>

531 +

532

345 -* es/walken-tutorial (2019-07-02) 1 commit

533 +* es/walken-tutorial (2019-08-07) 1 commit

534 - documentation: add tutorial for revision walking

535

348 - Yet another revision walker tutorial.

536 + A tutorial on object enumeration.

537

538

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

What's cooking (2019/08 #04)