dc18a92043 · 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 (Jun 2021, #06; Thu, 17)

3 +Subject: What's cooking in git.git (Jun 2021, #07; Wed, 30)

4 X-master-at: 670b81a890388c60b7032a4f5b879f2ece8c4558

5 X-next-at: 670b81a890388c60b7032a4f5b879f2ece8c4558

6

7 -What's cooking in git.git (Jun 2021, #06; Thu, 17)

7 +What's cooking in git.git (Jun 2021, #07; Wed, 30)

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

9

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

@@ -19,12 +19,11 @@ another topic already in flight" or "this may turn out to be

19 useful")---do not read too much into a topic being in (or not in)

20 'seen'.

21

22 -The tip of 'next' has been rewound. We'll start merging topics that

23 -have been reviewed well down. On the other hand, some topics have

24 -been waiting for updates for too long. I've started marking them

25 -for discarding. Motivated contributors may want to take a look of

26 -them, pick an easy one or two, reroll them on behalf of the original

27 -authors, to resurrect them.

22 +Some new topics have been merged to 'seen' and are listed in this

23 +report but there may well be topics that I haven't got around to

24 +pick them up. Also, among those that are in 'seen', I haven't

25 +summarized many of them in this rerpot (let alone decided what to do

26 +with them). Help and patience is greatly appreciated.

27

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

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

@@ -57,107 +56,192 @@ Release tarballs are available at:

56 --------------------------------------------------

57 [New Topics]

58

60 -* ab/config-based-hooks-base (2021-06-16) 30 commits

61 - - hook-list.h: add a generated list of hooks, like config-list.h

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

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

64 - - post-update: use hook.h library

65 - - receive-pack: convert 'update' hook to hook.h

66 - - hooks: allow callers to capture output

67 - - run-command: allow capturing of collated output

68 - - reference-transaction: use hook.h to run hooks

69 - - transport: convert pre-push hook to use config

70 - - hook: convert 'post-rewrite' hook in sequencer.c to hook.h

71 - - hook: provide stdin by string_list or callback

72 - - run-command: add stdin callback for parallelization

73 - - am: convert 'post-rewrite' hook to hook.h

74 - - hook: support passing stdin to hooks

75 - - run-command: allow stdin for run_processes_parallel

76 - - run-command: remove old run_hook_{le,ve}() hook API

77 - - receive-pack: convert push-to-checkout hook to hook.h

78 - - read-cache: convert post-index-change hook to use config

79 - - commit: use hook.h to execute hooks

80 - - git-p4: use 'git hook' to run hooks

81 - - send-email: use 'git hook run' for 'sendemail-validate'

82 - - git hook run: add an --ignore-missing flag

83 - - merge: use config-based hooks for post-merge hook

84 - - hooks: convert 'post-checkout' hook to hook library

85 - - am: convert applypatch hooks to use config

86 - - rebase: teach pre-rebase to use hook.h

87 - - gc: use hook library for pre-auto-gc hook

88 - - hook.c: add a hook_exists() wrapper and use it in bugreport.c

89 - - run-command.h: move find_hook() to hook.h

90 - - hook: add 'run' subcommand

59 +* fw/complete-cmd-idx-fix (2021-06-19) 1 commit

60 + - completion: bash: fix late declaration of __git_cmd_idx

61

92 - Restructuring of (a subset of) Emily's config-based-hooks series,

93 - to demonstrate that a series can be presented as a more logical and

94 - focused progression.

62 + Recent update to completion script (in contrib/) broke those who

63 + use the __git_complete helper to define completion to their custom

64 + command.

65

96 - Waiting for reviews.

66 + Will merge to 'next'.

67

68

99 -* ab/config-hooks-path-testfix (2021-06-16) 1 commit

100 - - pre-commit hook tests: don't leave "actual" nonexisting on failure

69 +* jk/test-avoid-globmatch-with-skip-patterns (2021-06-17) 1 commit

70 + - test-lib: avoid accidental globbing in match_pattern_list()

71

102 - Test fix.

72 + We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent

73 + update, which got fixed.

74

75 Will merge to 'next'.

76

77

107 -* ab/doc-retire-alice-bob (2021-06-16) 6 commits

108 - - pack-protocol doc: use "www-data" in place of "alice"

109 - - doc: replace "alice" and "bob" with "jdoe" and "msmith"

110 - - fast-import doc: change "bob" in an example to "file.txt"

111 - - daemon doc + code comments: reword "alice" example

112 - - gitcvs-migration doc: replace "alice" and "bob" with "you" and "www-data"

113 - - gittutorial doc: replace "alice" and "bob" with "you" and "www-data"

78 +* jk/test-without-readlink-1 (2021-06-19) 1 commit

79 + - t: use portable wrapper for readlink(1)

80

81 + Some test scripts assumed that readlink(1) was universally

82 + installed and available, which is not the case.

83

116 -* ab/pre-auto-gc-hook-test (2021-06-16) 1 commit

117 - - gc tests: add a test for the "pre-auto-gc" hook

84 + Will merge to 'next'.

85

119 - Test fix.

86 +

87 +* jx/sideband-cleanup (2021-06-17) 4 commits

88 + - test: refactor to use "get_abbrev_oid" to get abbrev oid

89 + - test: refactor to use "test_commit" to create commits

90 + - test: compare raw output, not mangle tabs and spaces

91 + - sideband: don't lose clear-to-eol at packet boundary

92 +

93 + The side-band demultiplexer that is used to display progress output

94 + from the remote end did not clear the line properly when the end of

95 + line hits at a packet boundary, which has been corrected. Also

96 + comes with test clean-ups.

97

98 Will merge to 'next'.

99

100

124 -* jv/userdiff-csharp-update (2021-06-16) 1 commit

125 - - userdiff: add support for C# record types

101 +* ab/bundle-doc (2021-06-30) 3 commits

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

103 + - bundle doc: split out open v.s. closed discussion from <rev-arg>

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

105 +

106 + Doc update.

107

127 - The userdiff pattern for C# learned the token "record".

108 +

109 +* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit

110 + - test-lib.sh: set COLUMNS=80 for --verbose repeatability

111 +

112 + Output from some of our tests were affected by the width of the

113 + terminal that they were run in, which has been corrected by

114 + exporting a fixed value in the COLUMNS environment.

115

116 Will merge to 'next'.

117

118

132 -* en/ort-perf-batch-13 (2021-06-16) 5 commits

133 - - merge-ort: add prefetching for content merges

134 - - diffcore-rename: use a different prefetch for basename comparisons

135 - - diffcore-rename: allow different missing_object_cb functions

136 - - t6421: add tests checking for excessive object downloads during merge

137 - - promisor-remote: output trace2 statistics for number of objects fetched

119 +* ab/pack-stdin-packs-fix (2021-06-28) 2 commits

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

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

122

139 - Performance tweaks of "git merge -sort" around lazy fetching of objects.

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

124 + corrected.

125

126 + cf. <YND3h2l10PlnSNGJ@nand.local>

127

142 -* ab/serve-cleanup (2021-06-17) 5 commits

143 - - serve: use designated initializers

144 - - transport: use designated initializers

145 - - transport: rename "fetch" in transport_vtable to "fetch_refs"

146 - - SQUASH??? struct strvec no longer needed

147 - - serve: mark has_capability() as static

128

149 - Code clean-up around "git serve".

129 +* ar/more-typofix (2021-06-28) 3 commits

130 + - git-worktree.txt: fix typo in example path

131 + - t: fix typos in test messages

132 + - blame: correct name of config option in docs

133 +

134 + Typofixes.

135

136 + Will merge to 'next'.

137

152 -* js/stop-exporting-bogus-columns (2021-06-17) 1 commit

153 - - pager: do not unnecessarily set COLUMNS on Windows

138

155 - When we cannot figure out how wide the terminal is, we use a

156 - fallback value of 80 ourselves (which cannot be avoided), but when

157 - we run the pager, we export it in COLUMNS, which forces the pager

158 - to use the hardcoded value, even when the pager is perfectly

159 - capable to figure it out itself. Stop exporting COLUMNS

160 - only when building on Windows to work around this issue.

139 +* bk/doc-commit-typofix (2021-06-28) 1 commit

140 + - Documentation: fix typo in the --patch option of the commit command

141 +

142 +

143 +* dc/p4-binary-submit-fix (2021-06-28) 1 commit

144 + - git-p4: fix failed submit by skip non-text data files

145 +

146 +

147 +* ds/commit-and-checkout-with-sparse-index (2021-06-28) 5 commits

148 + - checkout: stop expanding sparse indexes

149 + - sparse-index: recompute cache-tree

150 + - commit: integrate with sparse-index

151 + - p2000: compress repo names

152 + - p2000: add 'git checkout -' test and decrease depth

153 + (this branch uses ds/status-with-sparse-index.)

154 +

155 +

156 +* en/merge-dir-rename-corner-case-fix (2021-06-30) 3 commits

157 + - merge-recursive: handle rename-to-self case

158 + - merge-ort: ensure we consult df_conflict and path_conflicts

159 + - t6423: test directory renames causing rename-to-self

160 +

161 +

162 +* ew/many-alternate-optim (2021-06-29) 5 commits

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

164 + - oidcpy_with_padding: constify `src' arg

165 + - make object_directory.loose_objects_subdir_seen a bitmap

166 + - avoid strlen via strbuf_addstr in link_alt_odb_entry

167 + - speed up alt_odb_usable() with many alternates

168 +

169 +

170 +* jk/log-decorate-optim (2021-06-28) 6 commits

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

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

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

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

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

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

177 +

178 +

179 +* js/ci-windows-update (2021-06-28) 6 commits

180 + - ci: accelerate the checkout

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

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

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

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

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

186 +

187 +

188 +* js/config-mak-windows-pcre-fix (2021-06-28) 1 commit

189 + - config.mak.uname: PCRE1 cleanup

190 +

191 +

192 +* js/gfw-system-config-loc-fix (2021-06-28) 3 commits

193 + - config: normalize the path of the system gitconfig

194 + - cmake(windows): set correct path to the system Git config

195 + - mingw: move Git for Windows' system config where users expect it

196 +

197 +

198 +* jt/push-negotiation-fixes (2021-06-28) 3 commits

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

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

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

202 +

203 +

204 +* ks/submodule-cleanup (2021-06-28) 1 commit

205 + - submodule: remove unnecessary `prefix` based option logic

206 +

207 +

208 +* rs/grep-parser-fix (2021-06-30) 1 commit

209 + - grep: report missing left operand of --and

210 +

211 +

212 +* tb/midx-use-checksum (2021-06-28) 4 commits

213 + - midx: report checksum mismatches during 'verify'

214 + - midx: don't reuse corrupt MIDXs when writing

215 + - commit-graph: rewrite to use checksum_valid()

216 + - csum-file: introduce checksum_valid()

217 +

218 +

219 +* ab/bundle-updates (2021-06-30) 3 commits

220 + - bundle: remove "ref_list" in favor of string-list.c API

221 + - bundle.c: use a temporary variable for OIDs and names

222 + - bundle cmd: stop leaking memory from parse_options_cmd_bundle()

223 +

224 +

225 +* ab/fetch-negotiate-segv-fix (2021-06-30) 3 commits

226 + - fetch: fix segfault in --negotiate-only without --negotiation-tip=*

227 + - fetch: document the --negotiate-only option

228 + - send-pack.c: move "no refs in common" abort earlier

229 +

230 +

231 +* ab/make-delete-on-error (2021-06-29) 1 commit

232 + - Makefile: add and use the ".DELETE_ON_ERROR" flag

233 +

234 +

235 +* ab/make-tags-cleanup (2021-06-29) 5 commits

236 + - Makefile: normalize clobbering & xargs for tags targets

237 + - Makefile: don't use "FORCE" for tags targets

238 + - Makefile: fix "cscope" target to refer to cscope.out

239 + - Makefile: add QUIET_GEN to "cscope" target

240 + - Makefile: move ".PHONY: cscope" near its target

241 +

242 +

243 +* ew/mmap-failures (2021-06-29) 1 commit

244 + - xmmap: inform Linux users of tuning knobs on ENOMEM

245

246 --------------------------------------------------

247 [Stalled]

@@ -218,29 +302,62 @@ Release tarballs are available at:

302

303 Waiting for reviews.

304

305 +--------------------------------------------------

306 +[Cooking]

307 +

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

309 + - p5326: perf tests for MIDX bitmaps

310 + - p5310: extract full and partial bitmap tests

311 + - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'

312 + - t7700: update to work with MIDX bitmap test knob

313 + - t5319: don't write MIDX bitmaps in t5319

314 + - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP

315 + - t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP

316 + - t5326: test multi-pack bitmap behavior

317 + - t/helper/test-read-midx.c: add --checksum mode

318 + - t5310: move some tests to lib-bitmap.sh

319 + - pack-bitmap: write multi-pack bitmaps

320 + - pack-bitmap: read multi-pack bitmaps

321 + - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'

322 + - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'

323 + - pack-bitmap.c: introduce 'bitmap_num_objects()'

324 + - midx: infer preferred pack when not given one

325 + - midx: respect 'core.multiPackIndex' when writing

326 + - midx: clear auxiliary .rev after replacing the MIDX

327 + - midx: make a number of functions non-static

328 + - Documentation: describe MIDX-based bitmaps

329 + - Documentation: build 'technical/bitmap-format' by default

330 + - pack-bitmap-write.c: free existing bitmaps

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

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

333 +

334 + The reachability bitmap file used to be generated only for a single

335 + pack, but now we've learned to generate bitmaps for history that

336 + span across multiple packfiles.

337 +

338

222 -* ds/status-with-sparse-index (2021-05-22) 14 commits

339 +* ds/status-with-sparse-index (2021-06-28) 16 commits

340 - fsmonitor: integrate with sparse index

341 - wt-status: expand added sparse directory entries

342 - status: use sparse-index throughout

343 - status: skip sparse-checkout percentage with sparse-index

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

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

228 - - unpack-trees: be careful around sparse directory entries

346 + - unpack-trees: handle dir/file conflict of sparse entries

347 + - unpack-trees: unpack sparse directory entries

348 + - unpack-trees: rename unpack_nondirectories()

349 - unpack-trees: compare sparse directories correctly

350 - unpack-trees: preserve cache_bottom

351 - t1092: add tests for status/add and sparse files

352 - t1092: expand repository data shape

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

354 - sparse-index: include EXTENDED flag when expanding

355 - sparse-index: skip indexes with unmerged entries

235 - - Merge branch 'mt/add-rm-in-sparse-checkout' into ds/status-with-sparse-index

236 - - Merge branch 'ds/sparse-index-protections' into ds/status-with-sparse-index

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

357

358 "git status" codepath learned to work with sparsely populated index

359 without hydrating it fully.

360

241 - Expecting a reroll.

242 - cf. <2784d29b-b22a-2bf6-2450-7b4a0a72df54@gmail.com>

243 -

361

362 * ab/describe-tests-fix (2021-05-11) 5 commits

363 - describe tests: support -C in "check_describe"

@@ -283,8 +400,117 @@ Release tarballs are available at:

400

401 Will merge to 'next'.

402

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

287 -[Cooking]

403 +

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

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

406 + - receive-pack: convert receive hooks to hook.h

407 + - post-update: use hook.h library

408 + - receive-pack: convert 'update' hook to hook.h

409 + - hooks: allow callers to capture output

410 + - run-command: allow capturing of collated output

411 + - reference-transaction: use hook.h to run hooks

412 + - transport: convert pre-push hook to use config

413 + - hook: convert 'post-rewrite' hook in sequencer.c to hook.h

414 + - hook: provide stdin by string_list or callback

415 + - run-command: add stdin callback for parallelization

416 + - am: convert 'post-rewrite' hook to hook.h

417 + - hook: support passing stdin to hooks

418 + - run-command: allow stdin for run_processes_parallel

419 + - run-command: remove old run_hook_{le,ve}() hook API

420 + - receive-pack: convert push-to-checkout hook to hook.h

421 + - read-cache: convert post-index-change hook to use config

422 + - commit: use hook.h to execute hooks

423 + - git-p4: use 'git hook' to run hooks

424 + - send-email: use 'git hook run' for 'sendemail-validate'

425 + - git hook run: add an --ignore-missing flag

426 + - merge: use config-based hooks for post-merge hook

427 + - hooks: convert 'post-checkout' hook to hook library

428 + - am: convert applypatch hooks to use config

429 + - rebase: teach pre-rebase to use hook.h

430 + - gc: use hook library for pre-auto-gc hook

431 + - hook: add 'run' subcommand

432 + - hook-list.h: add a generated list of hooks, like config-list.h

433 + - hook.c: add a hook_exists() wrapper and use it in bugreport.c

434 + - hook.[ch]: move find_hook() to this new library

435 + - Makefile: remove an out-of-date comment

436 + - Makefile: stop hardcoding {command,config}-list.h

437 + - Makefile: mark "check" target as .PHONY

438 +

439 + Restructuring of (a subset of) Emily's config-based-hooks series,

440 + to demonstrate that a series can be presented as a more logical and

441 + focused progression.

442 +

443 + Waiting for reviews.

444 +

445 +

446 +* ab/config-hooks-path-testfix (2021-06-16) 1 commit

447 + - pre-commit hook tests: don't leave "actual" nonexisting on failure

448 +

449 + Test fix.

450 +

451 + Will merge to 'next'.

452 +

453 +

454 +* ab/doc-retire-alice-bob (2021-06-16) 6 commits

455 + - pack-protocol doc: use "www-data" in place of "alice"

456 + - doc: replace "alice" and "bob" with "jdoe" and "msmith"

457 + - fast-import doc: change "bob" in an example to "file.txt"

458 + - daemon doc + code comments: reword "alice" example

459 + - gitcvs-migration doc: replace "alice" and "bob" with "you" and "www-data"

460 + - gittutorial doc: replace "alice" and "bob" with "you" and "www-data"

461 +

462 +

463 +* ab/pre-auto-gc-hook-test (2021-06-16) 1 commit

464 + - gc tests: add a test for the "pre-auto-gc" hook

465 +

466 + Test fix.

467 +

468 + Will merge to 'next'.

469 +

470 +

471 +* jv/userdiff-csharp-update (2021-06-16) 1 commit

472 + - userdiff: add support for C# record types

473 +

474 + The userdiff pattern for C# learned the token "record".

475 +

476 + Will merge to 'next'.

477 +

478 +

479 +* en/ort-perf-batch-13 (2021-06-28) 5 commits

480 + - merge-ort: add prefetching for content merges

481 + - diffcore-rename: use a different prefetch for basename comparisons

482 + - diffcore-rename: allow different missing_object_cb functions

483 + - t6421: add tests checking for excessive object downloads during merge

484 + - promisor-remote: output trace2 statistics for number of objects fetched

485 +

486 + Performance tweaks of "git merge -sort" around lazy fetching of objects.

487 +

488 +

489 +* ab/serve-cleanup (2021-06-28) 8 commits

490 + - upload-pack.c: convert to new serve.c "startup" config cb

491 + - serve: add support for a "startup" git_config() callback

492 + - serve.c: add trace2 regions for advertise & command

493 + - serve.c: add call_{advertise,command}() indirection

494 + - serve: use designated initializers

495 + - transport: use designated initializers

496 + - transport: rename "fetch" in transport_vtable to "fetch_refs"

497 + - serve: mark has_capability() as static

498 +

499 + Code clean-up around "git serve".

500 +

501 +

502 +* js/stop-exporting-bogus-columns (2021-06-28) 1 commit

503 + - pager: avoid setting COLUMNS when we're guessing its value

504 +

505 + When we cannot figure out how wide the terminal is, we use a

506 + fallback value of 80 ourselves (which cannot be avoided), but when

507 + we run the pager, we export it in COLUMNS, which forces the pager

508 + to use the hardcoded value, even when the pager is perfectly

509 + capable to figure it out itself. Stop exporting COLUMNS when we

510 + fall back on the hardcoded default value for our own use.

511 +

512 + Will merge to 'next'.

513 +

514

515 * ah/uninitialized-reads-fix (2021-06-15) 3 commits

516 - builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints

@@ -340,7 +566,7 @@ Release tarballs are available at:

566 Will merge to 'next'.

567

568

343 -* jt/partial-clone-submodule-1 (2021-06-11) 5 commits

569 +* jt/partial-clone-submodule-1 (2021-06-28) 5 commits

570 - promisor-remote: teach lazy-fetch in any repo

571 - run-command: refactor subprocess env preparation

572 - submodule: refrain from filtering GIT_CONFIG_COUNT

@@ -353,7 +579,7 @@ Release tarballs are available at:

579 Waiting for reviews.

580

581

356 -* ab/mktag-tests (2021-06-15) 6 commits

582 +* ab/mktag-tests (2021-06-28) 6 commits

583 - mktag tests: test fast-export

584 - mktag tests: test for-each-ref

585 - mktag tests: test update-ref and reachable fsck

@@ -363,21 +589,15 @@ Release tarballs are available at:

589

590 Fill test gaps.

591

366 - Expecting a reroll.

367 - cf. <87czsnyyt8.fsf@evledraar.gmail.com>

368 -

592

370 -* ab/show-branch-tests (2021-06-15) 4 commits

593 +* ab/show-branch-tests (2021-06-28) 4 commits

594 - show-branch tests: add missing tests

372 - - show-branch: fix and test --color output

595 + - show-branch: don't <COLOR></RESET> for space characters

596 - show-branch tests: modernize test code

597 - show-branch tests: rename the one "show-branch" test file

598

599 Fill test gaps.

600

378 - Waiting for review discussion to settle.

379 - cf. <162374905722.40525.516266574605586007.git@grubix.eu>

380 -

601

602 * ah/graph-typofix (2021-06-15) 1 commit

603 - graph: improve grammar of "invalid color" error message

@@ -400,7 +620,7 @@ Release tarballs are available at:

620 Waiting for reviews.

621

622

403 -* fc/pull-cleanups (2021-06-15) 3 commits

623 +* fc/pull-cleanups (2021-06-19) 3 commits

624 - pull: trivial whitespace style fix

625 - pull: trivial cleanup

626 - pull: cleanup autostash check

@@ -418,12 +638,14 @@ Release tarballs are available at:

638 Will merge to 'next'.

639

640

421 -* jx/t6020-with-older-bash (2021-06-14) 1 commit

422 - - t6020: fix bash incompatible issue

641 +* jx/t6020-with-older-bash (2021-06-17) 1 commit

642 + - t6020: fix incompatible parameter expansion

643

644 Work around inefficient glob substitution in older versions of bash

645 by rewriting parts of a test.

646

647 + Will merge to 'next'.

648 +

649

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

651 - update documentation for new zdiff3 conflictStyle

@@ -545,16 +767,14 @@ Release tarballs are available at:

767 Will merge to 'next'.

768

769

548 -* ab/pack-objects-stdin (2021-06-09) 4 commits

770 +* ab/pack-objects-stdin (2021-06-28) 4 commits

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

772 - pack-objects.c: do stdin parsing via revision.c's API

551 - - revision.h: unify "disable_stdin" and "read_from_stdin"

773 + - revision.h: refactor "disable_stdin" and "read_from_stdin"

774 - upload-pack: run is_repository_shallow() before setup_revisions()

775

776 Code clean-up.

777

556 - Waiting for reviews.

557 -

778

779 * ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit

780 - MyFirstContribution: link #git-devel to Libera Chat

@@ -781,14 +1001,20 @@ Release tarballs are available at:

1001 Will merge to 'next'.

1002

1003

784 -* zh/ref-filter-raw-data (2021-06-16) 9 commits

1004 +* zh/ref-filter-raw-data (2021-06-28) 15 commits

1005 + . ref-filter: remove grab_oid() function

1006 . cat-file: re-implement --textconv, --filters options

786 - . cat-file: reuse err buf in batch_objet_write()

1007 + . cat-file: reuse err buf in batch_object_write()

1008 . cat-file: reuse ref-filter logic

788 - . ref-filter: introduce free_array_item_internal() function

789 - . ref-filter: teach get_object() return useful value

1009 + . cat-file: change batch_objects parameter name

1010 + . cat-file: add has_object_file() check

1011 + . ref-filter: modify the error message and value in get_object

1012 + . ref-filter: add cat_file_mode in struct ref_format

1013 + . ref-filter: introduce free_ref_array_item_value() function

1014 + . ref-filter: pass get_object() return value to their callers

1015 . ref-filter: add %(rest) atom

1016 . ref-filter: use non-const ref_format in *_atom_parser()

1017 + . ref-filter: --format=%(raw) re-support --perl

1018 . ref-filter: add %(raw) atom

1019 . ref-filter: add obj-type check in grab contents

1020

@@ -867,40 +1093,32 @@ Release tarballs are available at:

1093 Will merge to 'next'.

1094

1095

870 -* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits

871 - - doc: remove GNU_ROFF option

872 - - doc: add an option to have Asciidoctor build man pages directly

873 -

874 - An option to render the manual pages via AsciiDoctor bypassing

875 - xmlto has been introduced.

876 -

877 - What is the status of this one?

878 -

879 -

880 -* ab/fsck-unexpected-type (2021-05-21) 17 commits

881 - . fsck: report invalid object type-path combinations

882 - . fsck: report invalid types recorded in objects

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

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

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

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

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

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

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

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

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

892 - . cat-file tests: add corrupt loose object test

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

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

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

896 - . fsck tests: add test for fsck-ing an unknown type

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

1096 +* ab/fsck-unexpected-type (2021-06-28) 21 commits

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

1098 + - fsck: report invalid types recorded in objects

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1118

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

1120 actual types of an object better.

1121

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

903 -

1122 --------------------------------------------------

1123 [Will Discard]

1124

@@ -972,41 +1190,6 @@ Release tarballs are available at:

1190 cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>

1191

1192

975 -* tb/multi-pack-bitmaps (2021-04-10) 23 commits

976 - . p5326: perf tests for MIDX bitmaps

977 - . p5310: extract full and partial bitmap tests

978 - . midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'

979 - . t7700: update to work with MIDX bitmap test knob

980 - . t5319: don't write MIDX bitmaps in t5319

981 - . t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP

982 - . t5326: test multi-pack bitmap behavior

983 - . t/helper/test-read-midx.c: add --checksum mode

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

985 - . pack-bitmap: write multi-pack bitmaps

986 - . pack-bitmap: read multi-pack bitmaps

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

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

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

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

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

992 - . midx: make a number of functions non-static

993 - . Documentation: describe MIDX-based bitmaps

994 - . Documentation: build 'technical/bitmap-format' by default

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

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

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

998 - . Merge branch 'tb/pack-preferred-tips-to-give-bitmap' into tb/multi-pack-bitmaps

999 -

1000 - The reachability bitmap file used to be generated only for a single

1001 - pack, but now we've learned to generate bitmaps for history that

1002 - span across multiple packfiles.

1003 -

1004 - Will discard.

1005 - We had to wait for a reroll for too long.

1006 - cf. <cover.1617991824.git.me@ttaylorr.com>

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

1008 -

1009 -

1193 * fc/neuter-doc (2021-06-14) 2 commits

1194 . comments: avoid using the gender of our users

1195 . doc: avoid using the gender of other people

@@ -1016,7 +1199,7 @@ Release tarballs are available at:

1199 This seems to give more readable result than Stolee's "use singular

1200 they" topic.

1201

1019 - Now will be part of the ds/gender-neutral-doc topic.

1202 + Now is a part of the ds/gender-neutral-doc topic.

1203

1204

1205 * es/config-based-hooks (2021-05-27) 37 commits

@@ -1062,3 +1245,11 @@ Release tarballs are available at:

1245

1246 Tentatively kicked out to give ab/config-based-hooks-base a chance

1247 to interact with other topics in flight.

1248 +

1249 +

1250 +* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits

1251 + . doc: remove GNU_ROFF option

1252 + . doc: add an option to have Asciidoctor build man pages directly

1253 +

1254 + An option to render the manual pages via AsciiDoctor bypassing

1255 + xmlto has been introduced.

What's cooking (2021/06 #07)