2be3712f4b · 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, #03; Thu, 16)

4 -X-master-at: b6a658bd00c9c29e07f833cabfc0ef12224e277a

5 -X-next-at: 85f634d5a6a972c5a89293a1aca2a0a727cb6315

3 +Subject: What's cooking in git.git (Jul 2020, #04; Wed, 22)

4 +X-master-at: b066807397fd55553f4910ede74839e319b661fd

5 +X-next-at: 839af2c2686bba67b3e8cea649583ed99b2326e6

6

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

7 +What's cooking in git.git (Jul 2020, #04; Wed, 22)

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

9

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

@@ -12,13 +12,9 @@ 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 -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.

15 +I just tagged Git 2.28-rc2; we should be pretty in a good shape and

16 +hopefully the only difference between this and the final would just

17 +be the translation.

18

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

20 repositories listed at

@@ -28,48 +24,31 @@ repositories listed at

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

25 [Graduated to 'master']

26

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 -

27 +* dl/branch-cleanup (2020-07-18) 1 commit

28 + (merged to 'next' on 2020-07-18 at 942efa1f99)

29 + + t3200: don't grep for `strerror()` string

30

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

31 + Last minute fix-up to tests for portability.

32

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

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

33

34 +* en/sparse-status (2020-07-20) 1 commit

35 + (merged to 'next' on 2020-07-20 at 6aa5c12b74)

36 + + git-prompt: change == to = for zsh's sake

37

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

38 + Fix to a "git prompt" regression during this development cycle.

39

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

40

41 +* jc/relnotes-v0-extension-update (2020-07-17) 1 commit

42 + (merged to 'next' on 2020-07-18 at 4e03396489)

43 + + RelNotes: update the v0 with extension situation

44

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

45 + Last minute fix-up to the release notes.

46

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

63 - upcoming release.

64 -

65 ---------------------------------------------------

66 -[New Topics]

47

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

48 +* jn/v0-with-extensions-fix (2020-07-16) 2 commits

49 + repository: allow repository format upgrade with extensions

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

51 + (this branch is used by jk/reject-newer-extensions-in-v0.)

52

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

54 honored by mistake even in a version 0 repositories (these

@@ -77,8 +56,167 @@ repositories listed at

56 have special meaning in repositories whose version numbers are 1 or

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

58

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

59

60 +* js/pu-to-seen (2020-07-18) 1 commit

61 + (merged to 'next' on 2020-07-18 at bb6ee9441b)

62 + + gitworkflows.txt: fix broken subsection underline

63 +

64 + Last minute fix-up to documentation.

65 +

66 +--------------------------------------------------

67 +[New Topics]

68 +

69 +* jk/reject-newer-extensions-in-v0 (2020-07-16) 1 commit

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

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

72 +

73 + With the base fix to 2.27 regresion, any new extensions in a v0

74 + repository would still be silently honored, which is not quite

75 + right. Instead, complain and die loudly.

76 +

77 + Will cook in 'next'.

78 +

79 +

80 +* en/fill-directory-exponential (2020-07-20) 1 commit

81 + (merged to 'next' on 2020-07-22 at 63662d6646)

82 + + dir: check pathspecs before returning `path_excluded`

83 +

84 + Fix to a regression introduced during 2.27 cycle.

85 +

86 + Will cook in 'next'.

87 +

88 +

89 +* bc/push-cas-cquoted-refname (2020-07-20) 1 commit

90 + (merged to 'next' on 2020-07-21 at fd7bb5c85e)

91 + + remote-curl: make --force-with-lease work with non-ASCII ref names

92 +

93 + Pushing a ref whose name contains non-ASCII character with the

94 + "--force-with-lease" option did not work over smart HTTP protocol,

95 + which has been corrected.

96 +

97 + Will cook in 'next'.

98 +

99 +

100 +* ct/mv-unmerged-path-error (2020-07-20) 1 commit

101 + (merged to 'next' on 2020-07-21 at c17007237a)

102 + + git-mv: improve error message for conflicted file

103 +

104 + "git mv src dst", when src is an unmerged path, errored out

105 + correctly but with an incorrect error message to claim that src is

106 + not tracked, which has been clarified.

107 +

108 + Will cook in 'next'.

109 +

110 +

111 +* jt/pack-objects-prefetch-in-batch (2020-07-21) 2 commits

112 + - pack-objects: prefetch objects to be packed

113 + - pack-objects: refactor to oid_object_info_extended

114 +

115 + While packing many objects in a repository with a promissor remote,

116 + lazily fetching missing objects from the promissor remote one by

117 + one may be inefficient---the code now attempts to fetch all the

118 + missing objects in batch (obviously this won't work for a lazy

119 + clone that lazily fetches tree objects as you cannot even enumerate

120 + what blobs are missing until you learn which trees are missing).

121 +

122 + Will merge to 'next'.

123 +

124 +

125 +* jt/pretend-object-never-come-from-elsewhere (2020-07-21) 1 commit

126 + - sha1-file: make pretend_object_file() not prefetch

127 +

128 + The pretend-object mechanism checks if the given object already

129 + exists in the object store before deciding to keep the data

130 + in-core, but the check would have triggered lazy fetching of such

131 + an object from a promissor remote.

132 +

133 + Will merge to 'next'.

134 +

135 +

136 +* sg/ci-git-path-fix-with-pyenv (2020-07-21) 1 commit

137 + - travis-ci: remove bogus 'pyenv' in the Linux jobs

138 +

139 + CI fixup---tests of Python scripts didn't use the version of Git

140 + that is being tested.

141 +

142 + Will merge to 'next'.

143 +

144 +--------------------------------------------------

145 +[Stalled]

146 +

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

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

149 + - transport: parse report options for tracking refs

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

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

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

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

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

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

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

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

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

159 +

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

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

162 +

163 + Needs review.

164 +

165 +

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

167 + - submodule: use submodule repository when preparing summary

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

169 +

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

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

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

173 +

174 + Needs tests.

175 +

176 +

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

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

179 +

180 + The "%(push:remoteref)" placeholder in the "--format=" argument of

181 + "git format-patch" (and friends) only showed what got explicitly

182 + configured, not what ref at the receiving end would be updated when

183 + "git push" was used, as it ignored the default behaviour (e.g. update

184 + the same ref as the source).

185 +

186 + Expecting a reroll.

187 + cf. <20200416152145.wp2zeibxmuyas6y6@feanor>

188 +

189 +

190 +* mr/bisect-in-c-2 (2020-07-17) 14 commits

191 + - SQUASH??? do not add new users of git_path_bisect_head()

192 + - bisect--helper: retire `--bisect-autostart` subcommand

193 + - bisect--helper: retire `--write-terms` subcommand

194 + - bisect--helper: retire `--check-expected-revs` subcommand

195 + - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C

196 + - bisect--helper: retire `--next-all` subcommand

197 + - bisect--helper: retire `--bisect-clean-state` subcommand

198 + - bisect--helper: finish porting `bisect_start()` to C

199 + - bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C

200 + - bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'

201 + - bisect--helper: reimplement `bisect_autostart` shell function in C

202 + - bisect--helper: introduce new `write_in_file()` function

203 + - bisect--helper: use '-res' in 'cmd_bisect__helper' return

204 + - bisect--helper: BUG() in cmd_*() on invalid subcommand

205 +

206 + Rewrite of the remainder of "git bisect" script in C continues.

207 +

208 + Needs more work.

209 +

210 +

211 +* mk/use-size-t-in-zlib (2018-10-15) 1 commit

212 + - zlib.c: use size_t for size

213 +

214 + The wrapper to call into zlib followed our long tradition to use

215 + "unsigned long" for sizes of regions in memory, which have been

216 + updated to use "size_t".

217 +

218 +--------------------------------------------------

219 +[Cooking]

220

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

222 - t: remove test_oid_init in tests

@@ -147,124 +285,61 @@ repositories listed at

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

286 optionally stop describing what was fetched in FETCH_HEAD.

287

288 + Will merge to 'next' after the release.

289 +

290

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

292 - completion: add show --color-moved[-ws]

293

294 Command line completion (in contrib/) update.

295

296 + Will merge to 'next' after the release.

297 + A follow-up patch to reduce duplication may be warranted.

298 +

299

300 * 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

301 + . Make HEAD a PSEUDOREF rather than PER_WORKTREE.

302 + . Modify pseudo refs through ref backend storage

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

304 (this branch uses hn/reftable.)

305

306 Further preliminary change to refs API.

307

308

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

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

310 + (merged to 'next' on 2020-07-20 at 28e85288e5)

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

312

313 Fetching from a lazily cloned repository resulted at the server

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

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

316

173 - Will merge to 'next'.

317 + Will cook in 'next'.

318

319

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

177 - - read-cache: remove bogus shortcut

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

321 + (merged to 'next' on 2020-07-20 at 617fe6aecc)

322 + + read-cache: remove bogus shortcut

323

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

325 optimization.

326

182 ---------------------------------------------------

183 -[Stalled]

184 -

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 -

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 -

201 - Needs review.

202 -

203 -

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 -

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 -

212 - Needs tests.

213 -

214 -

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

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

217 -

218 - The "%(push:remoteref)" placeholder in the "--format=" argument of

219 - "git format-patch" (and friends) only showed what got explicitly

220 - configured, not what ref at the receiving end would be updated when

221 - "git push" was used, as it ignored the default behaviour (e.g. update

222 - the same ref as the source).

223 -

224 - Expecting a reroll.

225 - cf. <20200416152145.wp2zeibxmuyas6y6@feanor>

226 -

227 -

228 -* mr/bisect-in-c-2 (2020-07-08) 13 commits

229 - . bisect--helper: retire `--bisect-autostart` subcommand

230 - . bisect--helper: retire `--write-terms` subcommand

231 - . bisect--helper: retire `--check-expected-revs` subcommand

232 - . bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C

233 - . bisect--helper: retire `--next-all` subcommand

234 - . bisect--helper: retire `--bisect-clean-state` subcommand

235 - . bisect--helper: finish porting `bisect_start()` to C

236 - . bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C

237 - . bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'

238 - . bisect--helper: reimplement `bisect_autostart` shell function in C

239 - . bisect--helper: introduce new `write_in_file()` function

240 - . bisect--helper: use '-res' in 'cmd_bisect__helper' return

241 - . bisect--helper: BUG() in cmd_*() on invalid subcommand

242 -

243 - Rewrite of the remainder of "git bisect" script in C continues.

244 -

245 - Needs more work.

246 -

247 -

248 -* mk/use-size-t-in-zlib (2018-10-15) 1 commit

249 - - zlib.c: use size_t for size

250 -

251 - The wrapper to call into zlib followed our long tradition to use

252 - "unsigned long" for sizes of regions in memory, which have been

253 - updated to use "size_t".

327 + Will cook in 'next'.

328

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

256 -[Cooking]

329

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

331 + (merged to 'next' on 2020-07-20 at bd4a9946a6)

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

333 + + t9400: don't use test_must_fail with cvs

334 + + t9834: remove use of `test_might_fail p4`

335 + + t7107: don't use test_must_fail()

336 + + t5324: reorder `run_with_limited_open_files test_might_fail`

337 + + t3701: stop using `env` in force_color()

338

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

340

341 + Will cook in 'next'.

342 +

343

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

345 - midx: use start_delayed_progress()

@@ -306,13 +381,14 @@ repositories listed at

381

382

383 * 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

384 + (merged to 'next' on 2020-07-20 at e7c4b8f9ae)

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

386 + + t6300: test refs pointing to tree and blob

387 + + Documentation: clarify %(contents:XXXX) doc

388

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

390

315 - Will merge to 'next'.

391 + Will cook in 'next'.

392

393

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

@@ -323,6 +399,8 @@ repositories listed at

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

400 reduce the amount of text that requires manual merging.

401

402 + Expecting a reroll.

403 +

404

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

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

@@ -340,18 +418,17 @@ repositories listed at

418

419

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

343 - - upload-pack.c: introduce 'uploadpack.filter.tree.maxDepth'

344 - - upload-pack.c: pass 'struct list_objects_filter_options *'

345 - - upload-pack.c: allow banning certain object filter(s)

346 - - list_objects_filter_options: introduce 'list_object_filter_config_name'

421 + . upload-pack.c: introduce 'uploadpack.filter.tree.maxDepth'

422 + . upload-pack.c: pass 'struct list_objects_filter_options *'

423 + . upload-pack.c: allow banning certain object filter(s)

424 + . list_objects_filter_options: introduce 'list_object_filter_config_name'

425

426 The component to respond to "git fetch" request is made more

427 configurable to selectively allow or reject object filtering

428 specification used for partial cloning.

429

352 - Waiting for reviews to settle.

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

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

430 + Expecting a reroll.

431 + cf. <20200721202740.GA34538@syl.lan>

432

433

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

@@ -397,7 +474,8 @@ repositories listed at

474

475 CMake support to build with MSVC for Windows bypassing the Makefile.

476

400 - Waiting for a (hopefully final) review.

477 + Will merge to 'next' after the release.

478 + cf. https://github.com/git/git/runs/892824895

479

480

481 * sg/commit-graph-cleanups (2020-06-08) 10 commits

What's cooking (2020/07 #04)