128107fd77 · 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, #03; Fri, 8)

4 -X-master-at: b994622632154fc3b17fb40a38819ad954a5fb88

5 -X-next-at: 0e0b3e54bef85529846ce55fa34a67746509a2cd

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

4 +X-master-at: 172e8ff696ea0ebe002bdd1f61a3544fc7f71a61

5 +X-next-at: e517b1a6695bd6c33127de6780ca7c4351647a1b

6

7 -What's cooking in git.git (May 2020, #03; Fri, 8)

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

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

9

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

@@ -25,131 +25,66 @@ of the repositories listed at

25 --------------------------------------------------

26 [Graduated to "master"]

27

28 -* ah/userdiff-markdown (2020-05-02) 1 commit

29 - (merged to 'next' on 2020-05-05 at b8e64b75d0)

30 - + userdiff: support Markdown

31 -

32 - The userdiff patterns for Markdown documents have been added.

33 -

34 -

35 -* bc/doc-credential-helper-value (2020-05-06) 1 commit

36 - (merged to 'next' on 2020-05-07 at de685cea7b)

37 - + docs: document credential.helper allowed values

38 -

39 - Doc update.

40 -

41 -

42 -* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit

43 - (merged to 'next' on 2020-05-06 at 5cccb0e1a8)

44 - + builtin/receive-pack: avoid generic function name hmac()

45 -

46 - The <stdlib.h> header on NetBSD brings in its own definition of

47 - hmac() function (eek), which conflicts with our own and unrelated

48 - function with the same name. Our function has been renamed to work

49 - around the issue.

50 -

51 -

52 -* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits

53 - (merged to 'next' on 2020-05-05 at 5b919ec5d6)

54 - + credential-store: ignore bogus lines from store file

55 - + credential-store: document the file format a bit more

56 -

57 - With the recent tightening of the code that is used to parse

58 - various parts of a URL for use in the credential subsystem, a

59 - hand-edited credential-store file causes the credential helper to

60 - die, which is a bit too harsh to the users. Demote the error

61 - behaviour to just ignore and keep using well-formed lines instead.

62 -

63 -

64 -* cb/t0000-use-the-configured-shell (2020-05-07) 1 commit

65 - (merged to 'next' on 2020-05-07 at c5db4882c4)

66 - + t/t0000-basic: make sure subtests also use TEST_SHELL_PATH

67 -

68 - The basic test did not honor $TEST_SHELL_PATH setting, which has

69 - been corrected.

70 -

71 -

72 -* cb/test-bash-lineno-fix (2020-05-07) 1 commit

73 - (merged to 'next' on 2020-05-07 at 8c07e52d2f)

74 - + t/test_lib: avoid naked bash arrays in file_lineno

75 -

76 - Recent change to show files and line numbers of a breakage during

77 - test (only available when running the tests with bash) were hurting

78 - other shells with syntax errors, which has been corrected.

79 -

80 -

81 -* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit

82 - (merged to 'next' on 2020-05-06 at 8b570b7722)

83 - + Doc: reference the "stash list" in autostash docs

84 -

85 - Doc update.

86 -

87 -

88 -* dl/switch-c-option-in-error-message (2020-04-30) 1 commit

89 - (merged to 'next' on 2020-05-05 at 472db48735)

90 - + switch: fix errors and comments related to -c and -C

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

34

92 - In error messages that "git switch" mentions its option to create a

93 - new branch, "-b/-B" options were shown, where "-c/-C" options

94 - should be, which has been corrected.

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

36 + API.

37

38

97 -* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit

98 - (merged to 'next' on 2020-05-06 at de7b38aee5)

99 - + sparse-checkout: stop blocking empty workdirs

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

42

101 - The sparse-checkout patterns have been forbidden from excluding all

102 - paths, leaving an empty working tree, for a long time. This

103 - limitation has been lifted.

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.

47

48

106 -* es/restore-staged-from-head-by-default (2020-05-05) 1 commit

107 - (merged to 'next' on 2020-05-06 at c4abf9b5df)

108 - + restore: default to HEAD when combining --staged and --worktree

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

52

110 - "git restore --staged --worktree" now defaults to take the contents

111 - out of "HEAD", instead of erring out.

53 + Code clean-up.

54

55

114 -* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit

115 - (merged to 'next' on 2020-05-06 at 2325148249)

116 - + CodingGuidelines: drop arithmetic expansion advice to use "$x"

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

59

118 - The coding guideline for shell scripts instructed to refer to a

119 - variable with dollar-sign inside arithmetic expansion to work

120 - around a bug in old versions of dash, which is a thing of the past.

121 - Now we are not forbidden from writing $((var+1)).

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.

63

64

124 -* jk/credential-sample-update (2020-05-01) 2 commits

125 - (merged to 'next' on 2020-05-06 at c72ed30ee5)

126 - + gitcredentials(7): make shell-snippet example more realistic

127 - + gitcredentials(7): clarify quoting of helper examples

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

129 - The samples in the credential documentation has been updated to

130 - make it clear that we depict what would appear in the .git/config

131 - file, by adding appropriate quotes as needed..

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

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

72

73

134 -* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits

135 - (merged to 'next' on 2020-05-06 at f4e4ca3cb4)

136 - + ref-filter: apply fallback refname sort only after all user sorts

137 - + ref-filter: apply --ignore-case to all sorting keys

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

77

139 - "git branch" and other "for-each-ref" variants accepted multiple

140 - --sort=<key> options in the increasing order of precedence, but it

141 - had a few breakages around "--ignore-case" handling, and tie-breaking

142 - with the refname, which have been fixed.

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

79 + users can specify which branches to build.

80

81

145 -* jt/commit-graph-plug-memleak (2020-05-04) 1 commit

146 - (merged to 'next' on 2020-05-06 at 0f80a2b561)

147 - + commit-graph: avoid memory leaks

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

149 - Fix a leak noticed by fuzzer.

86 + Random bits of FAQ.

87

151 ---------------------------------------------------

152 -[New Topics]

88

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

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

@@ -157,119 +92,186 @@ of the repositories listed at

92

93 Random bits of FAQ.

94

160 - Will merge to 'master'.

95

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

99

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

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

165 - + gitfaq: fetching and pulling a repository

166 -

167 - Random bits of FAQ.

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

101

169 - Will merge to 'master'.

102

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"

109

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

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

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

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

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

111 + advantage of the pack bitmap when available.

112

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

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

113

180 - Will merge to 'master'.

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

120

121 + Code cleanup.

122

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

184 - - t5500: count objects through stderr, not trace

123 +--------------------------------------------------

124 +[New Topics]

125

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

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

129

188 - Expecting an update to clarify the log message.

189 - Otherwise the change itself looked good.

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.

133

134 + Will merge to 'master'.

135

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

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

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

136

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

197 - users can specify which branches to build.

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

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

139

199 - Will merge to 'master'.

140 + The "--prepare-p4-only" option is supposed to stop after replaying

141 + one changeset, but kept going (by mistake?)

142

143 + Needs review by some p4 folks.

144

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

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

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

145

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

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

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

209 - e.g. auto-follow tags.

146 +* jt/curl-verbose-on-trace-curl (2020-05-11) 2 commits

147 + (merged to 'next' on 2020-05-11 at 814e31b9d4)

148 + + http, imap-send: stop using CURLOPT_VERBOSE

149 + + t5551: test that GIT_TRACE_CURL redacts password

150

211 - Will merge to 'master'.

151 + Rewrite support for GIT_CURL_VERBOSE in terms of GIT_TRACE_CURL.

152

153 + Expecting further work on optionally disabling reacting authinfo

154

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

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

155

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

218 - CRLF line ending, which has been corrected.

156 +* mt/grep-sparse-checkout (2020-05-11) 4 commits

157 + - config: add setting to ignore sparsity patterns in some cmds

158 + - grep: honor sparse checkout patterns

159 + - config: load the correct config.worktree file

160 + - doc: grep: unify info on configuration variables

161

220 - Will merge to 'next'.

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

163 + paths.

164

165

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

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

225 - + bloom: fix `make sparse` warning

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

227 - Code clean-up.

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

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

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

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

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

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

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

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

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

184 + repack.* configuration variables.

185

186 Will merge to 'master'.

187

188

243 -* hn/refs-cleanup (2020-05-08) 4 commits

244 - - t: use update-ref and show-ref to reading/writing refs

245 - - refs: document how ref_iterator_advance_fn should handle symrefs

246 - - Iterate over the "refs/" namespace in for_each_[raw]ref

247 - - refs.h: clarify reflog iteration order

248 - (this branch is used by hn/reftable.)

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

250 - Preliminary clean-ups around refs API.

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

252 - Needs minor rework but otherwise looks ready.

253 - I splitted these out of the hn/reftable topic, hoping that these

254 - should be easier to polish and merge quickly than the rest of the

255 - series.

197 + Will merge to 'master'.

198

199

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

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

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

201 + - ci: avoid pounding on the poor ci-artifacts container

202

261 - Doc update.

203 + Instead of downloading Windows SDK for CI jobs for windows builds

204 + from an external site (wingit.blob.core.windows.net), use the one

205 + created in the windows-build job, to work around quota issues at

206 + the external site.

207

208 Will merge to 'next'.

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

210 +

211 +

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

213 + - remote-testgit: adapt for object-format

214 + - bundle: detect hash algorithm when reading refs

215 + - t5300: pass --object-format to git index-pack

216 + - t5703: use object-format serve option

217 + - t5702: offer an object-format capability in the test

218 + - t/helper: initialize the repository for test-sha1-array

219 + - remote-curl: avoid truncating refs with ls-remote

220 + - t1050: pass algorithm to index-pack when outside repo

221 + - builtin/index-pack: add option to specify hash algorithm

222 + - remote-curl: detect algorithm for dumb HTTP by size

223 + - builtin/ls-remote: initialize repository based on fetch

224 + - t5500: make hash independent

225 + - serve: advertise object-format capability for protocol v2

226 + - connect: parse v2 refs with correct hash algorithm

227 + - connect: pass full packet reader when parsing v2 refs

228 + - Documentation/technical: document object-format for protocol v2

229 + - t1302: expect repo format version 1 for SHA-256

230 + - builtin/show-index: provide options to determine hash algo

231 + - t5302: modernize test formatting

232 + - packfile: compute and use the index CRC offset

233 + - t3200: mark assertion with SHA1 prerequisite

234 + - setup: set the_repository's hash algo when checking format

235 + - fetch-pack: parse and advertise the object-format capability

236 + - t5704: send object-format capability with SHA-256

237 + - t5562: pass object-format in synthesized test data

238 + - builtin/clone: initialize hash algorithm properly

239 + - remote-curl: implement object-format extensions

240 + - transport-helper: implement object-format extensions

241 + - docs: update remote helper docs for object-format extensions

242 + - builtin/receive-pack: detect when the server doesn't support our hash

243 + - connect: detect algorithm when fetching refs

244 + - fetch-pack: detect when the server doesn't support our hash

245 + - connect: make parse_feature_value extern

246 + - send-pack: detect when the server doesn't support our hash

247 + - connect: add function to detect supported v1 hash functions

248 + - transport: add a hash algorithm member

249 + - pkt-line: add a member for hash algorithm

250 + - connect: add function to fetch value of a v2 server capability

251 + - connect: add function to parse multiple v1 capability values

252 + - remote: advertise the object-format capability on the server side

253 + - wrapper: add function to compare strings with different NUL termination

254 + - connect: have ref processing code take struct packet_reader

255 + - Documentation: document v1 protocol object-format capability

256 + - t1050: match object ID paths in a hash-insensitive way

257 +

258 + SHA-256 migration work continues.

259 +

260 +

261 +* dd/t1509-i18n-fix (2020-05-13) 1 commit

262 + - t1509: correct i18n test

263 +

264 + A few tests were not i18n clean.

265

266 + Will merge to 'next'.

267

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

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

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

268

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

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

270 + - bugreport: include user interactive shell

271 + - help: add shell-path to --build-options

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

273

272 - Will merge to 'master'.

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

275

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

277 [Stalled]

@@ -284,59 +286,62 @@ of the repositories listed at

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

287 [Cooking]

288

287 -* ds/line-log-on-bloom (2020-05-01) 12 commits

288 - - line-log: integrate with changed-path Bloom filters

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

290 - - line-log: more responsive, incremental 'git log -L'

291 - - t4211-line-log: add tests for parent oids

292 - - line-log: remove unused fields from 'struct line_log_data'

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

294 - - bloom: use num_changes not nr for limit detection

295 - - bloom: parse commit before computing filters

296 - - bloom: de-duplicate directory entries

297 - - Documentation: changed-path Bloom filters use byte words

298 - - test-bloom: fix usage typo

299 - - bloom: fix whitespace around tab length

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

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

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

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

294

304 - Expecting a reroll.

305 - cf. <4b7e5f51-9fdb-45ac-123e-2589087afa48@gmail.com>

295 + Will merge to 'master'.

296

297

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

309 - - rebase --autosquash: fix a potential segfault

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

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

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

313 - fix-up of yet another step).

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

303 + CRLF line ending, which has been corrected.

304

315 - Expecting a bit more explanation in the log message.

305 + Will merge to 'master'.

306

307

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

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

320 - + credential: document protocol updates

321 - + credential: update gitcredentials documentation

322 - + credential: correct order of parameters for credential_match

323 - + credential: update description for credential_from_url_gently

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

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

326 - API.

312 + Doc update.

313

314 Will merge to 'master'.

315

316

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

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

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

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

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

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

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

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

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

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

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

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

323 + + 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

331

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

339 - advantage of the pack bitmap when available.

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

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

334 +

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

347

@@ -371,22 +376,12 @@ of the repositories listed at

376

377

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

374 - - bugreport: collect list of populated hooks

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

378 - Needs polishing the tests.

379 -

380 -

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

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

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

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

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

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

387 -

388 - Code cleanup.

389 -

385 Will merge to 'master'.

386

387

@@ -468,15 +463,31 @@ of the repositories listed at

463 Needs review.

464

465

471 -* hn/reftable (2020-05-08) 8 commits

466 +* hn/refs-cleanup (2020-05-11) 6 commits

467 + - reftable: define version 2 of the spec to accomodate SHA256

468 + - reftable: clarify how empty tables should be written

469 + - reftable: file format documentation

470 + - refs: document how ref_iterator_advance_fn should handle symrefs

471 + - t: use update-ref and show-ref to reading/writing refs

472 + - refs.h: clarify reflog iteration order

473 + (this branch is used by hn/reftable.)

474 +

475 + Preliminary clean-ups around refs API, plus file format

476 + specification documentation for the reftable backend.

477 +

478 + I splitted these out of the hn/reftable topic, hoping that these

479 + should be easier to polish and merge quickly than the rest of the

480 + series.

481 +

482 +

483 +* hn/reftable (2020-05-11) 7 commits

484 - Add some reftable testing infrastructure

485 - vcxproj: adjust for the reftable changes

486 - Reftable support for git-core

487 - Add reftable library

476 - - reftable: clarify how empty tables should be written

477 - - reftable: define version 2 of the spec to accomodate SHA256

478 - - reftable: file format documentation

488 - Add .gitattributes for the reftable/ directory

489 + - Iterate over the "refs/" namespace in for_each_[raw]ref

490 + - Write pseudorefs through ref backends.

491 (this branch uses hn/refs-cleanup.)

492

493 A new refs backend "reftable" to replace the traditional

What's cooking (2020/05 #04)