624efa2176 · 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 (May 2020, #04; Wed, 13)

4 -X-master-at: 172e8ff696ea0ebe002bdd1f61a3544fc7f71a61

5 -X-next-at: e517b1a6695bd6c33127de6780ca7c4351647a1b

3 +Subject: What's cooking in git.git (May 2020, #05; Thu, 14)

4 +X-master-at: efcab5b7a3d2ce2ae4bf808b335938098b18d960

5 +X-next-at: 67701bce43065d3b2fbf3423f8cb13c0db322fee

6

7 -What's cooking in git.git (May 2020, #04; Wed, 13)

7 +What's cooking in git.git (May 2020, #05; Thu, 14)

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

9

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

@@ -12,10 +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 -I have been a bit more aggressive than usual in merging topics down

16 -to 'next' and 'master' this week, in preparation for -rc0, scheduled

17 -on the 14th. We may need to apply last-minute fixes to some of

18 -these topics but let's hope that we can keep them to the minimum.

15 +2.27-rc0 has been tagged. I haven't seen much discussion on

16 +proposed topics for 2.26.3, so haven't merged anything (yet), but

17 +now the 'master' and 'next' front would be more quiescent, efforts

18 +focused on regressions, perhaps people can help pick the topics for

19 +the maintenance track.

20

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

22 of the repositories listed at

@@ -25,114 +26,137 @@ of the repositories listed at

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

27 [Graduated to "master"]

28

28 -* cb/credential-doc-fixes (2020-05-07) 4 commits

29 - (merged to 'next' on 2020-05-07 at 993b36071e)

30 - + credential: document protocol updates

31 - + credential: update gitcredentials documentation

32 - + credential: correct order of parameters for credential_match

33 - + credential: update description for credential_from_url_gently

29 +* ao/p4-d-f-conflict-recover (2020-05-10) 1 commit

30 + (merged to 'next' on 2020-05-11 at a83a2f6178)

31 + + git-p4: recover from inconsistent perforce history

32

35 - Minor in-code comments and documentation updates around credential

36 - API.

33 + "git p4" learned to recover from a (broken) state where a directory

34 + and a file are recorded at the same path in the Perforce repository

35 + the same way as their clients do.

36

37

39 -* cc/upload-pack-v2-fetch-fix (2020-05-08) 1 commit

40 - (merged to 'next' on 2020-05-08 at d26b87d06d)

41 - + upload-pack: clear filter_options for each v2 fetch command

38 +* cw/bisect-replay-with-dos (2020-05-08) 1 commit

39 + (merged to 'next' on 2020-05-11 at 2eb0edf56d)

40 + + bisect: allow CRLF line endings in "git bisect replay" input

41

43 - Serving a "git fetch" client over "git://" and "ssh://" protocols

44 - using the on-wire protocol version 2 was buggy on the server end

45 - when the client needs to make a follow-up request to

46 - e.g. auto-follow tags.

42 + "git bisect replay" had trouble with input files when they used

43 + CRLF line ending, which has been corrected.

44

45

49 -* dd/bloom-sparse-fix (2020-05-07) 1 commit

50 - (merged to 'next' on 2020-05-08 at 1067403c01)

51 - + bloom: fix `make sparse` warning

46 +* ds/bloom-cleanup (2020-05-11) 7 commits

47 + (merged to 'next' on 2020-05-11 at 046d49d455)

48 + + completion: offer '--(no-)patch' among 'git log' options

49 + + bloom: use num_changes not nr for limit detection

50 + + bloom: de-duplicate directory entries

51 + + Documentation: changed-path Bloom filters use byte words

52 + + bloom: parse commit before computing filters

53 + + test-bloom: fix usage typo

54 + + bloom: fix whitespace around tab length

55

53 - Code clean-up.

56 + Code cleanup and typofixes.

57 + This is an early part of ds/line-log-on-bloom that has been cooking

58 + in 'next'.

59

60

56 -* ds/sparse-updates-oob-access-fix (2020-05-08) 1 commit

57 - (merged to 'next' on 2020-05-08 at fd007758ea)

58 - + unpack-trees: avoid array out-of-bounds error

61 +* es/bugreport-with-hooks (2020-05-07) 1 commit

62 + (merged to 'next' on 2020-05-11 at 2dd5d90a34)

63 + + bugreport: collect list of populated hooks

64 + (this branch is used by es/bugreport-shell.)

65

60 - The code to skip unmerged paths in the index when sparse checkout

61 - is in use would have made out-of-bound access of the in-core index

62 - when the last path was unmerged, which has been corrected.

66 + "git bugreport" learned to report enabled hooks in the repository.

67

68

65 -* jc/auto-gc-quiet (2020-05-07) 2 commits

66 - (merged to 'next' on 2020-05-07 at 6cc69513c3)

67 - + auto-gc: pass --quiet down from am, commit, merge and rebase

68 - + auto-gc: extract a reusable helper from "git fetch"

69 +* es/trace-log-progress (2020-05-12) 1 commit

70 + (merged to 'next' on 2020-05-13 at a127540258)

71 + + trace2: log progress time and throughput

72

70 - Teach "am", "commit", "merge" and "rebase", when they are run with

71 - the "--quiet" option, to pass "--quiet" down to "gc --auto".

73 + Teach codepaths that show progress meter to also use the

74 + start_progress() and the stop_progress() calls as a "region" to be

75 + traced.

76

77

74 -* jk/ci-only-on-selected-branches (2020-05-07) 1 commit

75 - (merged to 'next' on 2020-05-07 at f3227dd3d3)

76 - + ci: allow per-branch config for GitHub Actions

78 +* jc/codingstyle-compare-with-null (2020-05-08) 1 commit

79 + (merged to 'next' on 2020-05-11 at d18f0d930e)

80 + + CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL

81

78 - Instead of always building all branches at GitHub via Actions,

79 - users can specify which branches to build.

82 + Doc update.

83

84

82 -* ss/faq-fetch-pull (2020-05-06) 1 commit

83 - (merged to 'next' on 2020-05-07 at d57224374e)

84 - + gitfaq: fetching and pulling a repository

85 +* js/rebase-autosquash-double-fixup-fix (2020-05-09) 1 commit

86 + (merged to 'next' on 2020-05-11 at 3cdf7f7ece)

87 + + rebase --autosquash: fix a potential segfault

88

86 - Random bits of FAQ.

89 + "rebase -i" segfaulted when rearranging a sequence that has a

90 + fix-up that applies another fix-up (which may or may not be a

91 + fix-up of yet another step).

92

93

89 -* ss/faq-ignore (2020-05-06) 1 commit

90 - (merged to 'next' on 2020-05-07 at 6273caaf77)

91 - + gitfaq: files in .gitignore are tracked

94 +* jt/t5500-unflake (2020-05-06) 1 commit

95 + (merged to 'next' on 2020-05-13 at 11450265ec)

96 + + t5500: count objects through stderr, not trace

97

93 - Random bits of FAQ.

98 + Test fix for a topic already in 'master' and meant for 'maint'.

99

100

96 -* ss/submodule-set-url-in-c (2020-05-08) 1 commit

97 - (merged to 'next' on 2020-05-08 at 93e390eb33)

98 - + submodule: port subcommand 'set-url' from shell to C

101 +* rs/fsck-duplicate-names-in-trees (2020-05-11) 1 commit

102 + (merged to 'next' on 2020-05-11 at f603ca2528)

103 + + fsck: report non-consecutive duplicate names in trees

104

100 - Rewriting various parts of "git submodule" in C continues.

105 + "git fsck" ensures that the paths recorded in tree objects are

106 + sorted and without duplicates, but it failed to notice a case where

107 + a blob is followed by entries that sort before a tree with the same

108 + name. This has been corrected.

109

110

103 -* tb/bitmap-walk-with-tree-zero-filter (2020-05-04) 4 commits

104 - (merged to 'next' on 2020-05-06 at fbb3fbbb85)

105 - + pack-bitmap: pass object filter to fill-in traversal

106 - + pack-bitmap.c: support 'tree:0' filtering

107 - + pack-bitmap.c: make object filtering functions generic

108 - + list-objects-filter: treat NULL filter_options as "disabled"

111 +* sn/midx-repack-with-config (2020-05-10) 2 commits

112 + (merged to 'next' on 2020-05-11 at d73f8f51d6)

113 + + multi-pack-index: respect repack.packKeptObjects=false

114 + + midx: teach "git multi-pack-index repack" honor "git repack" configurations

115

110 - The object walk with object filter "--filter=tree:0" can now take

111 - advantage of the pack bitmap when available.

116 + "git multi-pack-index repack" has been taught to honor some

117 + repack.* configuration variables.

118

119 +--------------------------------------------------

120 +[New Topics]

121

114 -* tb/shallow-cleanup (2020-04-30) 4 commits

115 - (merged to 'next' on 2020-05-05 at 647588a8bd)

116 - + shallow: use struct 'shallow_lock' for additional safety

117 - + shallow.h: document '{commit,rollback}_shallow_file'

118 - + shallow: extract a header file for shallow-related functions

119 - + commit: make 'commit_graft_pos' non-static

122 +* cb/no-more-gmtime (2020-05-14) 1 commit

123 + - compat: remove gmtime

124

121 - Code cleanup.

125 + Code clean-up by removing a compatibility implementation of a

126 + function we no longer use.

127

123 ---------------------------------------------------

124 -[New Topics]

128 + Will merge to 'next'.

129

126 -* ao/p4-d-f-conflict-recover (2020-05-10) 1 commit

127 - (merged to 'next' on 2020-05-11 at a83a2f6178)

128 - + git-p4: recover from inconsistent perforce history

130

130 - "git p4" learned to recover from a (broken) state where a directory

131 - and a file are recorded at the same path in the Perforce repository

132 - the same way as their clients do.

131 +* cb/t4210-illseq-auto-detect (2020-05-14) 1 commit

132 + - t4210: detect REG_ILLSEQ dynamically

133 +

134 + As FreeBSD is not the only platform whose regexp library needs

135 + REG_ILLSEQ prerequisite, add a logic to detect the prerequisite

136 + automatically.

137

134 - Will merge to 'master'.

138

139 +* en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit

140 + - merge-recursive: fix rename/rename(1to2) for working tree with a binary

141 +

142 + When a binary file gets renamed and then merged with a minor

143 + change, the copy on the working tree while conflict resolution

144 + sometimes got "their" version and not "ours".

145 +

146 + Will merge to 'next'.

147 +

148 +--------------------------------------------------

149 +[Stalled]

150 +

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

152 + - zlib.c: use size_t for size

153 +

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

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

156 + updated to use "size_t".

157 +

158 +--------------------------------------------------

159 +[Cooking]

160

161 * bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit

162 - git-p4.py: fix --prepare-p4-only error with multiple commits

@@ -162,39 +186,7 @@ of the repositories listed at

186 "git grep" has been tweaked to be limited to the sparse checkout

187 paths.

188

165 -

166 -* rs/fsck-duplicate-names-in-trees (2020-05-11) 1 commit

167 - (merged to 'next' on 2020-05-11 at f603ca2528)

168 - + fsck: report non-consecutive duplicate names in trees

169 -

170 - "git fsck" ensures that the paths recorded in tree objects are

171 - sorted and without duplicates, but it failed to notice a case where

172 - a blob is followed by entries that sort before a tree with the same

173 - name. This has been corrected.

174 -

175 - Will merge to 'master'.

176 -

177 -

178 -* sn/midx-repack-with-config (2020-05-10) 2 commits

179 - (merged to 'next' on 2020-05-11 at d73f8f51d6)

180 - + multi-pack-index: respect repack.packKeptObjects=false

181 - + midx: teach "git multi-pack-index repack" honor "git repack" configurations

182 -

183 - "git multi-pack-index repack" has been taught to honor some

184 - repack.* configuration variables.

185 -

186 - Will merge to 'master'.

187 -

188 -

189 -* es/trace-log-progress (2020-05-12) 1 commit

190 - (merged to 'next' on 2020-05-13 at a127540258)

191 - + trace2: log progress time and throughput

192 -

193 - Teach codepaths that show progress meter to also use the

194 - start_progress() and the stop_progress() calls as a "region" to be

195 - traced.

196 -

197 - Will merge to 'master'.

189 + Expecting a reroll.

190

191

192 * js/ci-sdk-download-fix (2020-05-12) 1 commit

@@ -209,7 +201,7 @@ of the repositories listed at

201 Hopefully this can go away once cmake-for-windows-build topic lands?

202

203

212 -* bc/sha-256-part-2 (2020-05-12) 44 commits

204 +* bc/sha-256-part-2 (2020-05-13) 44 commits

205 - remote-testgit: adapt for object-format

206 - bundle: detect hash algorithm when reading refs

207 - t5300: pass --object-format to git index-pack

@@ -269,84 +261,26 @@ of the repositories listed at

261 * es/bugreport-shell (2020-05-12) 2 commits

262 - bugreport: include user interactive shell

263 - help: add shell-path to --build-options

272 - (this branch uses es/bugreport-with-hooks.)

264

265 "git bugreport" learns to report what shell is in use.

266

276 ---------------------------------------------------

277 -[Stalled]

278 -

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

280 - - zlib.c: use size_t for size

281 -

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

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

284 - updated to use "size_t".

285 -

286 ---------------------------------------------------

287 -[Cooking]

288 -

289 -* jt/t5500-unflake (2020-05-06) 1 commit

290 - (merged to 'next' on 2020-05-13 at 11450265ec)

291 - + t5500: count objects through stderr, not trace

292 -

293 - Test fix for a topic already in 'master' and meant for 'maint'.

294 -

295 - Will merge to 'master'.

296 -

267

298 -* cw/bisect-replay-with-dos (2020-05-08) 1 commit

299 - (merged to 'next' on 2020-05-11 at 2eb0edf56d)

300 - + bisect: allow CRLF line endings in "git bisect replay" input

301 -

302 - "git bisect replay" had trouble with input files when they used

303 - CRLF line ending, which has been corrected.

304 -

305 - Will merge to 'master'.

306 -

307 -

308 -* jc/codingstyle-compare-with-null (2020-05-08) 1 commit

309 - (merged to 'next' on 2020-05-11 at d18f0d930e)

310 - + CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL

311 -

312 - Doc update.

313 -

314 - Will merge to 'master'.

315 -

316 -

317 -* ds/line-log-on-bloom (2020-05-11) 12 commits

268 +* ds/line-log-on-bloom (2020-05-11) 5 commits

269 (merged to 'next' on 2020-05-11 at 046d49d455)

270 + line-log: integrate with changed-path Bloom filters

271 + line-log: try to use generation number-based topo-ordering

272 + line-log: more responsive, incremental 'git log -L'

273 + t4211-line-log: add tests for parent oids

274 + line-log: remove unused fields from 'struct line_log_data'

324 - + completion: offer '--(no-)patch' among 'git log' options

325 - + bloom: use num_changes not nr for limit detection

326 - + bloom: de-duplicate directory entries

327 - + Documentation: changed-path Bloom filters use byte words

328 - + bloom: parse commit before computing filters

329 - + test-bloom: fix usage typo

330 - + bloom: fix whitespace around tab length

275

276 "git log -L..." now takes advantage of the "which paths are touched

277 by this commit?" info stored in the commit-graph system.

278

335 - Will merge to 'master'.

336 -

337 -

338 -* js/rebase-autosquash-double-fixup-fix (2020-05-09) 1 commit

339 - (merged to 'next' on 2020-05-11 at 3cdf7f7ece)

340 - + rebase --autosquash: fix a potential segfault

341 -

342 - "rebase -i" segfaulted when rearranging a sequence that has a

343 - fix-up that applies another fix-up (which may or may not be a

344 - fix-up of yet another step).

345 -

346 - Will merge to 'master'.

279 + Will cook in 'next'.

280

281

349 -* tb/commit-graph-no-check-oids (2020-05-05) 8 commits

282 +* tb/commit-graph-no-check-oids (2020-05-14) 9 commits

283 + - fixup! builtin/commit-graph.c: extract 'read_one_commit()'

284 - commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag

285 - t5318: reorder test below 'graph_read_expect'

286 - commit-graph.c: simplify 'fill_oids_from_commits'

@@ -358,10 +292,6 @@ of the repositories listed at

292

293 Clean-up the commit-graph codepath.

294

361 - Expecting a reroll.

362 - cf. <20200507204204.GF29683@coredump.intra.peff.net>

363 - cf. <20200507200305.GB29683@coredump.intra.peff.net>

364 -

295

296 * dl/test-must-fail-fixes-5 (2020-05-05) 4 commits

297 - lib-submodule-update: pass OVERWRITING_FAIL

@@ -375,16 +305,6 @@ of the repositories listed at

305 cf. <cover.1588162842.git.liu.denton@gmail.com>

306

307

378 -* es/bugreport-with-hooks (2020-05-07) 1 commit

379 - (merged to 'next' on 2020-05-11 at 2dd5d90a34)

380 - + bugreport: collect list of populated hooks

381 - (this branch is used by es/bugreport-shell.)

382 -

383 - "git bugreport" learned to report enabled hooks in the repository.

384 -

385 - Will merge to 'master'.

386 -

387 -

308 * mr/bisect-in-c-2 (2020-04-23) 12 commits

309 - bisect--helper: retire `--bisect-autostart` subcommand

310 - bisect--helper: retire `--write-terms` subcommand

What's cooking (2020/05 #05)