4f5efa3970 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2021, #06; Mon, 26)

3 -X-master-at: eb27b338a3e71c7c4079fbac8aeae3f8fbb5c687

4 -X-next-at: 689316a459d26cd93a42ae056635db0b760bb0e9

2 +Subject: What's cooking in git.git (Jul 2021, #07; Wed, 28)

3 +X-master-at: 940fe202adcbf9fa1825c648d97cbe1b90d26aec

4 +X-next-at: 8dce9f242233d743985a79191945e2a8ed1c4354

5

6 -What's cooking in git.git (Jul 2021, #06; Mon, 26)

6 +What's cooking in git.git (Jul 2021, #07; Wed, 28)

7 --------------------------------------------------

8

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

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

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

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

19

20 +The seventh batch of topics in this round are now in 'master'.

21 +We'll start stabilizing early next month, aiming for 2.33 final

22 +hopefully by mid-August.

23 +

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

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

26 repositories have only a subset of branches.

@@ -48,69 +52,260 @@ Release tarballs are available at:

52 --------------------------------------------------

53 [Graduated to 'master']

54

51 -* ab/gitignore-discovery-doc (2021-07-06) 1 commit

52 - (merged to 'next' on 2021-07-13 at 02f3b3deab)

53 - + docs: .gitignore parsing is to the top of the repo

55 +* ab/attribute-format (2021-07-13) 5 commits

56 + (merged to 'next' on 2021-07-20 at 44e5606a6e)

57 + + advice.h: add missing __attribute__((format)) & fix usage

58 + + *.h: add a few missing __attribute__((format))

59 + + *.c static functions: add missing __attribute__((format))

60 + + sequencer.c: move static function to avoid forward decl

61 + + *.c static functions: don't forward-declare __attribute__

62 +

63 + Many "printf"-like helper functions we have have been annotated

64 + with __attribute__() to catch placeholder/parameter mismatches.

65

55 - Doc update.

66 +

67 +* ab/pkt-line-tests (2021-07-19) 1 commit

68 + (merged to 'next' on 2021-07-20 at 8e5e53450c)

69 + + test-lib-functions: use test-tool for [de]packetize()

70 +

71 + Tests that cover protocol bits have been updated and helpers

72 + used there have been consolidated.

73 +

74 +

75 +* dl/diff-merge-base (2021-07-12) 1 commit

76 + (merged to 'next' on 2021-07-20 at 013d013bcf)

77 + + git-diff: fix missing --merge-base docs

78 +

79 + "git diff --merge-base" documentation has been updated.

80 +

81 +

82 +* dl/packet-read-response-end-fix (2021-07-09) 1 commit

83 + (merged to 'next' on 2021-07-16 at 6a7734b6b5)

84 + + pkt-line: replace "stateless separator" with "response end"

85 +

86 + Error message update.

87 +

88 +

89 +* ds/gender-neutral-doc-guidelines (2021-07-16) 1 commit

90 + (merged to 'next' on 2021-07-20 at 06d325e064)

91 + + CodingGuidelines: recommend gender-neutral description

92 +

93 + A guideline for gender neutral documentation has been added.

94 +

95 +

96 +* ds/status-with-sparse-index (2021-07-14) 16 commits

97 + (merged to 'next' on 2021-07-20 at 1558d36c0f)

98 + + t1092: document bad sparse-checkout behavior

99 + + fsmonitor: integrate with sparse index

100 + + wt-status: expand added sparse directory entries

101 + + status: use sparse-index throughout

102 + + status: skip sparse-checkout percentage with sparse-index

103 + + diff-lib: handle index diffs with sparse dirs

104 + + dir.c: accept a directory as part of cone-mode patterns

105 + + unpack-trees: unpack sparse directory entries

106 + + unpack-trees: rename unpack_nondirectories()

107 + + unpack-trees: compare sparse directories correctly

108 + + unpack-trees: preserve cache_bottom

109 + + t1092: add tests for status/add and sparse files

110 + + t1092: expand repository data shape

111 + + t1092: replace incorrect 'echo' with 'cat'

112 + + sparse-index: include EXTENDED flag when expanding

113 + + sparse-index: skip indexes with unmerged entries

114 + (this branch is used by ds/add-with-sparse-index and ds/commit-and-checkout-with-sparse-index.)

115 +

116 + "git status" codepath learned to work with sparsely populated index

117 + without hydrating it fully.

118 +

119 +

120 +* en/rename-limits-doc (2021-07-15) 4 commits

121 + (merged to 'next' on 2021-07-20 at a89253d530)

122 + + rename: bump limit defaults yet again

123 + + diffcore-rename: treat a rename_limit of 0 as unlimited

124 + + doc: clarify documentation for rename/copy limits

125 + + diff: correct warning message when renameLimit exceeded

126 +

127 + Documentation on "git diff -l<n>" and diff.renameLimit have been

128 + updated, and the defaults for these limits have been raised.

129 +

130 +

131 +* ew/many-alternate-optim (2021-07-07) 5 commits

132 + (merged to 'next' on 2021-07-16 at a2d8bc731d)

133 + + oidtree: a crit-bit tree for odb_loose_cache

134 + + oidcpy_with_padding: constify `src' arg

135 + + make object_directory.loose_objects_subdir_seen a bitmap

136 + + avoid strlen via strbuf_addstr in link_alt_odb_entry

137 + + speed up alt_odb_usable() with many alternates

138 +

139 + Optimization for repositories with many alternate object store.

140 +

141 +

142 +* hj/commit-allow-empty-message (2021-07-09) 2 commits

143 + (merged to 'next' on 2021-07-16 at 86b79d3010)

144 + + commit: remove irrelavent prompt on `--allow-empty-message`

145 + + commit: reorganise commit hint strings

146 +

147 + "git commit --allow-empty-message" won't abort the operation upon

148 + an empty message, but the hint shown in the editor said otherwise.

149 +

150 +

151 +* hn/refs-debug-empty-prefix (2021-07-19) 1 commit

152 + (merged to 'next' on 2021-07-20 at 2772d3efb2)

153 + + refs/debug: quote prefix

154 +

155 + Debugging aid.

156 +

157 +

158 +* jk/log-decorate-optim (2021-07-14) 7 commits

159 + (merged to 'next' on 2021-07-16 at 5637878b90)

160 + + load_ref_decorations(): fix decoration with tags

161 + (merged to 'next' on 2021-07-08 at a3b6f978ab)

162 + + add_ref_decoration(): rename s/type/deco_type/

163 + + load_ref_decorations(): avoid parsing non-tag objects

164 + + object.h: add lookup_object_by_type() function

165 + + object.h: expand docstring for lookup_unknown_object()

166 + + log: avoid loading decorations for userformats that don't need it

167 + + pretty.h: update and expand docstring for userformat_find_requirements()

168 +

169 + Optimize "git log" for cases where we wasted cycles to load ref

170 + decoration data that may not be needed.

171 +

172 +

173 +* jk/t0000-subtests-fix (2021-07-19) 1 commit

174 + (merged to 'next' on 2021-07-20 at 81412e1684)

175 + + t0000: clear GIT_SKIP_TESTS before running sub-tests

176 + (this branch is used by ab/lib-subtest and ps/t0000-output-directory-fix.)

177 +

178 + Test fix.

179

180

58 -* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit

59 - (merged to 'next' on 2021-07-13 at ab59128bfb)

60 - + imap-send.c: use less verbose strbuf_fread() idiom

181 +* js/ci-make-sparse (2021-07-26) 3 commits

182 + (merged to 'next' on 2021-07-26 at 689316a459)

183 + + ci/install-dependencies: handle "sparse" job package installs

184 + + ci: run "apt-get update" before "apt-get install"

185 + (merged to 'next' on 2021-07-20 at 99f518bdef)

186 + + ci: run `make sparse` as part of the GitHub workflow

187

62 - Code simplification.

188 + The CI gained a new job to run "make sparse" check.

189

190

65 -* ab/send-email-optim (2021-05-28) 13 commits

66 - (merged to 'next' on 2021-07-08 at 35ac315894)

67 - + perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()

68 - + send-email: move trivial config handling to Perl

69 - + perl: lazily load some common Git.pm setup code

70 - + send-email: lazily load modules for a big speedup

71 - + send-email: get rid of indirect object syntax

72 - + send-email: use function syntax instead of barewords

73 - + send-email: lazily shell out to "git var"

74 - + send-email: lazily load config for a big speedup

75 - + send-email: copy "config_regxp" into git-send-email.perl

76 - + send-email: refactor sendemail.smtpencryption config parsing

77 - + send-email: remove non-working support for "sendemail.smtpssl"

78 - + send-email tests: test for boolean variables without a value

79 - + send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true

191 +* pb/dont-complete-aliased-options (2021-07-16) 1 commit

192 + (merged to 'next' on 2021-07-20 at bbc531c710)

193 + + parse-options: don't complete option aliases by default

194

81 - "git send-email" optimization.

195 + The completion support used to offer alternate spelling of options

196 + that exist only for compatibility, which has been corrected.

197

198

84 -* bc/rev-list-without-commit-line (2021-07-12) 1 commit

85 - (merged to 'next' on 2021-07-13 at 1ceed60061)

86 - + rev-list: add option for --pretty=format without header

199 +* ps/t0000-output-directory-fix (2021-07-20) 1 commit

200 + (merged to 'next' on 2021-07-20 at 7e0b7c1f0c)

201 + + t0000: fix test if run with TEST_OUTPUT_DIRECTORY

202 + (this branch is used by ab/lib-subtest; uses jk/t0000-subtests-fix.)

203

88 - "git rev-list" learns to omit the "commit <object-name>" header

89 - lines from the output with the `--no-commit-header` option.

204 + "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has

205 + been corrected.

206

207

92 -* jk/typofix (2021-07-13) 1 commit

93 - (merged to 'next' on 2021-07-13 at cce3caa34e)

94 - + doc/rev-list-options: fix duplicate word typo

208 +* sm/worktree-add-lock (2021-07-15) 3 commits

209 + (merged to 'next' on 2021-07-16 at 609c0a4944)

210 + + worktree: teach `add` to accept --reason <string> with --lock

211 + + worktree: mark lock strings with `_()` for translation

212 + + t2400: clean up '"add" worktree with lock' test

213

96 - Typofix.

214 + "git worktree add --lock" learned to record why the worktree is

215 + locked with a custom message.

216

217

99 -* js/ci-windows-update (2021-07-06) 7 commits

100 - (merged to 'next' on 2021-07-13 at 329771e960)

101 - + ci: accelerate the checkout

102 - + ci (vs-build): build with NO_GETTEXT

103 - + artifacts-tar: respect NO_GETTEXT

104 - + ci (windows): transfer also the Git-tracked files to the test jobs

105 - + ci: upgrade to using actions/{up,down}load-artifacts v2

106 - + ci (vs-build): use `cmd` to copy the DLLs, not `powershell`

107 - + ci: use the new GitHub Action to download git-sdk-64-minimal

218 +* tb/reverse-midx (2021-07-19) 1 commit

219 + (merged to 'next' on 2021-07-20 at 995cb54b5b)

220 + + multi-pack-index: fix potential segfault without sub-command

221

109 - GitHub Actions / CI update.

222 + The code that gives an error message in "git multi-pack-index" when

223 + no subcommand is given tried to print a NULL pointer as a strong,

224 + which has been corrected.

225

226 --------------------------------------------------

227 [New Topics]

228

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

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

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

232 +

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

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

235 + tested; this has been rewritten in C.

236 +

237 + Will merge to 'next'.

238 +

239 +

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

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

242 +

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

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

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

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

247 +

248 + Needs review and design discussion.

249 + As I wrote in the log message, I suspect that this may belong to

250 + one layer higher, i.e. at ll_merge() before it dispatches to type

251 + specific drivers.

252 +

253 +

254 +* os/bisect-runs-show-branch-without-pager (2021-07-27) 1 commit

255 + - bisect: disable pager while invoking show-branch

256 +

257 + When "git bisect" spawns "git show-branch" to pretty-print the

258 + title of the commit to be tested, it could have invoked user's

259 + pager if user configured to run pager while running show-branch.

260 + The invocation of show-branch has been changed to disable pager,

261 + even if one is configured.

262 +

263 + Will discard.

264 + This probably is unnecessary with the rewrite to get rid of the

265 + show-branch invocation altogether.

266 +

267 +

268 +* hn/refs-test-cleanup-contd (2021-07-22) 11 commits

269 + (merged to 'next' on 2021-07-28 at dd3af04939)

270 + + t6001: avoid direct file system access

271 + + t6500: use "ls -1" to snapshot ref database state

272 + + t7064: use update-ref -d to remove upstream branch

273 + + t1410: mark test as REFFILES

274 + + t1405: mark test for 'git pack-refs' as REFFILES

275 + + t1405: use 'git reflog exists' to check reflog existence

276 + (merged to 'next' on 2021-07-22 at 2ab8bc259a)

277 + + t2402: use ref-store test helper to create broken symlink

278 + + t3320: use git-symbolic-ref rather than filesystem access

279 + + t6120: use git-update-ref rather than filesystem access

280 + + t1503: mark symlink test as REFFILES

281 + + t6050: use git-update-ref rather than filesystem access

282 +

283 +--------------------------------------------------

284 +[Stalled]

285 +

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

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

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

289 +

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

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

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

293 + which broke traditional use cases.

294 +

295 + Waiting for reviews.

296 +

297 +

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

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

300 +

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

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

303 +

304 + Waiting for reviews.

305 +

306 +--------------------------------------------------

307 +[Cooking]

308 +

309 * ab/http-drop-old-curl (2021-07-21) 5 commits

310 - http: rename CURLOPT_FILE to CURLOPT_WRITEDATA

311 - http: drop support for curl < 7.19.3 and < 7.16.4 (again)

@@ -134,7 +329,6 @@ Release tarballs are available at:

329 - test-lib tests: move "run_sub_test" to a new lib-subtest.sh

330 - Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest

331 - Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest

137 - (this branch uses jk/t0000-subtests-fix and ps/t0000-output-directory-fix.)

332

333 Updates to the tests in t0000 to test th etest framework.

334

@@ -145,17 +339,18 @@ Release tarballs are available at:

339 - pathspec: stop calling ensure_full_index

340 - add: allow operating on a sparse-only index

341 - t1092: test merge conflicts outside cone

148 - (this branch uses ds/commit-and-checkout-with-sparse-index and ds/status-with-sparse-index.)

342 + (this branch uses ds/commit-and-checkout-with-sparse-index.)

343

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

345

346

347 * fc/pull-no-rebase-merges-theirs-into-ours (2021-07-21) 1 commit

154 - - doc: pull: fix rebase=false documentation

348 + (merged to 'next' on 2021-07-28 at f8e6567082)

349 + + doc: pull: fix rebase=false documentation

350

351 Documentation fix for "git pull --rebase=no".

352

158 - Will merge to 'next'.

353 + Will merge to 'master'.

354

355

356 * ab/only-single-progress-at-once (2021-07-23) 8 commits

@@ -182,7 +377,7 @@ Release tarballs are available at:

377 Will merge to 'next'.

378

379

185 -* ar/submodule-add-config (2021-07-26) 1 commit

380 +* ar/submodule-add-config (2021-07-28) 1 commit

381 - submodule--helper: introduce add-config subcommand

382 (this branch uses ar/submodule-add.)

383

@@ -202,37 +397,24 @@ Release tarballs are available at:

397 Final batch for "merge -sort" optimization.

398

399

205 -* hn/refs-test-cleanup-contd (2021-07-22) 6 commits

206 - - t6001: avoid direct file system access

207 - - t6500: use "ls -1" to snapshot ref database state

208 - - t7064: use update-ref -d to remove upstream branch

209 - - t1410: mark test as REFFILES

210 - - t1405: mark test for 'git pack-refs' as REFFILES

211 - - t1405: use 'git reflog exists' to check reflog existence

212 - (this branch uses hn/refs-test-cleanup.)

213 -

214 - More test clean-up around refs

215 -

216 - Probably I should combine this into the base topic and have them

217 - graduate together.

218 -

219 -

400 * jk/check-pack-valid-before-opening-bitmap (2021-07-23) 1 commit

221 - - pack-bitmap: check pack validity when opening bitmap

401 + (merged to 'next' on 2021-07-28 at 98d5b4dc68)

402 + + pack-bitmap: check pack validity when opening bitmap

403

404 A race between repacking and using pack bitmaps has been corrected.

405

225 - Will merge to 'next'.

406 + Will merge to 'master'.

407

408

409 * jt/bulk-prefetch (2021-07-23) 2 commits

229 - - cache-tree: prefetch in partial clone read-tree

230 - - unpack-trees: refactor prefetching code

410 + (merged to 'next' on 2021-07-28 at 26e28cab21)

411 + + cache-tree: prefetch in partial clone read-tree

412 + + unpack-trees: refactor prefetching code

413

414 "git read-tree" had a codepath where blobs are fetched one-by-one

415 from the promisor remote, which has been corrected to fetch in bulk.

416

235 - Will merge to 'next'.

417 + Will merge to 'master'.

418

419

420 * pb/merge-autostash-more (2021-07-23) 4 commits

@@ -248,22 +430,23 @@ Release tarballs are available at:

430

431

432 * ah/plugleaks (2021-07-26) 12 commits

251 - - reset: clear_unpack_trees_porcelain to plug leak

252 - - builtin/rebase: fix options.strategy memory lifecycle

253 - - builtin/merge: free found_ref when done

254 - - builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv

255 - - convert: release strbuf to avoid leak

256 - - read-cache: call diff_setup_done to avoid leak

257 - - ref-filter: also free head for ATOM_HEAD to avoid leak

258 - - diffcore-rename: move old_dir/new_dir definition to plug leak

259 - - builtin/for-each-repo: remove unnecessary argv copy to plug leak

260 - - builtin/submodule--helper: release unused strbuf to avoid leak

261 - - environment: move strbuf into block to plug leak

262 - - fmt-merge-msg: free newly allocated temporary strings when done

433 + (merged to 'next' on 2021-07-28 at fa15f6d1f4)

434 + + reset: clear_unpack_trees_porcelain to plug leak

435 + + builtin/rebase: fix options.strategy memory lifecycle

436 + + builtin/merge: free found_ref when done

437 + + builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv

438 + + convert: release strbuf to avoid leak

439 + + read-cache: call diff_setup_done to avoid leak

440 + + ref-filter: also free head for ATOM_HEAD to avoid leak

441 + + diffcore-rename: move old_dir/new_dir definition to plug leak

442 + + builtin/for-each-repo: remove unnecessary argv copy to plug leak

443 + + builtin/submodule--helper: release unused strbuf to avoid leak

444 + + environment: move strbuf into block to plug leak

445 + + fmt-merge-msg: free newly allocated temporary strings when done

446

447 Leak plugging.

448

266 - Will merge to 'next'.

449 + Will merge to 'master'.

450

451

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

@@ -299,31 +482,6 @@ Release tarballs are available at:

482 It is clear that a problem exists, but it is unclear if the

483 proposed solution is a desirable one.

484

302 ---------------------------------------------------

303 -[Stalled]

304 -

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

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

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

308 -

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

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

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

312 - which broke traditional use cases.

313 -

314 - Waiting for reviews.

315 -

316 -

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

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

319 -

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

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

322 -

323 - Waiting for reviews.

324 -

325 ---------------------------------------------------

326 -[Cooking]

485

486 * ab/bundle-tests (2021-07-22) 2 commits

487 (merged to 'next' on 2021-07-22 at 053b5d0ecf)

@@ -350,8 +508,7 @@ Release tarballs are available at:

508 The "hooks defined via the configuration variables" topic.

509

510

353 -* fs/ssh-signing (2021-07-20) 10 commits

354 - - SQUASH???

511 +* fs/ssh-signing (2021-07-28) 9 commits

512 - ssh signing: add documentation

513 - ssh signing: add more tests for logs, tags & push certs

514 - ssh signing: duplicate t7510 tests for commits

@@ -364,16 +521,7 @@ Release tarballs are available at:

521

522 Use ssh public crypto for object and push-cert signing.

523

367 - Seems to break tests when merged to 'seen'.

368 -

369 -

370 -* hn/refs-debug-empty-prefix (2021-07-19) 1 commit

371 - (merged to 'next' on 2021-07-20 at 2772d3efb2)

372 - + refs/debug: quote prefix

373 -

374 - Debugging aid.

375 -

376 - Will merge to 'master'.

524 + Comments?

525

526

527 * pb/submodule-recurse-doc (2021-07-20) 1 commit

@@ -385,17 +533,6 @@ Release tarballs are available at:

533 Will merge to 'master'.

534

535

388 -* ps/t0000-output-directory-fix (2021-07-20) 1 commit

389 - (merged to 'next' on 2021-07-20 at 7e0b7c1f0c)

390 - + t0000: fix test if run with TEST_OUTPUT_DIRECTORY

391 - (this branch is used by ab/lib-subtest; uses jk/t0000-subtests-fix.)

392 -

393 - "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has

394 - been corrected.

395 -

396 - Will merge to 'master'.

397 -

398 -

536 * tb/bitmap-type-filter-comment-fix (2021-07-20) 1 commit

537 (merged to 'next' on 2021-07-22 at 8428556149)

538 + pack-bitmap: clarify comment in filter_bitmap_exclude_type()

@@ -405,25 +542,20 @@ Release tarballs are available at:

542 Will merge to 'master'.

543

544

408 -* tb/reverse-midx (2021-07-19) 1 commit

409 - (merged to 'next' on 2021-07-20 at 995cb54b5b)

410 - + multi-pack-index: fix potential segfault without sub-command

411 -

412 - The code that gives an error message in "git multi-pack-index" when

413 - no subcommand is given tried to print a NULL pointer as a strong,

414 - which has been corrected.

415 -

416 - Will merge to 'master'.

417 -

418 -

419 -* hn/refs-test-cleanup (2021-07-19) 5 commits

545 +* hn/refs-test-cleanup (2021-07-22) 11 commits

546 + (merged to 'next' on 2021-07-28 at dd3af04939)

547 + + t6001: avoid direct file system access

548 + + t6500: use "ls -1" to snapshot ref database state

549 + + t7064: use update-ref -d to remove upstream branch

550 + + t1410: mark test as REFFILES

551 + + t1405: mark test for 'git pack-refs' as REFFILES

552 + + t1405: use 'git reflog exists' to check reflog existence

553 (merged to 'next' on 2021-07-22 at 2ab8bc259a)

554 + t2402: use ref-store test helper to create broken symlink

555 + t3320: use git-symbolic-ref rather than filesystem access

556 + t6120: use git-update-ref rather than filesystem access

557 + t1503: mark symlink test as REFFILES

558 + t6050: use git-update-ref rather than filesystem access

426 - (this branch is used by hn/refs-test-cleanup-contd.)

559

560 A handful of tests that assumed implementation details of files

561 backend for refs have been cleaned up.

@@ -461,6 +593,8 @@ Release tarballs are available at:

593

594 The "reftable" backend for the refs API.

595

596 + Seems to break CI jobs in 'seen'.

597 +

598

599 * jk/config-env-doc (2021-07-20) 3 commits

600 (merged to 'next' on 2021-07-22 at 45616c831e)

@@ -483,28 +617,6 @@ Release tarballs are available at:

617 Will merge to 'master'.

618

619

486 -* js/ci-make-sparse (2021-07-26) 3 commits

487 - (merged to 'next' on 2021-07-26 at 689316a459)

488 - + ci/install-dependencies: handle "sparse" job package installs

489 - + ci: run "apt-get update" before "apt-get install"

490 - (merged to 'next' on 2021-07-20 at 99f518bdef)

491 - + ci: run `make sparse` as part of the GitHub workflow

492 -

493 - The CI gained a new job to run "make sparse" check.

494 -

495 - Will merge to 'master'.

496 -

497 -

498 -* pb/dont-complete-aliased-options (2021-07-16) 1 commit

499 - (merged to 'next' on 2021-07-20 at bbc531c710)

500 - + parse-options: don't complete option aliases by default

501 -

502 - The completion support used to offer alternate spelling of options

503 - that exist only for compatibility, which has been corrected.

504 -

505 - Will merge to 'master'.

506 -

507 -

620 * ab/refs-files-cleanup (2021-07-26) 11 commits

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

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

@@ -540,82 +652,6 @@ Release tarballs are available at:

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

653

654

543 -* jk/t0000-subtests-fix (2021-07-19) 1 commit

544 - (merged to 'next' on 2021-07-20 at 81412e1684)

545 - + t0000: clear GIT_SKIP_TESTS before running sub-tests

546 - (this branch is used by ab/lib-subtest and ps/t0000-output-directory-fix.)

547 -

548 - Test fix.

549 -

550 - Will merge to 'master'.

551 -

552 -

553 -* dl/packet-read-response-end-fix (2021-07-09) 1 commit

554 - (merged to 'next' on 2021-07-16 at 6a7734b6b5)

555 - + pkt-line: replace "stateless separator" with "response end"

556 -

557 - Error message update.

558 -

559 - Will merge to 'master'.

560 -

561 -

562 -* hj/commit-allow-empty-message (2021-07-09) 2 commits

563 - (merged to 'next' on 2021-07-16 at 86b79d3010)

564 - + commit: remove irrelavent prompt on `--allow-empty-message`

565 - + commit: reorganise commit hint strings

566 -

567 - "git commit --allow-empty-message" won't abort the operation upon

568 - an empty message, but the hint shown in the editor said otherwise.

569 -

570 - Will merge to 'master'.

571 -

572 -

573 -* ab/attribute-format (2021-07-13) 5 commits

574 - (merged to 'next' on 2021-07-20 at 44e5606a6e)

575 - + advice.h: add missing __attribute__((format)) & fix usage

576 - + *.h: add a few missing __attribute__((format))

577 - + *.c static functions: add missing __attribute__((format))

578 - + sequencer.c: move static function to avoid forward decl

579 - + *.c static functions: don't forward-declare __attribute__

580 -

581 - Many "printf"-like helper functions we have have been annotated

582 - with __attribute__() to catch placeholder/parameter mismatches.

583 -

584 - Will merge to 'master'.

585 -

586 -

587 -* dl/diff-merge-base (2021-07-12) 1 commit

588 - (merged to 'next' on 2021-07-20 at 013d013bcf)

589 - + git-diff: fix missing --merge-base docs

590 -

591 - "git diff --merge-base" documentation has been updated.

592 -

593 - Will merge to 'master'.

594 -

595 -

596 -* en/rename-limits-doc (2021-07-15) 4 commits

597 - (merged to 'next' on 2021-07-20 at a89253d530)

598 - + rename: bump limit defaults yet again

599 - + diffcore-rename: treat a rename_limit of 0 as unlimited

600 - + doc: clarify documentation for rename/copy limits

601 - + diff: correct warning message when renameLimit exceeded

602 -

603 - Documentation on "git diff -l<n>" and diff.renameLimit have been

604 - updated, and the defaults for these limits have been raised.

605 -

606 - Will merge to 'master'.

607 -

608 -

609 -* ab/pkt-line-tests (2021-07-19) 1 commit

610 - (merged to 'next' on 2021-07-20 at 8e5e53450c)

611 - + test-lib-functions: use test-tool for [de]packetize()

612 -

613 - Tests that cover protocol bits have been updated and helpers

614 - used there have been consolidated.

615 -

616 - Will merge to 'master'.

617 -

618 -

655 * bc/inactive-submodules (2021-07-02) 1 commit

656 - submodule: mark submodules with update=none as inactive

657

@@ -660,18 +696,6 @@ Release tarballs are available at:

696 Will merge to 'master'.

697

698

663 -* sm/worktree-add-lock (2021-07-15) 3 commits

664 - (merged to 'next' on 2021-07-16 at 609c0a4944)

665 - + worktree: teach `add` to accept --reason <string> with --lock

666 - + worktree: mark lock strings with `_()` for translation

667 - + t2400: clean up '"add" worktree with lock' test

668 -

669 - "git worktree add --lock" learned to record why the worktree is

670 - locked with a custom message.

671 -

672 - Will merge to 'master'.

673 -

674 -

699 * ab/bundle-doc (2021-07-20) 3 commits

700 - bundle doc: elaborate on rev<->ref restriction

701 - bundle doc: elaborate on object prerequisites

@@ -702,7 +726,7 @@ Release tarballs are available at:

726 - commit: integrate with sparse-index

727 - p2000: compress repo names

728 - p2000: add 'git checkout -' test and decrease depth

705 - (this branch is used by ds/add-with-sparse-index; uses ds/status-with-sparse-index.)

729 + (this branch is used by ds/add-with-sparse-index.)

730

731 "git checkout" and "git commit" learn to work without unnecessarily

732 expanding sparse indexes.

@@ -710,36 +734,6 @@ Release tarballs are available at:

734 Will merge to 'next'.

735

736

713 -* ew/many-alternate-optim (2021-07-07) 5 commits

714 - (merged to 'next' on 2021-07-16 at a2d8bc731d)

715 - + oidtree: a crit-bit tree for odb_loose_cache

716 - + oidcpy_with_padding: constify `src' arg

717 - + make object_directory.loose_objects_subdir_seen a bitmap

718 - + avoid strlen via strbuf_addstr in link_alt_odb_entry

719 - + speed up alt_odb_usable() with many alternates

720 -

721 - Optimization for repositories with many alternate object store.

722 -

723 - Will merge to 'master'.

724 -

725 -

726 -* jk/log-decorate-optim (2021-07-14) 7 commits

727 - (merged to 'next' on 2021-07-16 at 5637878b90)

728 - + load_ref_decorations(): fix decoration with tags

729 - (merged to 'next' on 2021-07-08 at a3b6f978ab)

730 - + add_ref_decoration(): rename s/type/deco_type/

731 - + load_ref_decorations(): avoid parsing non-tag objects

732 - + object.h: add lookup_object_by_type() function

733 - + object.h: expand docstring for lookup_unknown_object()

734 - + log: avoid loading decorations for userformats that don't need it

735 - + pretty.h: update and expand docstring for userformat_find_requirements()

736 -

737 - Optimize "git log" for cases where we wasted cycles to load ref

738 - decoration data that may not be needed.

739 -

740 - Will merge to 'master'.

741 -

742 -

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

738 - fetch: die on invalid --negotiation-tip hash

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

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

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

759

760

767 -* tb/multi-pack-bitmaps (2021-06-28) 24 commits

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

762 - p5326: perf tests for MIDX bitmaps

763 - p5310: extract full and partial bitmap tests

764 - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'

@@ -777,15 +771,16 @@ Release tarballs are available at:

771 - t5310: move some tests to lib-bitmap.sh

772 - pack-bitmap: write multi-pack bitmaps

773 - pack-bitmap: read multi-pack bitmaps

774 + - pack-bitmap.c: avoid redundant calls to try_partial_reuse

775 - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'

776 - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'

777 - pack-bitmap.c: introduce 'bitmap_num_objects()'

778 + - midx: avoid opening multiple MIDXs when writing

779 + - midx: close linked MIDXs, avoid leaking memory

780 - midx: infer preferred pack when not given one

784 - - midx: respect 'core.multiPackIndex' when writing

781 + - midx: reject empty `--preferred-pack`'s

782 - midx: clear auxiliary .rev after replacing the MIDX

786 - - midx: make a number of functions non-static

783 - Documentation: describe MIDX-based bitmaps

788 - - Documentation: build 'technical/bitmap-format' by default

784 - pack-bitmap-write.c: free existing bitmaps

785 - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps

786 - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps

@@ -797,32 +792,6 @@ Release tarballs are available at:

792 Comments?

793

794

800 -* ds/status-with-sparse-index (2021-07-14) 16 commits

801 - (merged to 'next' on 2021-07-20 at 1558d36c0f)

802 - + t1092: document bad sparse-checkout behavior

803 - + fsmonitor: integrate with sparse index

804 - + wt-status: expand added sparse directory entries

805 - + status: use sparse-index throughout

806 - + status: skip sparse-checkout percentage with sparse-index

807 - + diff-lib: handle index diffs with sparse dirs

808 - + dir.c: accept a directory as part of cone-mode patterns

809 - + unpack-trees: unpack sparse directory entries

810 - + unpack-trees: rename unpack_nondirectories()

811 - + unpack-trees: compare sparse directories correctly

812 - + unpack-trees: preserve cache_bottom

813 - + t1092: add tests for status/add and sparse files

814 - + t1092: expand repository data shape

815 - + t1092: replace incorrect 'echo' with 'cat'

816 - + sparse-index: include EXTENDED flag when expanding

817 - + sparse-index: skip indexes with unmerged entries

818 - (this branch is used by ds/add-with-sparse-index and ds/commit-and-checkout-with-sparse-index.)

819 -

820 - "git status" codepath learned to work with sparsely populated index

821 - without hydrating it fully.

822 -

823 - Will merge to 'master'.

824 -

825 -

795 * ab/config-based-hooks-base (2021-06-29) 33 commits

796 - hooks: fix a TOCTOU in "did we run a hook?" heuristic

797 - receive-pack: convert receive hooks to hook.h

@@ -979,7 +948,8 @@ Release tarballs are available at:

948

949

950 * ar/submodule-add (2021-07-26) 5 commits

982 - - submodule: drop unused sm_name parameter from show_fetch_remotes()

951 + (merged to 'next' on 2021-07-28 at 7d315a0f67)

952 + + submodule: drop unused sm_name parameter from show_fetch_remotes()

953 (merged to 'next' on 2021-07-22 at b8b636c9a1)

954 + submodule--helper: introduce add-clone subcommand

955 + submodule--helper: refactor module_clone()

@@ -992,15 +962,6 @@ Release tarballs are available at:

962 Will merge to 'master'.

963

964

995 -* ds/gender-neutral-doc-guidelines (2021-07-16) 1 commit

996 - (merged to 'next' on 2021-07-20 at 06d325e064)

997 - + CodingGuidelines: recommend gender-neutral description

998 -

999 - A guideline for gender neutral documentation has been added.

1000 -

1001 - Will merge to 'master'.

1002 -

1003 -

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

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

967

What's cooking (2021/07 #07)