055f745e1b · matheusbsbs/matheus-bagliano

@@ -1,9 +1,10 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2021, #08; Mon, 23)

3 -X-master-at: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf

4 -X-next-at: 09f9fbdd9fd7fdf4d572df3ab25b50b66ac29d70

2 +Bcc: lwn@lwn.net

3 +Subject: What's cooking in git.git (Aug 2021, #09; Sun, 29)

4 +X-master-at: c4203212e360b25a1c69467b5a8437d45a373cac

5 +X-next-at: ba50c8fa2411f9e6a5c9ec9617eca2637ef4e4cb

6

6 -What's cooking in git.git (Aug 2021, #08; Mon, 23)

7 +What's cooking in git.git (Aug 2021, #09; Sun, 29)

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

9

10 Here are the topics that have been cooking in my tree. Commits

@@ -17,17 +18,18 @@ useful"). Do not read too much into a topic being in (or not in)

18 'seen'. The ones marked with '.' do not appear in any of the

19 integration branches, but I am still holding onto them.

20

20 -The tip of 'next' has been rewound, and the first batch of this

21 -cycle should be in 'master' in a few days. As discussed, let's make

22 -'ort' the default early in this cycle.

21 +The first batch of topics for the new cycle are now in 'master'.

22 +The second batch will primarily be to graduate 'ort' as the

23 +default.

24

24 -Most notably, since the "errno cleanup around refs API" topics have

25 -been blocking the "reftable backend" topic, I've reverted the former

26 -out of 'next' and moved them to near the tip of 'seen', essentially

27 -giving priority to the latter. In other words, I'd expect to see

28 -that the "reftable" topic to move before the "errno cleanup" topic,

29 -and also expect that any breakage, when both are merged to 'seen',

30 -would be resolved by adjusting the "errno cleanup" topic.

25 +I've been a bit under the weather during the last week and wanted to

26 +concentrate on what to push out to 'master', so while I may have

27 +picked up new topics and replaced existing topics with their new

28 +versions, I haven't added or updated my summaries on their doneness

29 +to this document. Help is appreciated.

30 +

31 +There also may be other patches sent to the list that I haven't

32 +looked at, whether they were reviewed by others or not.

33

34 Copies of the source code to Git live in many repositories, and the

35 following is a list of the ones I push into or their mirrors. Some

@@ -58,141 +60,18 @@ Release tarballs are available at:

60 https://www.kernel.org/pub/software/scm/git/

61

62 --------------------------------------------------

61 -[New Topics]

62 -

63 -* ps/fetch-optim (2021-08-20) 7 commits

64 - - fetch: avoid second connectivity check if we already have all objects

65 - - fetch: refactor fetch refs to be more extendable

66 - - fetch-pack: optimize loading of refs via commit graph

67 - - connected: refactor iterator to return next object ID directly

68 - - fetch: avoid unpacking headers in object existence check

69 - - fetch: speed up lookup of want refs via commit-graph

70 - - Merge branch 'ps/connectivity-optim' into ps/fetch-optim

71 - (this branch uses ps/connectivity-optim.)

72 -

73 ---------------------------------------------------

74 -[Stalled]

75 -

76 -* gh/gitweb-branch-sort (2021-06-10) 1 commit

77 - - gitweb: use HEAD as secondary sort key in git_get_heads_list()

78 -

79 - Tie-break branches that point at the same object in the list of

80 - branches on GitWeb to show the one pointed at by HEAD early.

81 -

82 - Waiting for reviews.

83 -

84 -

85 -* lh/systemd-timers (2021-07-02) 3 commits

86 - - maintenance: add support for systemd timers on Linux

87 - - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`

88 - - cache.h: Introduce a generic "xdg_config_home_for(…)" function

89 -

90 - "git maintenance" scheduler learned to use systemd timers as a

91 - possible backend.

92 -

93 - Expecting a reroll.

94 -

95 -

96 -* es/superproject-aware-submodules (2021-08-19) 5 commits

97 - - fixup! introduce submodule.superprojectGitDir record

98 - - submodule: record superproject gitdir during 'update'

99 - - submodule: record superproject gitdir during absorbgitdirs

100 - - introduce submodule.superprojectGitDir record

101 - - t7400-submodule-basic: modernize inspect() helper

102 -

103 - A configuration variable in a submodule points at the location of

104 - the superproject it is bound to (RFC).

105 -

106 - Looking good.

107 -

108 -

109 -* en/zdiff3 (2021-06-15) 2 commits

110 - - update documentation for new zdiff3 conflictStyle

111 - - xdiff: implement a zealous diff3, or "zdiff3"

112 -

113 - "Zealous diff3" style of merge conflict presentation has been added.

114 -

115 - Expecting a reroll.

116 - cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>

117 -

118 -

119 -* ao/p4-avoid-decoding (2021-04-12) 2 commits

120 - - git-p4: do not decode data from perforce by default

121 - - git-p4: avoid decoding more data from perforce

122 -

123 - "git p4" in Python-2 days used to accept a lot more kinds of data

124 - from Perforce server as uninterrupted byte sequence, but after

125 - switching to Python-3, too many things are expected to be in UTF-8,

126 - which broke traditional use cases.

127 -

128 - Waiting for reviews.

129 -

130 -

131 -* tv/p4-fallback-encoding (2021-04-30) 1 commit

132 - - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset

133 -

134 - "git p4" learns the fallbackEncoding configuration variable to

135 - safely accept changeset descriptions that aren't written in UTF-8.

136 -

137 - Waiting for reviews.

138 -

139 -

140 -* ab/fsck-unexpected-type (2021-07-12) 21 commits

141 - - fsck: report invalid object type-path combinations

142 - - fsck: report invalid types recorded in objects

143 - - object-store.h: move read_loose_object() below 'struct object_info'

144 - - fsck: don't hard die on invalid object types

145 - - object-file.c: return -2 on "header too long" in unpack_loose_header()

146 - - object-file.c: return -1, not "status" from unpack_loose_header()

147 - - object-file.c: guard against future bugs in loose_object_info()

148 - - object-file.c: stop dying in parse_loose_header()

149 - - object-file.c: split up ternary in parse_loose_header()

150 - - object-file.c: simplify unpack_loose_short_header()

151 - - object-file.c: add missing braces to loose_object_info()

152 - - object-file.c: make parse_loose_header_extended() public

153 - - object-file.c: don't set "typep" when returning non-zero

154 - - cache.h: move object functions to object-store.h

155 - - cat-file tests: test for current --allow-unknown-type behavior

156 - - cat-file tests: add corrupt loose object test

157 - - rev-list tests: test for behavior with invalid object types

158 - - cat-file tests: test that --allow-unknown-type isn't on by default

159 - - cat-file tests: test for missing object with -t and -s

160 - - fsck tests: add test for fsck-ing an unknown type

161 - - fsck tests: refactor one test to use a sub-repo

162 -

163 - "git fsck" has been taught to report mismatch between expected and

164 - actual types of an object better.

165 -

166 - Needs review.

167 -

168 ---------------------------------------------------

169 -[Cooking]

170 -

171 -* ps/fetch-pack-load-refs-optim (2021-08-04) 1 commit

172 - (merged to 'next' on 2021-08-23 at 09f9fbdd9f)

173 - + fetch-pack: speed up loading of refs via commit graph

174 -

175 - Originally merged to 'next' on 2021-08-09

63 +[Graduated to 'master']

64

177 - Loading of ref tips to prepare for common ancestry negotiation in

178 - "git fetch-pack" has been optimized by taking advantage of the

179 - commit graph when available.

180 -

181 - Will merge to 'master'.

182 -

183 -

184 -* jc/bisect-sans-show-branch (2021-07-28) 2 commits

185 - (merged to 'next' on 2021-08-23 at 4d01043b2e)

186 - + bisect: simplify return code from bisect_checkout()

187 - + bisect: do not run show-branch just to show the current commit

188 -

189 - Originally merged to 'next' on 2021-08-02

65 +* ab/bundle-doc (2021-08-02) 4 commits

66 + (merged to 'next' on 2021-08-23 at af25d34e71)

67 + + bundle doc: replace "basis" with "prerequsite(s)"

68 + + bundle doc: elaborate on rev<->ref restriction

69 + + bundle doc: elaborate on object prerequisites

70 + + bundle doc: rewrite the "DESCRIPTION" section

71

191 - "git bisect" spawned "git show-branch" only to pretty-print the

192 - title of the commit after checking out the next version to be

193 - tested; this has been rewritten in C.

72 + Originally merged to 'next' on 2021-08-04

73

195 - Will merge to 'master'.

74 + Doc update.

75

76

77 * ab/http-drop-old-curl (2021-07-30) 5 commits

@@ -207,7 +86,16 @@ Release tarballs are available at:

86

87 Support for ancient versions of cURL library has been dropped.

88

210 - Will merge to 'master'.

89 +

90 +* ab/pack-stdin-packs-fix (2021-07-09) 2 commits

91 + (merged to 'next' on 2021-08-23 at ec9d0ba95f)

92 + + pack-objects: fix segfault in --stdin-packs option

93 + + pack-objects tests: cover blindspots in stdin handling

94 +

95 + Originally merged to 'next' on 2021-08-04

96 +

97 + Input validation of "git pack-objects --stdin-packs" has been

98 + corrected.

99

100

101 * ds/add-with-sparse-index (2021-07-29) 5 commits

@@ -223,8 +111,6 @@ Release tarballs are available at:

111

112 "git add" can work better with the sparse index.

113

226 - Will merge to 'master'.

227 -

114

115 * en/ort-perf-batch-15 (2021-08-03) 9 commits

116 (merged to 'next' on 2021-08-23 at d22a850986)

@@ -242,25 +128,16 @@ Release tarballs are available at:

128

129 Final batch for "merge -sort" optimization.

130

245 - Will merge to 'master'.

246 -

131

248 -* js/expand-runtime-prefix (2021-07-26) 6 commits

249 - (merged to 'next' on 2021-08-23 at cf274b0177)

250 - + expand_user_path: allow in-flight topics to keep using the old name

251 - + interpolate_path(): allow specifying paths relative to the runtime prefix

252 - + Use a better name for the function interpolating paths

253 - + expand_user_path(): clarify the role of the `real_home` parameter

254 - + expand_user_path(): remove stale part of the comment

255 - + tests: exercise the RUNTIME_PREFIX feature

132 +* es/trace2-log-parent-process-name (2021-07-22) 2 commits

133 + (merged to 'next' on 2021-08-23 at a93182081d)

134 + + tr2: log parent process name

135 + + tr2: make process info collection platform-generic

136

137 Originally merged to 'next' on 2021-08-04

138

259 - Pathname expansion (like "~username/") learned a way to specify a

260 - location relative to Git installation (e.g. its $sharedir which is

261 - $(prefix)/share), with "%(prefix)".

262 -

263 - Will merge to 'master'.

139 + trace2 logs learned to show parent process name to see in what

140 + context Git was invoked.

141

142

143 * hn/refs-test-cleanup (2021-08-02) 11 commits

@@ -282,127 +159,450 @@ Release tarballs are available at:

159 A handful of tests that assumed implementation details of files

160 backend for refs have been cleaned up.

161

285 - Will merge to 'master'.

162

163 +* jc/bisect-sans-show-branch (2021-07-28) 2 commits

164 + (merged to 'next' on 2021-08-23 at 4d01043b2e)

165 + + bisect: simplify return code from bisect_checkout()

166 + + bisect: do not run show-branch just to show the current commit

167

288 -* ab/bundle-doc (2021-08-02) 4 commits

289 - (merged to 'next' on 2021-08-23 at af25d34e71)

290 - + bundle doc: replace "basis" with "prerequsite(s)"

291 - + bundle doc: elaborate on rev<->ref restriction

292 - + bundle doc: elaborate on object prerequisites

293 - + bundle doc: rewrite the "DESCRIPTION" section

168 + Originally merged to 'next' on 2021-08-02

169 +

170 + "git bisect" spawned "git show-branch" only to pretty-print the

171 + title of the commit after checking out the next version to be

172 + tested; this has been rewritten in C.

173 +

174 +

175 +* js/expand-runtime-prefix (2021-07-26) 6 commits

176 + (merged to 'next' on 2021-08-23 at cf274b0177)

177 + + expand_user_path: allow in-flight topics to keep using the old name

178 + + interpolate_path(): allow specifying paths relative to the runtime prefix

179 + + Use a better name for the function interpolating paths

180 + + expand_user_path(): clarify the role of the `real_home` parameter

181 + + expand_user_path(): remove stale part of the comment

182 + + tests: exercise the RUNTIME_PREFIX feature

183 +

184 + Originally merged to 'next' on 2021-08-04

185 +

186 + Pathname expansion (like "~username/") learned a way to specify a

187 + location relative to Git installation (e.g. its $sharedir which is

188 + $(prefix)/share), with "%(prefix)".

189 +

190 +

191 +* jt/push-negotiation-fixes (2021-07-15) 3 commits

192 + (merged to 'next' on 2021-08-23 at 6b3dcc1092)

193 + + fetch: die on invalid --negotiation-tip hash

194 + + send-pack: fix push nego. when remote has refs

195 + + send-pack: fix push.negotiate with remote helper

196 +

197 + Originally merged to 'next' on 2021-08-09

198 +

199 + Bugfix for common ancestor negotiation recently introduced in "git

200 + push" codepath.

201 +

202 +

203 +* ps/fetch-pack-load-refs-optim (2021-08-04) 1 commit

204 + (merged to 'next' on 2021-08-23 at 09f9fbdd9f)

205 + + fetch-pack: speed up loading of refs via commit graph

206 +

207 + Originally merged to 'next' on 2021-08-09

208 +

209 + Loading of ref tips to prepare for common ancestry negotiation in

210 + "git fetch-pack" has been optimized by taking advantage of the

211 + commit graph when available.

212 +

213 +

214 +* zh/ref-filter-raw-data (2021-07-26) 6 commits

215 + (merged to 'next' on 2021-08-23 at 5c06fb48a5)

216 + + ref-filter: add %(rest) atom

217 + + ref-filter: use non-const ref_format in *_atom_parser()

218 + + ref-filter: --format=%(raw) support --perl

219 + + ref-filter: add %(raw) atom

220 + + ref-filter: add obj-type check in grab contents

221 + + Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data

222 +

223 + Originally merged to 'next' on 2021-08-04

224 +

225 + Prepare the "ref-filter" machinery that drives the "--format"

226 + option of "git for-each-ref" and its friends to be used in "git

227 + cat-file --batch".

228 +

229 +--------------------------------------------------

230 +[New Topics]

231 +

232 +* ab/commit-graph-usage (2021-08-25) 7 commits

233 + - commit-graph: show "unexpected subcommand" error

234 + - commit-graph: show usage on "commit-graph [write|verify] garbage"

235 + - commit-graph: early exit to "usage" on !argc

236 + - multi-pack-index: refactor "goto usage" pattern

237 + - commit-graph: use parse_options_concat()

238 + - commit-graph: remove redundant handling of -h

239 + - commit-graph: define common usage with a macro

240 +

241 +

242 +* ab/ls-remote-packet-trace (2021-08-24) 1 commit

243 + - ls-remote: set packet_trace_identity(<name>)

244 +

245 + Debugging aid fix.

246 +

247 + Will merge to 'next'.

248 +

249 +

250 +* ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit

251 + - rebase: emit one "fatal" in "fatal: fatal: <error>"

252 +

253 + Error message fix.

254 +

255 + Will merge to 'next'.

256 +

257 +

258 +* ab/refs-errno-cleanup (2021-08-25) 4 commits

259 + - refs: make errno output explicit for refs_resolve_ref_unsafe

260 + - refs: explicitly return failure_errno from parse_loose_ref_contents

261 + - branch tests: test for errno propagating on failing read

262 + - refs: add failure_errno to refs_read_raw_ref() signature

263 + (this branch is used by hn/reftable; uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)

264 +

265 + The "remainder" of hn/refs-errno-cleanup topic.

266 +

267 +

268 +* ab/retire-advice-config (2021-08-25) 4 commits

269 + - advice: move advice.graftFileDeprecated squashing to commit.[ch]

270 + - advice: remove use of global advice_add_embedded_repo

271 + - advice: remove read uses of most global `advice_` variables

272 + - advice: add enum variants for missing advice variables

273 +

274 + Code clean up to migrate callers from older advice_config[] based

275 + API to newer advice_if_enabled() and advice_enabled() API.

276 +

277 + Want to merge to 'next' but a tree-wide change like this can

278 + interfere other topics in flight, so I'll need to block some time

279 + to see how safe it is to proceed before we can do so.

280 +

281 +

282 +* dd/diff-files-unmerged-fix (2021-08-25) 1 commit

283 + - diff-lib: ignore paths that are outside $cwd if --relative asked

284 +

285 + "git diff --relative" segfaulted and/or produced incorrect result

286 + when there are unmerged paths.

287 +

288 + Will merge to 'next'.

289 +

290 +

291 +* dd/t6300-wo-gpg-fix (2021-08-25) 2 commits

292 + - t6300: check for cat-file exit status code

293 + - t6300: don't run cat-file on non-existent object

294 +

295 + Test fix.

296 +

297 + Will merge to 'next'.

298 +

299 +

300 +* ga/send-email-sendmail-cmd (2021-08-24) 1 commit

301 + - t9001: PATH must not use Windows-style paths

302 +

303 + Test fix.

304 +

305 + Will merge to 'next'.

306 +

307 +

308 +* jb/midx-revindex-fix (2021-08-23) 1 commit

309 + - multi-pack-index: fix *.rev cleanups with --object-dir

310 +

311 + An implementation in "multi-pack-index write" that takes object

312 + directory inconsistently used that and the object store of the

313 + default repository, causing segfaults and possibly corrupting

314 + repositories.

315 +

316 + On hold.

317 + cf. <xmqqo89jbf49.fsf@gitster.g>

318 +

319 +

320 +* jk/t5323-no-pack-test-fix (2021-08-25) 1 commit

321 + - t5323: drop mentions of "master"

322 +

323 + Test fix.

324 +

325 + Will merge to 'next'.

326 +

327 +

328 +* js/maintenance-launchctl-fix (2021-08-24) 2 commits

329 + - maintenance: skip bootout/bootstrap when plist is registered

330 + - maintenance: create `launchctl` configuration using a lock file

331 +

332 + "git maintenance" scheduler fix for macOS.

333 +

334 + Will merge to 'next'.

335 +

336 +

337 +* jv/pkt-line-batch (2021-08-26) 2 commits

338 + - upload-pack: use stdio in send_ref callbacks

339 + - pkt-line: add packet_fwrite

340 +

341 + Reduce number of write(2) system calls while sending the

342 + ref advertisement.

343 +

344 + Expecting a reroll.

345 +

346 +

347 +* me/t5582-cleanup (2021-08-24) 1 commit

348 + - t5582: remove spurious 'cd "$D"' line

349 +

350 + Test fix.

351 +

352 + Will merge to 'next'.

353 +

354 +

355 +* mh/credential-leakfix (2021-08-25) 1 commit

356 + - credential: fix leak in credential_apply_config()

357 +

358 + Leak fix.

359 +

360 + Will merge to 'next'.

361 +

362 +

363 +* mt/quiet-with-delayed-checkout (2021-08-26) 1 commit

364 + - checkout: make delayed checkout respect --quiet and --no-progress

365 +

366 + The delayed checkout code path in "git checkout" etc. were chatty

367 + even when --quiet and/or --no-progress options were given.

368 +

369 + Will merge to 'next'.

370 +

371 +

372 +* ps/fetch-omit-formatting-under-quiet (2021-08-25) 1 commit

373 + - fetch: skip formatting updated refs with `--quiet`

374 +

375 + "git fetch --quiet" optimization to avoid useless computation of

376 + info that will never be displayed.

377 +

378 + Expecting a reroll.

379 + cf. <xmqqo89lid59.fsf@gitster.g>

380 +

381 +

382 +* ps/ls-refs-strbuf-optim (2021-08-25) 1 commit

383 + - ls-refs: reuse buffer when sending refs

384 +

385 + Micro-optimization for the wire protocol driver.

386 +

387 + Will merge to 'next'.

388 +

389 +

390 +* rs/branch-allow-deleting-dangling (2021-08-27) 1 commit

391 + - branch: allow deleting dangling branches with --force

392 +

393 + "git branch -D <branch>" used to refuse to remove a broken branch

394 + ref that points at a missing commit, which has been corrected.

395 +

396 + Will merge to 'next'.

397 +

398 +

399 +* rs/git-mmap-uses-malloc (2021-08-24) 1 commit

400 + - compat: let git_mmap use malloc(3) directly

401 +

402 + mmap() imitation used to call xmalloc() that dies upon malloc()

403 + failure, which has been corrected to just return an error to the

404 + caller to be handled.

405 +

406 + Will merge to 'next'.

407 +

408 +

409 +* rs/xopen-reports-open-failures (2021-08-25) 2 commits

410 + - use xopen() to handle fatal open(2) failures

411 + - xopen: explicitly report creation failures

412 +

413 + Error diagnostics improvement.

414 +

415 + Will merge to 'next'.

416 +

417 +

418 +* sg/column-nl (2021-08-26) 1 commit

419 + - column: fix parsing of the '--nl' option

420 +

421 + The parser for the "--nl" option of "git column" has been

422 + corrected.

423 +

424 + Will merge to 'next'.

425 +

426 +

427 +* ab/unbundle-progress (2021-08-27) 5 commits

428 + - bundle: show progress on "unbundle"

429 + - index-pack: add --progress-title option

430 + - bundle API: change "flags" to be "extra_index_pack_args"

431 + - strvec: add a strvec_pushvec()

432 + - bundle API: start writing API documentation

433 +

434 +

435 +* jk/log-warn-on-bogus-encoding (2021-08-27) 2 commits

436 + - docs: use "character encoding" to refer to commit-object encoding

437 + - logmsg_reencode(): warn when iconv() fails

438 +

439 +

440 +* rs/archive-use-object-id (2021-08-27) 1 commit

441 + - archive: convert queue_directory to struct object_id

442 +

443 +

444 +* rs/show-branch-simplify (2021-08-27) 1 commit

445 + - show-branch: simplify rev_is_head()

446 +

447 +--------------------------------------------------

448 +[Stalled]

449 +

450 +* gh/gitweb-branch-sort (2021-06-10) 1 commit

451 + - gitweb: use HEAD as secondary sort key in git_get_heads_list()

452 +

453 + Tie-break branches that point at the same object in the list of

454 + branches on GitWeb to show the one pointed at by HEAD early.

455

295 - Originally merged to 'next' on 2021-08-04

456 + Waiting for reviews.

457

297 - Doc update.

458

299 - Will merge to 'master'.

459 +* es/superproject-aware-submodules (2021-08-19) 5 commits

460 + - fixup! introduce submodule.superprojectGitDir record

461 + - submodule: record superproject gitdir during 'update'

462 + - submodule: record superproject gitdir during absorbgitdirs

463 + - introduce submodule.superprojectGitDir record

464 + - t7400-submodule-basic: modernize inspect() helper

465

466 + A configuration variable in a submodule points at the location of

467 + the superproject it is bound to (RFC).

468

302 -* ab/pack-stdin-packs-fix (2021-07-09) 2 commits

303 - (merged to 'next' on 2021-08-23 at ec9d0ba95f)

304 - + pack-objects: fix segfault in --stdin-packs option

305 - + pack-objects tests: cover blindspots in stdin handling

469 + Looking good.

470

307 - Originally merged to 'next' on 2021-08-04

471

309 - Input validation of "git pack-objects --stdin-packs" has been

310 - corrected.

472 +* en/zdiff3 (2021-06-15) 2 commits

473 + - update documentation for new zdiff3 conflictStyle

474 + - xdiff: implement a zealous diff3, or "zdiff3"

475

312 - Will merge to 'master'.

476 + "Zealous diff3" style of merge conflict presentation has been added.

477

478 + Expecting a reroll.

479 + cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>

480

315 -* jt/push-negotiation-fixes (2021-07-15) 3 commits

316 - (merged to 'next' on 2021-08-23 at 6b3dcc1092)

317 - + fetch: die on invalid --negotiation-tip hash

318 - + send-pack: fix push nego. when remote has refs

319 - + send-pack: fix push.negotiate with remote helper

481

321 - Originally merged to 'next' on 2021-08-09

482 +* ao/p4-avoid-decoding (2021-04-12) 2 commits

483 + - git-p4: do not decode data from perforce by default

484 + - git-p4: avoid decoding more data from perforce

485

323 - Bugfix for common ancestor negotiation recently introduced in "git

324 - push" codepath.

486 + "git p4" in Python-2 days used to accept a lot more kinds of data

487 + from Perforce server as uninterrupted byte sequence, but after

488 + switching to Python-3, too many things are expected to be in UTF-8,

489 + which broke traditional use cases.

490

326 - Will merge to 'master'.

491 + Waiting for reviews.

492

493

329 -* zh/ref-filter-raw-data (2021-07-26) 6 commits

330 - (merged to 'next' on 2021-08-23 at 5c06fb48a5)

331 - + ref-filter: add %(rest) atom

332 - + ref-filter: use non-const ref_format in *_atom_parser()

333 - + ref-filter: --format=%(raw) support --perl

334 - + ref-filter: add %(raw) atom

335 - + ref-filter: add obj-type check in grab contents

336 - + Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data

494 +* tv/p4-fallback-encoding (2021-04-30) 1 commit

495 + - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset

496

338 - Originally merged to 'next' on 2021-08-04

497 + "git p4" learns the fallbackEncoding configuration variable to

498 + safely accept changeset descriptions that aren't written in UTF-8.

499

340 - Prepare the "ref-filter" machinery that drives the "--format"

341 - option of "git for-each-ref" and its friends to be used in "git

342 - cat-file --batch".

500 + Waiting for reviews.

501

344 - Will merge to 'master'.

502

503 +* ab/fsck-unexpected-type (2021-07-12) 21 commits

504 + - fsck: report invalid object type-path combinations

505 + - fsck: report invalid types recorded in objects

506 + - object-store.h: move read_loose_object() below 'struct object_info'

507 + - fsck: don't hard die on invalid object types

508 + - object-file.c: return -2 on "header too long" in unpack_loose_header()

509 + - object-file.c: return -1, not "status" from unpack_loose_header()

510 + - object-file.c: guard against future bugs in loose_object_info()

511 + - object-file.c: stop dying in parse_loose_header()

512 + - object-file.c: split up ternary in parse_loose_header()

513 + - object-file.c: simplify unpack_loose_short_header()

514 + - object-file.c: add missing braces to loose_object_info()

515 + - object-file.c: make parse_loose_header_extended() public

516 + - object-file.c: don't set "typep" when returning non-zero

517 + - cache.h: move object functions to object-store.h

518 + - cat-file tests: test for current --allow-unknown-type behavior

519 + - cat-file tests: add corrupt loose object test

520 + - rev-list tests: test for behavior with invalid object types

521 + - cat-file tests: test that --allow-unknown-type isn't on by default

522 + - cat-file tests: test for missing object with -t and -s

523 + - fsck tests: add test for fsck-ing an unknown type

524 + - fsck tests: refactor one test to use a sub-repo

525 +

526 + "git fsck" has been taught to report mismatch between expected and

527 + actual types of an object better.

528

347 -* es/trace2-log-parent-process-name (2021-07-22) 2 commits

348 - (merged to 'next' on 2021-08-23 at a93182081d)

349 - + tr2: log parent process name

350 - + tr2: make process info collection platform-generic

529 + Needs review.

530

352 - Originally merged to 'next' on 2021-08-04

531 +--------------------------------------------------

532 +[Cooking]

533

354 - trace2 logs learned to show parent process name to see in what

355 - context Git was invoked.

534 +* lh/systemd-timers (2021-08-27) 3 commits

535 + - maintenance: add support for systemd timers on Linux

536 + - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`

537 + - cache.h: Introduce a generic "xdg_config_home_for(…)" function

538

357 - Will merge to 'master'.

539 + "git maintenance" scheduler learned to use systemd timers as a

540 + possible backend.

541 +

542 +

543 +* ps/fetch-optim (2021-08-24) 8 commits

544 + - fetch: avoid second connectivity check if we already have all objects

545 + - fetch: merge fetching and consuming refs

546 + - fetch: refactor fetch refs to be more extendable

547 + - fetch-pack: optimize loading of refs via commit graph

548 + - connected: refactor iterator to return next object ID directly

549 + - fetch: avoid unpacking headers in object existence check

550 + - fetch: speed up lookup of want refs via commit-graph

551 + - Merge branch 'ps/connectivity-optim' into ps/fetch-optim

552 + (this branch uses ps/connectivity-optim.)

553

554

555 * sg/make-fix-ar-invocation (2021-08-19) 1 commit

361 - - Makefile: remove archives before manipulating them with 'ar'

556 + (merged to 'next' on 2021-08-24 at 9a3df9ec56)

557 + + Makefile: remove archives before manipulating them with 'ar'

558

559 Build fix.

560

365 - Will merge to 'next'.

561 + Will merge to 'master'.

562

563

564 * ti/tcsh-completion-regression-fix (2021-08-18) 1 commit

369 - - completion: tcsh: Fix regression by drop of wrapper functions

565 + (merged to 'next' on 2021-08-24 at 8fa66cf037)

566 + + completion: tcsh: Fix regression by drop of wrapper functions

567

568 Update to the command line completion (in contrib/) for tcsh.

569

373 - Will merge to 'next'.

570 + Will merge to 'master'.

571

572

573 * fc/completion-updates (2021-08-18) 4 commits

377 - - completion: bash: add correct suffix in variables

378 - - completion: bash: fix for multiple dash commands

379 - - completion: bash: fix for suboptions with value

380 - - completion: bash: fix prefix detection in branch.*

574 + (merged to 'next' on 2021-08-24 at 593cd75c64)

575 + + completion: bash: add correct suffix in variables

576 + + completion: bash: fix for multiple dash commands

577 + + completion: bash: fix for suboptions with value

578 + + completion: bash: fix prefix detection in branch.*

579

580 Command line completion updates.

581

384 - Will merge to 'next'.

582 + Will merge to 'master'.

583

584

387 -* ar/submodule-run-update-procedure (2021-08-13) 1 commit

585 +* ar/submodule-run-update-procedure (2021-08-24) 1 commit

586 - submodule--helper: run update procedures from C

587

588 Reimplementation of parts of "git submodule" in C continues.

589

590

591 * cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit

394 - - ci: use upload-artifacts v1 for dockerized jobs

592 + (merged to 'next' on 2021-08-24 at afdbb7ee8d)

593 + + ci: use upload-artifacts v1 for dockerized jobs

594

595 Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the

596 new version has a blocker bug for that architecture.

597

399 - Will merge to 'next'.

598 + Will merge to 'master'.

599

600

601 * pw/rebase-skip-final-fix (2021-08-13) 3 commits

403 - - rebase --continue: remove .git/MERGE_MSG

404 - - rebase --apply: restore some tests

405 - - t3403: fix commit authorship

602 + (merged to 'next' on 2021-08-24 at 73ec41e9dd)

603 + + rebase --continue: remove .git/MERGE_MSG

604 + + rebase --apply: restore some tests

605 + + t3403: fix commit authorship

606

607 Checking out all the paths from HEAD during the last conflicted

608 step in "git rebase" and continuing would cause the step to be

@@ -410,7 +610,7 @@ Release tarballs are available at:

610 $GIT_DIR and confuses the next "git commit", which has been

611 corrected.

612

413 - Will merge to 'next'.

613 + Will merge to 'master'.

614

615

616 * ab/help-autocorrect-prompt (2021-08-14) 1 commit

@@ -422,22 +622,24 @@ Release tarballs are available at:

622

623

624 * pw/rebase-r-fixes (2021-08-23) 4 commits

425 - - rebase -r: fix merge -c with a merge strategy

426 - - rebase -r: don't write .git/MERGE_MSG when fast-forwarding

427 - - rebase -i: add another reword test

428 - - rebase -r: make 'merge -c' behave like reword

625 + (merged to 'next' on 2021-08-24 at 81c6aff70a)

626 + + rebase -r: fix merge -c with a merge strategy

627 + + rebase -r: don't write .git/MERGE_MSG when fast-forwarding

628 + + rebase -i: add another reword test

629 + + rebase -r: make 'merge -c' behave like reword

630

631 Various bugs in "git rebase -r" have been fixed.

632

432 - Will merge to 'next'.

633 + Will merge to 'master'.

634

635

636 * th/userdiff-more-java (2021-08-11) 1 commit

436 - - userdiff: improve java hunk header regex

637 + (merged to 'next' on 2021-08-24 at a5617abd3e)

638 + + userdiff: improve java hunk header regex

639

640 The userdiff pattern for "java" language has been updated.

641

440 - Will merge to 'next'.

642 + Will merge to 'master'.

643

644

645 * zh/cherry-pick-advice (2021-08-23) 1 commit

@@ -481,46 +683,51 @@ Release tarballs are available at:

683

684

685 * bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit

484 - - t5607: avoid using prerequisites to select algorithm

686 + (merged to 'next' on 2021-08-24 at 66c1e510ff)

687 + + t5607: avoid using prerequisites to select algorithm

688

689 The current implementation of GIT_TEST_FAIL_PREREQS is broken in

690 that checking for the lack of a prerequisite would not work. Avoid

691 the use of "if ! test_have_prereq X" in a test script.

692

490 - Will merge to 'next'.

693 + Will merge to 'master'.

694

695

696 * jk/commit-edit-fixup-fix (2021-08-15) 1 commit

494 - - commit: restore --edit when combined with --fixup

697 + (merged to 'next' on 2021-08-24 at 0c625438c3)

698 + + commit: restore --edit when combined with --fixup

699

700 "git commit --fixup" now works with "--edit" again, after it was

701 broken in v2.32.

702

499 - Will merge to 'next'.

703 + Will merge to 'master'.

704

705

706 * tl/traverse-non-commits-rename (2021-08-12) 1 commit

503 - - list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"

707 + (merged to 'next' on 2021-08-24 at 55cc85c20a)

708 + + list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"

709

710 Meh.

711

507 - Will merge to 'next'.

712 + Will merge to 'master'.

713

714

715 * cb/ci-freebsd-update (2021-08-12) 1 commit

511 - - ci: update freebsd 12 cirrus job

716 + (merged to 'next' on 2021-08-24 at 1ecf63af7d)

717 + + ci: update freebsd 12 cirrus job

718

719 Update FreeBSD CI job

720

515 - Will merge to 'next'.

721 + Will merge to 'master'.

722

723

724 * cb/builtin-merge-format-string-fix (2021-08-09) 1 commit

519 - - builtin/merge: avoid -Wformat-extra-args from ancient Xcode

725 + (merged to 'next' on 2021-08-24 at 6e94c19f1e)

726 + + builtin/merge: avoid -Wformat-extra-args from ancient Xcode

727

728 Code clean-up.

729

523 - Will merge to 'next'.

730 + Will merge to 'master'.

731

732

733 * ka/want-ref-in-namespace (2021-08-13) 3 commits

@@ -533,23 +740,6 @@ Release tarballs are available at:

740 want-ref requests.

741

742

536 -* np/blame-ignore-revs-file-may-be-optional (2021-08-09) 1 commit

537 - - blame: add config `blame.ignoreRevsFileIsOptional`

538 -

539 - When the file named by blame.ignoreRevsFile configuration variable

540 - does not exist, it causes "git blame" to die. Sometimes, it is

541 - useful if the files named by configuration variables can be made

542 - optional (it would allow ~/.gitconfig to give a filename, and make

543 - it effective only in repositories that have a file with that name).

544 -

545 - This uses an extra variable that marks that the variable is

546 - optional. Yet another alternative is being discussed to define

547 - syntax for "optional" filename values, so that the same mechanism

548 - can be used for not just blame.ignoreRevsFile but other filenames.

549 -

550 - Queued just as a reminder of the theme.

551 -

552 -

743 * cb/ci-build-pedantic (2021-08-11) 1 commit

744 - ci: run a pedantic build as part of the GitHub workflow

745

@@ -568,7 +758,6 @@ Release tarballs are available at:

758 - sparse-index: silently return when not using cone-mode patterns

759 - t7519: rewrite sparse index test

760 - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files

571 - (this branch uses ds/add-with-sparse-index.)

761

762 In cone mode, the sparse-index codepath learned to remove ignored

763 files (like build artifacts) outside the sparse cone, allowing the

@@ -577,32 +766,35 @@ Release tarballs are available at:

766

767

768 * jc/userdiff-pattern-hint (2021-08-11) 1 commit

580 - - userdiff: comment on the builtin patterns

769 + (merged to 'next' on 2021-08-24 at f29f51148f)

770 + + userdiff: comment on the builtin patterns

771

772 Remind developers that the userdiff patterns should be kept simple

773 and permissive, assuming that the contents they apply are always

774 syntactically correct.

775

586 - Will merge to 'next'.

776 + Will merge to 'master'.

777

778

779 * jk/apply-binary-hunk-parsing-fix (2021-08-10) 1 commit

590 - - apply: keep buffer/size pair in sync when parsing binary hunks

780 + (merged to 'next' on 2021-08-24 at c786cd1e8b)

781 + + apply: keep buffer/size pair in sync when parsing binary hunks

782

783 "git apply" miscounted the bytes and failed to read to the end of

784 binary hunks.

785

595 - Will merge to 'next'.

786 + Will merge to 'master'.

787

788

789 * jk/range-diff-fixes (2021-08-10) 3 commits

599 - - range-diff: use ssize_t for parsed "len" in read_patches()

600 - - range-diff: handle unterminated lines in read_patches()

601 - - range-diff: drop useless "offset" variable from read_patches()

790 + (merged to 'next' on 2021-08-24 at eff05f579e)

791 + + range-diff: use ssize_t for parsed "len" in read_patches()

792 + + range-diff: handle unterminated lines in read_patches()

793 + + range-diff: drop useless "offset" variable from read_patches()

794

795 "git range-diff" code clean-up.

796

605 - Will merge to 'next'.

797 + Will merge to 'master'.

798

799

800 * js/advise-when-skipping-cherry-picked (2021-08-10) 2 commits

@@ -632,18 +824,19 @@ Release tarballs are available at:

824

825

826 * ps/connectivity-optim (2021-08-09) 5 commits

635 - - revision: avoid hitting packfiles when commits are in commit-graph

636 - - commit-graph: split out function to search commit position

637 - - revision: stop retrieving reference twice

638 - - connected: do not sort input revisions

639 - - revision: separate walk and unsorted flags

827 + (merged to 'next' on 2021-08-24 at 94a7a04ca4)

828 + + revision: avoid hitting packfiles when commits are in commit-graph

829 + + commit-graph: split out function to search commit position

830 + + revision: stop retrieving reference twice

831 + + connected: do not sort input revisions

832 + + revision: separate walk and unsorted flags

833 (this branch is used by ps/fetch-optim.)

834

835 The revision traversal API has been optimized by taking advantage

836 of the commit-graph, when available, to determine if a commit is

837 reachable from any of the existing refs.

838

646 - Will merge to 'next'.

839 + Will merge to 'master'.

840

841

842 * ar/submodule-add-more (2021-08-10) 10 commits

@@ -669,64 +862,46 @@ Release tarballs are available at:

862

863 Build update.

864

865 + Will merge to 'next'.

866 +

867

868 * en/merge-strategy-docs (2021-08-05) 10 commits

674 - - Update error message and code comment

675 - - merge-strategies.txt: add coverage of the `ort` merge strategy

676 - - git-rebase.txt: correct out-of-date and misleading text about renames

677 - - merge-strategies.txt: fix simple capitalization error

678 - - merge-strategies.txt: avoid giving special preference to patience algorithm

679 - - merge-strategies.txt: do not imply using copy detection is desired

680 - - merge-strategies.txt: update wording for the resolve strategy

681 - - Documentation: edit awkward references to `git merge-recursive`

682 - - directory-rename-detection.txt: small updates due to merge-ort optimizations

683 - - git-rebase.txt: correct antiquated claims about --rebase-merges

869 + (merged to 'next' on 2021-08-24 at ceb66b1062)

870 + + Update error message and code comment

871 + + merge-strategies.txt: add coverage of the `ort` merge strategy

872 + + git-rebase.txt: correct out-of-date and misleading text about renames

873 + + merge-strategies.txt: fix simple capitalization error

874 + + merge-strategies.txt: avoid giving special preference to patience algorithm

875 + + merge-strategies.txt: do not imply using copy detection is desired

876 + + merge-strategies.txt: update wording for the resolve strategy

877 + + Documentation: edit awkward references to `git merge-recursive`

878 + + directory-rename-detection.txt: small updates due to merge-ort optimizations

879 + + git-rebase.txt: correct antiquated claims about --rebase-merges

880 (this branch is used by en/ort-becomes-the-default.)

881

882 Documentation updates.

883

688 - Will merge to 'next'.

884 + Will merge to 'master'.

885

886

887 * en/ort-becomes-the-default (2021-08-05) 2 commits

692 - - Update docs for change of default merge backend

693 - - Change default merge backend from recursive to ort

888 + (merged to 'next' on 2021-08-24 at 92f4e08d83)

889 + + Update docs for change of default merge backend

890 + + Change default merge backend from recursive to ort

891 (this branch uses en/merge-strategy-docs.)

892

893 Use `ort` instead of `recursive` as the default merge strategy.

894

698 - Will merge to 'next'.

895 + Will merge to 'master'.

896

897

898 * js/log-protocol-version (2021-08-10) 1 commit

702 - - connect, protocol: log negotiated protocol version

899 + (merged to 'next' on 2021-08-24 at aeeaee04fb)

900 + + connect, protocol: log negotiated protocol version

901

902 Debugging aid.

903

706 - Will merge to 'next'.

707 -

708 -

709 -* ow/clone-bare-origin (2021-08-03) 1 commit

710 - - clone: Allow combining --bare and --origin

711 -

712 - "git clone" did not like to take "--bare" and "--origin=X" at the

713 - same time; loosen the restriction.

714 -

715 - Under discussion. This may require some follow-on work.

716 - cf. <20210802174944.53745-1-oystwa@gmail.com>

717 -

718 -

719 -* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit

720 - - ll-merge: teach ll_binary_merge() a trivial three-way merge

721 -

722 - The built-in merge driver for binary files learned to resolve

723 - trivial three-way merges (e.g. apply change, which turns A into B,

724 - to content A) by itself, which would help "git apply --3way" used

725 - when there is no need to use "--3way".

726 -

727 - Will discard.

728 - Replace with a trivial-merge logic in apply.c::try_treeway() or

729 - apply.c::three_way_merge().

904 + Will merge to 'master'.

905

906

907 * ab/lib-subtest (2021-08-05) 11 commits

@@ -758,16 +933,14 @@ Release tarballs are available at:

933 Further tweaks on progress API.

934

935

761 -* ab/progress-users-adjust-counters (2021-08-05) 3 commits

936 +* ab/progress-users-adjust-counters (2021-08-25) 2 commits

937 - entry: show finer-grained counter in "Filtering content" progress line

763 - - midx: don't provide a total for QSORT() progress

938 - commit-graph: fix bogus counter in "Scanning merged commits" progress line

939

940 The code to show progress indicator in a few codepaths did not

941 cover between 0-100%, which has been corrected.

942

769 - The middle one wants to be discarded.

770 - cf. <87v94jzoxj.fsf@evledraar.gmail.com>

943 + Will merge to 'next'?

944

945

946 * ar/submodule-add-config (2021-08-10) 1 commit

@@ -790,8 +963,8 @@ Release tarballs are available at:

963 cf. <20210812001332.715876-1-dturner@twosigma.com>

964

965

793 -* fs/ssh-signing (2021-08-03) 9 commits

794 - - ssh signing: test that gpg fails for unkown keys

966 +* fs/ssh-signing (2021-08-29) 9 commits

967 + - ssh signing: test that gpg fails for unknown keys

968 - ssh signing: tests for logs, tags & push certs

969 - ssh signing: duplicate t7510 tests for commits

970 - ssh signing: verify signatures using ssh-keygen

@@ -807,21 +980,22 @@ Release tarballs are available at:

980

981

982 * en/pull-conflicting-options (2021-07-22) 8 commits

810 - - pull: fix handling of multiple heads

811 - - pull: update docs & code for option compatibility with rebasing

812 - - pull: abort by default when fast-forwarding is not possible

813 - - pull: make --rebase and --no-rebase override pull.ff=only

814 - - pull: since --ff-only overrides, handle it first

815 - - pull: abort if --ff-only is given and fast-forwarding is impossible

816 - - t7601: add tests of interactions with multiple merge heads and config

817 - - t7601: test interaction of merge/rebase/fast-forward flags and options

983 + (merged to 'next' on 2021-08-24 at e1e5b2c551)

984 + + pull: fix handling of multiple heads

985 + + pull: update docs & code for option compatibility with rebasing

986 + + pull: abort by default when fast-forwarding is not possible

987 + + pull: make --rebase and --no-rebase override pull.ff=only

988 + + pull: since --ff-only overrides, handle it first

989 + + pull: abort if --ff-only is given and fast-forwarding is impossible

990 + + t7601: add tests of interactions with multiple merge heads and config

991 + + t7601: test interaction of merge/rebase/fast-forward flags and options

992

993 "git pull" had various corner cases that were not well thought out

994 around its --rebase backend, e.g. "git pull --ff-only" did not stop

995 but went ahead and rebased when the history on other side is not a

996 descendant of our history. The series tries to fix them up.

997

824 - Will merge to 'next'.

998 + Will merge to 'master'.

999

1000

1001 * cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit

@@ -847,7 +1021,7 @@ Release tarballs are available at:

1021 4/5 may want a minor tweak to the log and the patch text but otherwise looks good.

1022

1023

850 -* tb/multi-pack-bitmaps (2021-07-27) 25 commits

1024 +* tb/multi-pack-bitmaps (2021-08-24) 25 commits

1025 - p5326: perf tests for MIDX bitmaps

1026 - p5310: extract full and partial bitmap tests

1027 - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'

@@ -944,7 +1118,7 @@ Release tarballs are available at:

1118 Expecting a reroll.

1119

1120

947 -* ab/test-tool-cache-cleanup (2021-06-08) 4 commits

1121 +* ab/test-tool-cache-cleanup (2021-08-24) 4 commits

1122 - read-cache perf: add a perf test for refresh_index()

1123 - test-tool: migrate read-cache-again to parse_options()

1124 - test-tool: migrate read-cache-perf to parse_options()

@@ -952,8 +1126,6 @@ Release tarballs are available at:

1126

1127 Test code shuffling.

1128

955 - Expecting a reroll.

956 -

1129

1130 * ab/pack-objects-stdin (2021-07-09) 5 commits

1131 - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS

@@ -991,11 +1163,15 @@ Release tarballs are available at:

1163 cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>

1164

1165

994 -* hn/reftable (2021-08-18) 25 commits

1166 +* hn/reftable (2021-08-26) 29 commits

1167 + - SQUASH??? https://github.com/git/git/runs/3439941236?check_suite_focus=true#step:5:700

1168 + - reftable: fixup for new base topic 3/3

1169 + - reftable: fixup for new base topic 2/3

1170 + - reftable: fixup for new base topic 1/3

1171 - t1404: annotate test cases with REFFILES

1172 - t1401,t2011: parameterize HEAD.lock for REFFILES

1173 - t1301: document what needs to be done for reftable

998 - - reftable: add "test-tool dump-reftable" command.

1174 + - Add "test-tool dump-reftable" command.

1175 - git-prompt: prepare for reftable refs backend

1176 - refs: RFC: Reftable support for git-core

1177 - reftable: add dump utility

@@ -1009,7 +1185,7 @@ Release tarballs are available at:

1185 - reftable: write reftable files

1186 - reftable: a generic binary tree implementation

1187 - reftable: reading/writing blocks

1012 - - compat: provide zlib's uncompress2 from compat/zlib-compat.c

1188 + - Provide zlib's uncompress2 from compat/zlib-compat.c

1189 - reftable: (de)serialization for the polymorphic record type.

1190 - reftable: add blocksource, an abstraction for random access reads

1191 - reftable: utility functions

@@ -1017,59 +1193,43 @@ Release tarballs are available at:

1193 - reftable: RFC: add LICENSE

1194 - init-db: set the_repository->hash_algo early on

1195 - hash.h: provide constants for the hash IDs

1196 + (this branch uses ab/refs-errno-cleanup, ab/refs-files-cleanup and hn/refs-errno-cleanup.)

1197

1198 The "reftable" backend for the refs API.

1199

1200

1024 -* ab/refs-files-cleanup (2021-08-19) 11 commits

1201 +* ab/refs-files-cleanup (2021-08-25) 13 commits

1202 - refs/files: remove unused "errno != ENOTDIR" condition

1203 - refs/files: remove unused "errno == EISDIR" code

1204 - refs/files: remove unused "oid" in lock_ref_oid_basic()

1205 + - refs API: remove OID argument to reflog_expire()

1206 - reflog expire: don't lock reflogs using previously seen OID

1207 - refs/files: add a comment about refs_reflog_exists() call

1208 - refs: make repo_dwim_log() accept a NULL oid

1209 - refs/debug: re-indent argument list for "prepare"

1210 - refs/files: remove unused "skip" in lock_raw_ref() too

1211 - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()

1212 + - refs: drop unused "flags" parameter to lock_ref_oid_basic()

1213 - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()

1214 - refs/packet: add missing BUG() invocations to reflog callbacks

1036 - (this branch is used by hn/refs-errno-cleanup and jk/refs-files-cleanup-cleanup.)

1037 -

1038 - Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.

1215 + (this branch is used by ab/refs-errno-cleanup, hn/refs-errno-cleanup and hn/reftable.)

1216

1040 - I suspect that jk/refs-files-cleanup-cleanup should be squashed

1041 - into the commits in this topic, but I'll leave that to the owner of

1042 - the topic.

1217 + Continued work on top of the hn/refs-errno-cleanup topic.

1218

1219

1045 -* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit

1046 - - refs: drop unused "flags" parameter to lock_ref_oid_basic()

1047 - (this branch is used by hn/refs-errno-cleanup; uses ab/refs-files-cleanup.)

1048 -

1049 - Code cleanup.

1050 -

1051 - Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.

1052 - I suspect that ab/refs-files-cleanup can fix its commit by

1053 - squashing it in, but I'll leave that to the owner of the topic.

1054 -

1055 -

1056 -* hn/refs-errno-cleanup (2021-08-19) 7 commits

1057 - - refs: make errno output explicit for refs_resolve_ref_unsafe

1058 - - refs: explicitly return failure_errno from parse_loose_ref_contents

1059 - - refs: add failure_errno to refs_read_raw_ref() signature

1220 +* hn/refs-errno-cleanup (2021-08-25) 4 commits

1221 - refs: make errno output explicit for read_raw_ref_fn

1222 - refs/files-backend: stop setting errno from lock_ref_oid_basic

1223 - refs: remove EINVAL errno output from specification of read_raw_ref_fn

1224 - refs file backend: move raceproof_create_file() here

1064 - (this branch uses ab/refs-files-cleanup and jk/refs-files-cleanup-cleanup.)

1225 + (this branch is used by ab/refs-errno-cleanup and hn/reftable; uses ab/refs-files-cleanup.)

1226

1227 Futz with the way 'errno' is relied on in the refs API to carry the

1228 failure modes up the callchain.

1229

1069 - Kicked out of 'next', to give ab/refs/files-cleanup a clean restart.

1230

1071 -

1072 -* jh/builtin-fsmonitor (2021-07-12) 35 commits

1231 +* jh/builtin-fsmonitor (2021-08-26) 36 commits

1232 + - SQUASH??? https://github.com/git/git/runs/3438543601?check_suite_focus=true#step:5:136

1233 - BANDAID: sparse fixes

1234 - t7527: test FS event reporing on MacOS WRT case and Unicode

1235 - fsmonitor: handle shortname for .git

@@ -1125,3 +1285,50 @@ Release tarballs are available at:

1285 corrected.

1286

1287 Reverted out of 'next' at 1f62d2e1 on 2021-08-11

1288 +

1289 +

1290 +* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit

1291 + . refs: drop unused "flags" parameter to lock_ref_oid_basic()

1292 +

1293 + Code cleanup.

1294 +

1295 + Obsoleted by updated ab/refs-files-cleanup

1296 +

1297 +

1298 +* ow/clone-bare-origin (2021-08-03) 1 commit

1299 + - clone: Allow combining --bare and --origin

1300 +

1301 + "git clone" did not like to take "--bare" and "--origin=X" at the

1302 + same time; loosen the restriction.

1303 +

1304 + cf. <20210802174944.53745-1-oystwa@gmail.com>

1305 +

1306 +

1307 +* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit

1308 + - ll-merge: teach ll_binary_merge() a trivial three-way merge

1309 +

1310 + The built-in merge driver for binary files learned to resolve

1311 + trivial three-way merges (e.g. apply change, which turns A into B,

1312 + to content A) by itself, which would help "git apply --3way" used

1313 + when there is no need to use "--3way".

1314 +

1315 + Will discard.

1316 + Replace with a trivial-merge logic in apply.c::try_treeway() or

1317 + apply.c::three_way_merge().

1318 +

1319 +

1320 +* np/blame-ignore-revs-file-may-be-optional (2021-08-09) 1 commit

1321 + - blame: add config `blame.ignoreRevsFileIsOptional`

1322 +

1323 + When the file named by blame.ignoreRevsFile configuration variable

1324 + does not exist, it causes "git blame" to die. Sometimes, it is

1325 + useful if the files named by configuration variables can be made

1326 + optional (it would allow ~/.gitconfig to give a filename, and make

1327 + it effective only in repositories that have a file with that name).

1328 +

1329 + This uses an extra variable that marks that the variable is

1330 + optional. Yet another alternative is being discussed to define

1331 + syntax for "optional" filename values, so that the same mechanism

1332 + can be used for not just blame.ignoreRevsFile but other filenames.

1333 +

1334 + Queued just as a reminder of the theme.

What's cooking (2021/08 #09)