112afbc7b3 · 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 (Jul 2020, #02; Thu, 9)

4 -X-master-at: bd42bbe1a46c0fe486fc33e82969275e27e4dc19

5 -X-next-at: f9edc3c819edc268d3a429d06d1efb8fa957866b

3 +Subject: What's cooking in git.git (Jul 2020, #03; Thu, 16)

4 +X-master-at: b6a658bd00c9c29e07f833cabfc0ef12224e277a

5 +X-next-at: 85f634d5a6a972c5a89293a1aca2a0a727cb6315

6

7 -What's cooking in git.git (Jul 2020, #02; Thu, 9)

7 +What's cooking in git.git (Jul 2020, #03; Thu, 16)

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

9

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

@@ -12,11 +12,13 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed

12 with '+' 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 -The tip of the 'master' branch has been tagged as 'v2.28.0-rc0', as

16 -the preview of upcoming release. From here on, let's focus mostly

17 -on stabilizing what will be in the upcoming 2.28 release and less on

18 -polishing topics not yet in 'next' or starting new ones, so that we

19 -can have a solid release by the end of the month.

15 +Git 2.28-rc1 has not been tagged yet. Hopefully the three patches

16 +in jn/v0-with-extensions-fix can gain enough support to get merged

17 +tomorrow for the real -rc1.

18 +

19 +As I promised, I am not paying much attention to topics that are not

20 +relevant to the upcoming release, so the comments on the topics may

21 +be left stale.

22

23 You can find the changes described here in the integration branches of the

24 repositories listed at

@@ -26,146 +28,189 @@ repositories listed at

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

29 [Graduated to 'master']

30

29 -* cc/cat-file-usage-update (2020-07-01) 1 commit

30 - (merged to 'next' on 2020-07-06 at 270769a009)

31 - + cat-file: add missing [=<format>] to usage/synopsis

32 -

33 - Doc/usage update.

31 +* ct/diff-with-merge-base-clarification (2020-07-13) 2 commits

32 + (merged to 'next' on 2020-07-15 at 041807cbbd)

33 + + git-diff.txt: reorder possible usages

34 + + git-diff.txt: don't mark required argument as optional

35

36 + Doc update.

37

36 -* ct/diff-with-merge-base-clarification (2020-07-08) 1 commit

37 - (merged to 'next' on 2020-07-08 at fc1ab4a479)

38 - + diff: check for merge bases before assigning sym->base

38

40 - Recent update to "git diff" meant as a code clean-up introduced a

41 - bug in its error handling code, which has been corrected.

39 +* sg/commit-graph-progress-fix (2020-07-09) 2 commits

40 + (merged to 'next' on 2020-07-09 at 3a9f916ca4)

41 + + commit-graph: fix "Writing out commit graph" progress counter

42 + + commit-graph: fix progress of reachable commits

43

44 + The code to produce progress output from "git commit-graph --write"

45 + had a few breakages, which have been fixed.

46

44 -* jn/eject-fetch-write-commit-graph-out-of-experimental (2020-07-08) 1 commit

45 - (merged to 'next' on 2020-07-08 at 1f7cf947f8)

46 - + experimental: default to fetch.writeCommitGraph=false

47

48 - "fetch.writeCommitGraph" was enabled when "feature.experimental" is

49 - asked for, but it was found to be a bit too risky even for bold

50 - folks in its current shape. The configuration has been ejected, at

51 - least for now, from the "experimental" feature set.

48 +* ta/wait-on-aliased-commands-upon-signal (2020-07-07) 2 commits

49 + (merged to 'next' on 2020-07-09 at de8bde9182)

50 + + Wait for child on signal death for aliases to externals

51 + + Wait for child on signal death for aliases to builtins

52

53 + When an aliased command, whose output is piped to a pager by git,

54 + gets killed by a signal, the pager got into a funny state, which

55 + has been corrected (again).

56

54 -* ma/rebase-doc-typofix (2020-07-09) 1 commit

55 - (merged to 'next' on 2020-07-09 at 6bf0e26bee)

56 - + git-rebase.txt: fix description list separator

57

58 - Typofix.

58 +* tb/commit-graph-no-check-oids (2020-07-15) 1 commit

59 + (merged to 'next' on 2020-07-15 at d97ae59198)

60 + + commit-graph: fix "Collecting commits from input" progress line

61

62 + Fix to the code to produce progress bar, which is new in the

63 + upcoming release.

64

61 -* mt/entry-fstat-fallback-fix (2020-07-09) 1 commit

62 - (merged to 'next' on 2020-07-09 at fa0dce39d2)

63 - + entry: check for fstat() errors after checkout

65 +--------------------------------------------------

66 +[New Topics]

67

65 - "git checkout" failed to catch an error from fstat() after updating

66 - a path in the working tree.

68 +* jn/v0-with-extensions-fix (2020-07-16) 3 commits

69 + (merged to 'next' on 2020-07-16 at 85f634d5a6)

70 + + verify_repository_format(): complain about new extensions in v0 repo

71 + + repository: allow repository format upgrade with extensions

72 + + Revert "check_repository_format_gently(): refuse extensions for old repositories"

73 +

74 + In 2.28-rc0, we corrected a bug that some repository extensions are

75 + honored by mistake even in a version 0 repositories (these

76 + configuration variables in extensions.* namespace were supposed to

77 + have special meaning in repositories whose version numbers are 1 or

78 + higher), but this was a bit too big a change.

79 +

80 + Will merge to 'master' before -rc1.

81 +

82 +

83 +* bc/sha-256-part-3 (2020-07-15) 39 commits

84 + - t: remove test_oid_init in tests

85 + - docs: add documentation for extensions.objectFormat

86 + - ci: run tests with SHA-256

87 + - t: make SHA1 prerequisite depend on default hash

88 + - t: allow testing different hash algorithms via environment

89 + - t: add test_oid option to select hash algorithm

90 + - Enable SHA-256 support by default

91 + - setup: add support for reading extensions.objectformat

92 + - bundle: add new version for use with SHA-256

93 + - builtin/verify-pack: implement an --object-format option

94 + - http-fetch: set up git directory before parsing pack hashes

95 + - t0410: mark test with SHA1 prerequisite

96 + - t5308: make test work with SHA-256

97 + - t9700: make hash size independent

98 + - t9500: ensure that algorithm info is preserved in config

99 + - t9350: make hash size independent

100 + - t9301: make hash size independent

101 + - t9300: use $ZERO_OID instead of hard-coded object ID

102 + - t9300: abstract away SHA-1-specific constants

103 + - t8011: make hash size independent

104 + - t8003: make hash size independent

105 + - t8002: make hash size independent

106 + - t7508: use $ZERO_OID instead of hard-coded constant

107 + - t7506: avoid checking for SHA-1-specific constants

108 + - t7405: make hash size independent

109 + - t7400: make hash size independent

110 + - t7102: abstract away SHA-1-specific constants

111 + - t7201: abstract away SHA-1-specific constants

112 + - t7063: make hash size independent

113 + - t7003: compute appropriate length constant

114 + - t6501: avoid hard-coded objects

115 + - t6500: specify test values for SHA-256

116 + - t6301: make hash size independent

117 + - t6101: make hash size independent

118 + - t6100: make hash size independent

119 + - t3404: prepare 'short SHA-1 collision' tests for SHA-256

120 + - t3305: make hash agnostic

121 + - t1001: use $ZERO_OID

122 + - t: make test-bloom initialize repository

123 +

124 + The final leg of SHA-256 transition.

125 +

126 +

127 +* jk/tests-timestamp-fix (2020-07-15) 6 commits

128 + (merged to 'next' on 2020-07-16 at 2c69e97b92)

129 + + t9100: stop depending on commit timestamps

130 + (merged to 'next' on 2020-07-14 at 66ee0e6b45)

131 + + test-lib: set deterministic default author/committer date

132 + + t9100: explicitly unset GIT_COMMITTER_DATE

133 + + t5539: make timestamp requirements more explicit

134 + + t9700: loosen ident timezone regex

135 + (merged to 'next' on 2020-07-09 at 633bcd552f)

136 + + t6000: use test_tick consistently

137

138 + The test framework has been updated so that most tests will run

139 + with predictable (artificial) timestamps.

140

69 -* ra/send-email-in-reply-to-from-command-line-wins (2020-07-01) 1 commit

70 - (merged to 'next' on 2020-07-06 at 3892a1ab88)

71 - + send-email: restore --in-reply-to superseding behavior

141 + Will cook in 'next'.

142

73 - "git send-email --in-reply-to=<msg>" did not use the In-Reply-To:

74 - header with the value given from the command line, and let it be

75 - overridden by the value on In-Reply-To: header in the messages

76 - being sent out (if exists).

143

144 +* jc/no-update-fetch-head (2020-07-13) 1 commit

145 + - fetch: optionally allow disabling FETCH_HEAD update

146

79 -* rs/line-log-until (2020-07-06) 1 commit

80 - (merged to 'next' on 2020-07-06 at 84d6bc67fa)

81 - + revision: disable min_age optimization with line-log

147 + "git fetch" learned the "--[no-]write-fetch-head" option to

148 + optionally stop describing what was fetched in FETCH_HEAD.

149

83 - "git log -Lx,y:path --before=date" lost track of where the range

84 - should be because it didn't take the changes made by the youngest

85 - commits that are omitted from the output into account.

150

151 +* mp/complete-show-color-moved (2020-07-15) 1 commit

152 + - completion: add show --color-moved[-ws]

153

88 -* tb/fix-persistent-shallow (2020-07-08) 1 commit

89 - (merged to 'next' on 2020-07-08 at ef1709f4bb)

90 - + commit.c: don't persist substituted parents when unshallowing

154 + Command line completion (in contrib/) update.

155

92 - When "fetch.writeCommitGraph" configuration is set in a shallow

93 - repository and a fetch moves the shallow boundary, we wrote out

94 - broken commit-graph files that do not match the reality, which has

95 - been corrected.

156

157 +* hn/reftable-prep-part-2 (2020-07-16) 3 commits

158 + - Make HEAD a PSEUDOREF rather than PER_WORKTREE.

159 + - Modify pseudo refs through ref backend storage

160 + - t1400: use git rev-parse for testing PSEUDOREF existence

161 + (this branch uses hn/reftable.)

162

98 -* vs/completion-with-set-u (2020-07-01) 1 commit

99 - (merged to 'next' on 2020-07-06 at 72b1eca511)

100 - + completion: nounset mode fixes

163 + Further preliminary change to refs API.

164

102 - The command line completion support (in contrib/) used to be

103 - prepared to work with "set -u" but recent changes got a bit more

104 - sloppy. This has been corrected.

165

106 ---------------------------------------------------

107 -[New Topics]

166 +* jt/avoid-lazy-fetching-upon-have-check (2020-07-16) 1 commit

167 + - upload-pack: do not lazy-fetch "have" objects

168

109 -* dl/test-must-fail-fixes-6 (2020-07-07) 6 commits

110 - - test-lib-functions: restrict test_must_fail usage

111 - - t9400: don't use test_must_fail with cvs

112 - - t9834: remove use of `test_might_fail p4`

113 - - t7107: don't use test_must_fail()

114 - - t5324: reorder `run_with_limited_open_files test_might_fail`

115 - - t3701: stop using `env` in force_color()

169 + Fetching from a lazily cloned repository resulted at the server

170 + side in attempts to lazy fetch objects that the client side has,

171 + many of which will not be available from the third-party anyway.

172

117 - Dev support to limit the use of test_must_fail to only git commands.

173 + Will merge to 'next'.

174

175

120 -* ds/maintenance (2020-07-07) 21 commits

121 - - midx: use start_delayed_progress()

122 - - maintenance: add pack-files auto condition

123 - - maintenance: create auto condition for loose-objects

124 - - maintenance: add auto condition for commit-graph task

125 - - maintenance: use pointers to check --auto

126 - - maintenance: create maintenance.<task>.enabled config

127 - - maintenance: auto-size pack-files batch

128 - - maintenance: add pack-files task

129 - - maintenance: add loose-objects task

130 - - maintenance: add fetch task

131 - - maintenance: take a lock on the objects directory

132 - - maintenance: add --task option

133 - - maintenance: add commit-graph task

134 - - maintenance: initialize task array and hashmap

135 - - maintenance: replace run_auto_gc()

136 - - maintenance: add --quiet option

137 - - maintenance: create basic maintenance runner

138 - - gc: drop the_repository in log location

139 - - gc: use repo config

140 - - gc: use repository in too_many_loose_objects()

141 - - gc: use the_repository less often

176 +* rc/add-index-entry-optim-fix (2020-07-16) 1 commit

177 + - read-cache: remove bogus shortcut

178

143 - A "git gc"'s big brother has been introduced to take care of more

144 - repository maintenance tasks, not limited to the object database

145 - cleaning.

179 + Fix to an ancient bug caused by an over-eager attempt for

180 + optimization.

181

182 +--------------------------------------------------

183 +[Stalled]

184

148 -* jk/t6000-timestamp-fix (2020-07-07) 1 commit

149 - (merged to 'next' on 2020-07-09 at 633bcd552f)

150 - + t6000: use test_tick consistently

185 +* jx/proc-receive-hook (2020-05-18) 11 commits

186 + - doc: add documentation for the proc-receive hook

187 + - transport: parse report options for tracking refs

188 + - t5411: test updates of remote-tracking branches

189 + - receive-pack: new config receive.procReceiveRefs

190 + - refs.c: refactor to reuse ref_is_hidden()

191 + - receive-pack: feed report options to post-receive

192 + - doc: add document for capability report-status-v2

193 + - New capability "report-status-v2" for git-push

194 + - receive-pack: add new proc-receive hook

195 + - t5411: add basic test cases for proc-receive hook

196 + - transport: not report a non-head push as a branch

197

152 - Test update.

198 + "git receive-pack" that accepts requests by "git push" learned to

199 + outsource most of the ref updates to the new "proc-receive" hook.

200

154 - Will cook in 'next'.

201 + Needs review.

202

203

157 -* sg/commit-graph-progress-fix (2020-07-09) 2 commits

158 - (merged to 'next' on 2020-07-09 at 3a9f916ca4)

159 - + commit-graph: fix "Writing out commit graph" progress counter

160 - + commit-graph: fix progress of reachable commits

204 +* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits

205 + - submodule: use submodule repository when preparing summary

206 + - revision: use repository from rev_info when parsing commits

207

162 - The code to produce progress output from "git commit-graph --write"

163 - had a few breakages, which have been fixed.

208 + "git diff/show" on a change that involves a submodule used to read

209 + the information on commits in the submodule from a wrong repository

210 + and gave a wrong information when the commit-graph is involved.

211

165 - Will merge to 'master'.

212 + Needs tests.

213

167 ---------------------------------------------------

168 -[Stalled]

214

215 * dr/push-remoteref-fix (2020-04-23) 1 commit

216 - remote.c: fix handling of %(push:remoteref)

@@ -210,34 +255,69 @@ repositories listed at

255 --------------------------------------------------

256 [Cooking]

257

213 -* bw/fail-cloning-into-non-empty (2020-07-06) 1 commit

214 - - git clone: don't clone into non-empty directory

258 +* dl/test-must-fail-fixes-6 (2020-07-07) 6 commits

259 + - test-lib-functions: restrict test_must_fail usage

260 + - t9400: don't use test_must_fail with cvs

261 + - t9834: remove use of `test_might_fail p4`

262 + - t7107: don't use test_must_fail()

263 + - t5324: reorder `run_with_limited_open_files test_might_fail`

264 + - t3701: stop using `env` in force_color()

265 +

266 + Dev support to limit the use of test_must_fail to only git commands.

267 +

268 +

269 +* ds/maintenance (2020-07-07) 21 commits

270 + - midx: use start_delayed_progress()

271 + - maintenance: add pack-files auto condition

272 + - maintenance: create auto condition for loose-objects

273 + - maintenance: add auto condition for commit-graph task

274 + - maintenance: use pointers to check --auto

275 + - maintenance: create maintenance.<task>.enabled config

276 + - maintenance: auto-size pack-files batch

277 + - maintenance: add pack-files task

278 + - maintenance: add loose-objects task

279 + - maintenance: add fetch task

280 + - maintenance: take a lock on the objects directory

281 + - maintenance: add --task option

282 + - maintenance: add commit-graph task

283 + - maintenance: initialize task array and hashmap

284 + - maintenance: replace run_auto_gc()

285 + - maintenance: add --quiet option

286 + - maintenance: create basic maintenance runner

287 + - gc: drop the_repository in log location

288 + - gc: use repo config

289 + - gc: use repository in too_many_loose_objects()

290 + - gc: use the_repository less often

291 +

292 + A "git gc"'s big brother has been introduced to take care of more

293 + repository maintenance tasks, not limited to the object database

294 + cleaning.

295 +

296 +

297 +* bw/fail-cloning-into-non-empty (2020-07-10) 1 commit

298 + (merged to 'next' on 2020-07-14 at a52b5ce7ab)

299 + + git clone: don't clone into non-empty directory

300

301 "git clone --separate-git-dir=$elsewhere" used to stomp on the

302 contents of the existing directory $elsewhere, which has been

303 taught to fail when $elsewhere is not an empty directory.

304

220 - Expecting a reroll.

221 - with improved commit log message.

222 - cf. <xmqqv9j08dxo.fsf@gitster.c.googlers.com>

305 + Will cook in 'next'.

306

307

225 -* cc/pretty-contents-size (2020-07-07) 5 commits

226 - . SQUASH???

227 - . ref-filter: add support for %(contents:size)

228 - . t6300: test refs pointing to tree and blob

229 - . Documentation: clarify 'complete message'

230 - . Documentation: clarify %(contents:XXXX) doc

308 +* cc/pretty-contents-size (2020-07-16) 3 commits

309 + - ref-filter: add support for %(contents:size)

310 + - t6300: test refs pointing to tree and blob

311 + - Documentation: clarify %(contents:XXXX) doc

312

313 "git for-each-ref --format=<>" learned %(contents:size).

314

234 - Expecting a reroll.

235 - breaks a test on macOS

236 - cf. <xmqqk0zf3y8s.fsf@gitster.c.googlers.com>

315 + Will merge to 'next'.

316

317

239 -* ls/mergetool-meld-auto-merge (2020-07-08) 1 commit

240 - - mergetool: mergetool: update meld backend to allow using '--auto-merge'

318 +* ls/mergetool-meld-auto-merge (2020-07-12) 2 commits

319 + - SQUASH???

320 + - Support auto-merge for meld to follow the vim-diff behavior

321

322 The 'meld' backend of the "git mergetool" learned to give the

323 underlying 'meld' the '--auto-merge' option, which would help

@@ -245,27 +325,18 @@ repositories listed at

325

326

327 * pb/log-rev-list-doc (2020-07-08) 6 commits

248 - - git-log.txt: include rev-list-description.txt

249 - - git-rev-list.txt: move description to separate file

250 - - git-rev-list.txt: tweak wording in set operations

251 - - git-rev-list.txt: fix Asciidoc syntax

252 - - revisions.txt: describe 'rev1 rev2 ...' meaning for ranges

253 - - git-log.txt: add links to 'rev-list' and 'diff' docs

328 + (merged to 'next' on 2020-07-14 at f1104dfb77)

329 + + git-log.txt: include rev-list-description.txt

330 + + git-rev-list.txt: move description to separate file

331 + + git-rev-list.txt: tweak wording in set operations

332 + + git-rev-list.txt: fix Asciidoc syntax

333 + + revisions.txt: describe 'rev1 rev2 ...' meaning for ranges

334 + + git-log.txt: add links to 'rev-list' and 'diff' docs

335

336 "git help log" has been enhanced by sharing more material from the

337 documentation for the underlying "git rev-list" command.

338

258 -

259 -* ta/wait-on-aliased-commands-upon-signal (2020-07-07) 2 commits

260 - (merged to 'next' on 2020-07-09 at de8bde9182)

261 - + Wait for child on signal death for aliases to externals

262 - + Wait for child on signal death for aliases to builtins

263 -

264 - When an aliased command, whose output is piped to a pager by git,

265 - gets killed by a signal, the pager got into a funny state, which

266 - has been corrected (again).

267 -

268 - Will merge to 'master'.

339 + Will cook in 'next'.

340

341

342 * tb/upload-pack-filters (2020-07-06) 4 commits

@@ -278,8 +349,9 @@ repositories listed at

349 configurable to selectively allow or reject object filtering

350 specification used for partial cloning.

351

281 - Waiting for reviews.

352 + Waiting for reviews to settle.

353 cf. <cover.1593720075.git.me@ttaylorr.com>

354 + cf. <20200710022609.GC39052@syl.lan>

355

356

357 * mt/hash-to-hex-thread-safety (2020-06-26) 2 commits

@@ -294,17 +366,6 @@ repositories listed at

366 cf. <CAHd-oW6A2aBHg80R9kyifvF7thwzam5EYYoN9d2TaBcHJrcKWw@mail.gmail.com>

367

368

297 -* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits

298 - - submodule: use submodule repository when preparing summary

299 - - revision: use repository from rev_info when parsing commits

300 -

301 - "git diff/show" on a change that involves a submodule used to read

302 - the information on commits in the submodule from a wrong repository

303 - and gave a wrong information when the commit-graph is involved.

304 -

305 - Needs tests.

306 -

307 -

369 * ds/commit-graph-bloom-updates (2020-07-01) 10 commits

370 (merged to 'next' on 2020-07-06 at 177e6b362e)

371 + commit-graph: check all leading directories in changed path Bloom filters

@@ -370,7 +431,7 @@ repositories listed at

431 What's the status of this one? Abandoned?

432

433

373 -* pw/rebase-i-more-options (2020-06-26) 5 commits

434 +* pw/rebase-i-more-options (2020-07-16) 5 commits

435 - rebase: add --reset-author-date

436 - rebase -i: support --ignore-date

437 - sequencer: rename amend_author to author_to_free

@@ -397,39 +458,18 @@ repositories listed at

458 cf. <CABPp-BGdEyEeajYZj_rdxp=MyEQdszuyjVTax=hhYj3fOtRQUQ@mail.gmail.com>

459

460

400 -* jx/proc-receive-hook (2020-05-18) 11 commits

401 - - doc: add documentation for the proc-receive hook

402 - - transport: parse report options for tracking refs

403 - - t5411: test updates of remote-tracking branches

404 - - receive-pack: new config receive.procReceiveRefs

405 - - refs.c: refactor to reuse ref_is_hidden()

406 - - receive-pack: feed report options to post-receive

407 - - doc: add document for capability report-status-v2

408 - - New capability "report-status-v2" for git-push

409 - - receive-pack: add new proc-receive hook

410 - - t5411: add basic test cases for proc-receive hook

411 - - transport: not report a non-head push as a branch

412 -

413 - "git receive-pack" that accepts requests by "git push" learned to

414 - outsource most of the ref updates to the new "proc-receive" hook.

415 -

416 - Needs review.

417 -

418 -

419 -* hn/reftable (2020-07-06) 4 commits

420 - - Treat BISECT_HEAD as a pseudo ref

421 - - checkout: add '\n' to reflog message

422 - - t3432: use git-reflog to inspect the reflog for HEAD

423 - - lib-t6000.sh: write tag using git-update-ref

461 +* hn/reftable (2020-07-10) 4 commits

462 + (merged to 'next' on 2020-07-14 at e524883fec)

463 + + reflog: cleanse messages in the refs.c layer

464 + + bisect: treat BISECT_HEAD as a pseudo ref

465 + + t3432: use git-reflog to inspect the reflog for HEAD

466 + + lib-t6000.sh: write tag using git-update-ref

467 + (this branch is used by hn/reftable-prep-part-2.)

468

469 Preliminary clean-up of the refs API in preparation for adding a

470 new refs backend "reftable".

471

428 - Expecting a reroll.

429 - The second one should be dropped, and possibly replaced with a

430 - patch that moves message normalization from backends to the more

431 - generic layer.

432 - cf. <xmqqmu4ca31g.fsf@gitster.c.googlers.com>

472 + Will cook in 'next'.

473

474 --------------------------------------------------

475 [Discarded]

@@ -472,3 +512,31 @@ repositories listed at

512 debugging using the anonymized output hsa been added.

513

514 Superseded by 'jk/fast-export-anonym-alt'.

515 +

516 +

517 +* jk/t6000-timestamp-fix (2020-07-07) 1 commit

518 + (merged to 'next' on 2020-07-09 at 633bcd552f)

519 + + t6000: use test_tick consistently

520 +

521 + Test update.

522 +

523 + Now it is part of jk/tests-timestamp-fix with a larger scope.

524 +

525 +

526 +* ds/upgrade-with-existing-extension (2020-07-14) 2 commits

527 + . config: provide extra detail about worktree config

528 + . setup: tweak upgrade policy to grandfather worktreeconfig

529 + (this branch is used by jc/upgrade-v0-fixup.)

530 +

531 + In 2.28-rc0, we corrected a bug that some repository extensions are

532 + honored by mistake even in a version 0 repositories (these

533 + configuration variables in extensions.* namespace were supposed to

534 + have special meaning in repositories whose version numbers are 1 or

535 + higher), but this was a bit too big a change.

536 +

537 + Superseded by jn/v0-with-extensions-fix

538 +

539 +

540 +* jc/upgrade-v0-fixup (2020-07-15) 1 commit

541 + . setup: grandfather other extensions that used to be honored by mistake

542 + (this branch uses ds/upgrade-with-existing-extension.)

What's cooking (2020/07 #03)