5511c013c0 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jun 2024, #04; Wed, 12)

2 +Subject: What's cooking in git.git (Jun 2024, #05; Fri, 14)

3 X-master-at: d63586cb314731c851f28e14fc8012988467e2da

4 -X-next-at: 1570129ebf8726037c796002ceeec929c386d5a6

4 +X-next-at: 447d99e1c3bfb5c45d0d491c7e2c0b75dd7eccf9

5 Bcc: lwn@lwn.net, gitster@pobox.com

6

7 -What's cooking in git.git (Jun 2024, #04; Wed, 12)

7 +What's cooking in git.git (Jun 2024, #05; Fri, 14)

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

9

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

@@ -46,91 +46,135 @@ Release tarballs are available at:

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

47

48 --------------------------------------------------

49 -[Graduated to 'master']

49 +[New Topics]

50

51 -* cp/reftable-unit-test (2024-05-30) 5 commits

52 - (merged to 'next' on 2024-06-04 at baff123933)

53 - + t: improve the test-case for parse_names()

54 - + t: add test for put_be16()

55 - + t: move tests from reftable/record_test.c to the new unit test

56 - + t: move tests from reftable/stack_test.c to the new unit test

57 - + t: move reftable/basics_test.c to the unit testing framework

51 +* cp/unit-test-reftable-tree (2024-06-13) 5 commits

52 + - t-reftable-tree: improve the test for infix_walk()

53 + - t-reftable-tree: add test for non-existent key

54 + - t-reftable-tree: split test_tree() into two sub-test functions

55 + - t: move reftable/tree_test.c to the unit testing framework

56 + - reftable: remove unnecessary curly braces in reftable/tree.c

57

59 - Basic unit tests for reftable have been reimplemented under the

60 - unit test framework.

61 - source: <20240529171439.18271-1-chandrapratap3519@gmail.com>

58 + A test in reftable library has been rewritten using the unit test

59 + framework.

60

61 + Needs review.

62 + source: <20240612130217.8877-1-chandrapratap3519@gmail.com>

63 +

64 +

65 +* ps/use-the-repository (2024-06-14) 22 commits

66 + - hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE`

67 + - t/helper: remove dependency on `the_repository` in "proc-receive"

68 + - t/helper: fix segfault in "oid-array" command without repository

69 + - t/helper: use correct object hash in partial-clone helper

70 + - compat/fsmonitor: fix socket path in networked SHA256 repos

71 + - replace-object: use hash algorithm from passed-in repository

72 + - protocol-caps: use hash algorithm from passed-in repository

73 + - oidset: pass hash algorithm when parsing file

74 + - http-fetch: don't crash when parsing packfile without a repo

75 + - hash-ll: merge with "hash.h"

76 + - refs: avoid include cycle with "repository.h"

77 + - global: introduce `USE_THE_REPOSITORY_VARIABLE` macro

78 + - hash: require hash algorithm in `empty_tree_oid_hex()`

79 + - hash: require hash algorithm in `is_empty_{blob,tree}_oid()`

80 + - hash: make `is_null_oid()` independent of `the_repository`

81 + - hash: convert `oidcmp()` and `oideq()` to compare whole hash

82 + - global: ensure that object IDs are always padded

83 + - hash: require hash algorithm in `oidread()` and `oidclr()`

84 + - hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()`

85 + - hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions

86 + - Merge branch 'gt/unit-test-oidtree' into ps/use-the-repository

87 + - Merge branch 'ps/ref-storage-migration' into ps/use-the-repository

88 + (this branch uses gt/unit-test-oidtree and ps/ref-storage-migration.)

89 +

90 + A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help

91 + transition the codebase to rely less on the availability of the

92 + singleton the_repository instance.

93

64 -* gt/decorate-unit-test (2024-05-28) 1 commit

65 - (merged to 'next' on 2024-06-06 at dd2eb8cad4)

66 - + t/: migrate helper/test-example-decorate to the unit testing framework

94 + Needs review.

95 + source: <cover.1718347699.git.ps@pks.im>

96

68 - A test helper that essentially is unit tests on the "decorate"

69 - logic has been rewritten using the unit-tests framework.

70 - source: <20240528125837.31090-1-shyamthakkar001@gmail.com>

97

98 +* sj/ref-fsck (2024-06-13) 8 commits

99 + - fsck: add ref content check for files backend

100 + - fsck: add ref name check for files backend

101 + - files-backend: add unified interface for refs scanning

102 + - builtin/fsck: add `git-refs verify` child process

103 + - builtin/refs: add verify subcommand

104 + - refs: set up ref consistency check infrastructure

105 + - fsck: add refs check interfaces to interface with fsck error levels

106 + - Merge branch 'ps/ref-storage-migration' into sj/ref-fsck

107 + (this branch uses ps/ref-storage-migration.)

108

73 -* gt/t-hash-unit-test (2024-05-29) 2 commits

74 - (merged to 'next' on 2024-06-04 at 86328a5c8c)

75 - + t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash

76 - + strbuf: introduce strbuf_addstrings() to repeatedly add a string

109 + "git fsck" infrastructure has been taught to also check the sanity

110 + of the ref database, in addition to the object database.

111

78 - A pair of test helpers that essentially are unit tests on hash

79 - algorithms have been rewritten using the unit-tests framework.

80 - source: <20240529080030.64410-1-shyamthakkar001@gmail.com>

112 + Needs review.

113 + source: <20240612085349.710785-1-shejialuo@gmail.com>

114

115

83 -* jc/safe-directory-leading-path (2024-05-29) 1 commit

84 - (merged to 'next' on 2024-06-04 at 3d8cb9239c)

85 - + safe.directory: allow "lead/ing/path/*" match

116 +* en/ort-inner-merge-error-fix (2024-06-13) 7 commits

117 + - merge-ort: convert more error() cases to path_msg()

118 + - merge-ort: upon merge abort, only show messages causing the abort

119 + - merge-ort: loosen commented requirements

120 + - merge-ort: clearer propagation of failure-to-function from merge_submodule

121 + - merge-ort: fix type of local 'clean' var in handle_content_merge()

122 + - merge-ort: maintain expected invariant for priv member

123 + - merge-ort: extract handling of priv member into reusable function

124

87 - The safe.directory configuration knob has been updated to

88 - optionally allow leading path matches.

89 - source: <xmqqplt4zjw7.fsf@gitster.g>

125 + The "ort" merge backend saw one bugfix for a crash that happens

126 + when inner merge gets killed, and assorted code clean-ups.

127

128 + Waiting for comments or a reroll.

129 + source: <pull.1748.git.1718310307.gitgitgadget@gmail.com>

130

92 -* jc/t1517-more (2024-06-04) 2 commits

93 - (merged to 'next' on 2024-06-04 at f5a118872d)

94 - + imap-send: minimum leakfix

95 - (merged to 'next' on 2024-06-03 at 10b71e2a60)

96 - + t1517: more coverage for commands that work without repository

97 - (this branch is used by jk/imap-send-plug-all-msgs-leak.)

131

99 - A new test was added to ensure git commands that are designed to

100 - run outside repositories do work.

101 - source: <xmqqwmnajrrk.fsf@gitster.g>

102 -

103 -

104 -* jk/cap-exclude-file-size (2024-06-05) 2 commits

105 - (merged to 'next' on 2024-06-05 at 2467011532)

106 - + dir.c: reduce max pattern file size to 100MB

107 - (merged to 'next' on 2024-06-04 at 51c0d632d3)

108 - + dir.c: skip .gitignore, etc larger than INT_MAX

109 -

110 - An overly large ".gitignore" files are now rejected silently.

111 - source: <xmqqikyowqjj.fsf@gitster.g>

112 -

113 -

114 -* jk/sparse-leakfix (2024-06-05) 14 commits

115 - (merged to 'next' on 2024-06-06 at c92e02c528)

116 - + sparse-checkout: free duplicate hashmap entries

117 - + sparse-checkout: free string list after displaying

118 - + sparse-checkout: free pattern list in sparse_checkout_list()

119 - + sparse-checkout: free sparse_filename after use

120 - + sparse-checkout: refactor temporary sparse_checkout_patterns

121 - + sparse-checkout: always free "line" strbuf after reading input

122 - + sparse-checkout: reuse --stdin buffer when reading patterns

123 - + dir.c: always copy input to add_pattern()

124 - + dir.c: free removed sparse-pattern hashmap entries

125 - + sparse-checkout: clear patterns when init() sees existing sparse file

126 - + dir.c: free strings in sparse cone pattern hashmaps

127 - + sparse-checkout: pass string literals directly to add_pattern()

128 - + sparse-checkout: free string list in write_cone_to_file()

129 - + Merge branch 'jk/leakfixes' into jk/sparse-leakfix

130 -

131 - Many memory leaks in the sparse-checkout code paths have been

132 - plugged.

133 - source: <20240604100814.GA1304520@coredump.intra.peff.net>

132 +* cp/unit-test-reftable-pq (2024-06-14) 7 commits

133 + - t-reftable-pq: add tests for merged_iter_pqueue_top()

134 + - t-reftable-pq: add test for index based comparison

135 + - t-reftable-pq: make merged_iter_pqueue_check() callable by reference

136 + - t-reftable-pq: make merged_iter_pqueue_check() static

137 + - t: move reftable/pq_test.c to the unit testing framework

138 + - reftable: change the type of array indices to 'size_t' in reftable/pq.c

139 + - reftable: remove unncessary curly braces in reftable/pq.c

140 +

141 + The tests for "pq" part of reftable library got rewritten to use

142 + the unit test framework.

143 +

144 + Needs review.

145 + source: <20240614095136.12052-1-chandrapratap3519@gmail.com>

146 +

147 +

148 +* jc/archive-prefix-with-add-virtual-file (2024-06-14) 1 commit

149 + - archive: document that --add-virtual-file takes full path

150 +

151 + "git archive --add-virtual-file=<path>:<contents>" never paid

152 + attention to the --prefix=<prefix> option but the documentation

153 + said it would. The documentation has been corrected.

154 +

155 + Waiting for comments.

156 + source: <xmqq5xubfjuu.fsf_-_@gitster.g>

157 +

158 +

159 +* jk/remote-wo-url (2024-06-14) 11 commits

160 + - remote: drop checks for zero-url case

161 + - remote: always require at least one url in a remote

162 + - t5801: test remote.*.vcs config

163 + - t5801: make remote-testgit GIT_DIR setup more robust

164 + - remote: allow resetting url list

165 + - config: document remote.*.url/pushurl interaction

166 + - remote: simplify url/pushurl selection

167 + - remote: use strvecs to store remote url/pushurl

168 + - remote: transfer ownership of memory in add_url(), etc

169 + - remote: refactor alias_url() memory ownership

170 + - archive: fix check for missing url

171 +

172 + Memory ownership rules for the in-core representation of

173 + remote.*.url configuration values have been straightened out, which

174 + resulted in a few leak fixes and code clarification.

175 +

176 + Waiting for comments.

177 + source: <20240614102439.GA222287@coredump.intra.peff.net>

178

179 --------------------------------------------------

180 [Cooking]

@@ -161,21 +205,10 @@ Release tarballs are available at:

205 source: <f91004a4382c95b1b87bf3d1aafc018af2b7b92e.1717662814.git.ps@pks.im>

206

207

164 -* tb/pseudo-merge-reachability-bitmap-fixes (2024-06-06) 2 commits

165 - - pack-bitmap.c: ensure pseudo-merge offset reads are bounded

166 - - Documentation/technical/bitmap-format.txt: add missing position table

167 - (this branch uses tb/pseudo-merge-reachability-bitmap.)

168 -

169 - Two rather straight-forward fixes to the base topic that is cooking

170 - in 'next'. Once people find it satisfactory, I plan to merge them

171 - into the base topic.

172 -

173 - Comments?

174 - source: <cover.1716499565.git.me@ttaylorr.com>

175 -

176 -

177 -* db/date-underflow-fix (2024-06-08) 2 commits

178 - - SQUASH???

208 +* db/date-underflow-fix (2024-06-13) 4 commits

209 + - SQUASH??? skip "near the end-of-git-time" tests on 32-bit systems

210 + - SQUASH??? t0006: simplify prerequisite

211 + - SQUASH??? the git-end-of-time is beyond time_t on 32-bit systems

212 - date: detect underflow/overflow when parsing dates with timezone offset

213

214 date parser updates to be more careful about underflowing epoch

@@ -195,8 +228,7 @@ Release tarballs are available at:

228 updated to use the tempfile API to avoid leaving cruft after

229 failing.

230

198 - Comments?

199 - cf. <xmqqfrtog2rd.fsf@gitster.g>

231 + Will merge to 'next'.

232 source: <cover.1717712358.git.me@ttaylorr.com>

233

234

@@ -238,11 +270,13 @@ Release tarballs are available at:

270

271

272 * gt/unit-test-oidtree (2024-06-12) 1 commit

241 - - t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c

273 + (merged to 'next' on 2024-06-13 at eb3700b002)

274 + + t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c

275 + (this branch is used by ps/use-the-repository.)

276

277 "oidtree" tests were rewritten to use the unit test framework.

278

245 - Will merge to 'next'.

279 + Will merge to 'master'.

280 cf. <7o6fuymnfn6b6buyw3yyctjd4dlwlrazspv3xgxvys6djjivxh@qbhyurorgbtt>

281 source: <20240608165731.29467-1-shyamthakkar001@gmail.com>

282

@@ -266,29 +300,31 @@ Release tarballs are available at:

300

301 Code cleanup.

302

269 - Comments?

303 + Will merge to 'next'.

304 source: <20240608183901.2084546-1-gitster@pobox.com>

305

306

307 * ds/ahead-behind-fix (2024-06-12) 1 commit

274 - - commit-graph: increment progress indicator

308 + (merged to 'next' on 2024-06-13 at df378ec81e)

309 + + commit-graph: increment progress indicator

310

311 Fix for a progress bar.

312

278 - Will merge to 'next'.

313 + Will merge to 'master'.

314 source: <pull.1743.git.1718118555197.gitgitgadget@gmail.com>

315

316

317 * ps/abbrev-length-before-setup-fix (2024-06-12) 3 commits

283 - - object-name: don't try to abbreviate to lengths greater than hexsz

284 - - parse-options-cb: stop clamping "--abbrev=" to hash length

285 - - config: fix segfault when parsing "core.abbrev" without repo

318 + (merged to 'next' on 2024-06-13 at e5d17f7da2)

319 + + object-name: don't try to abbreviate to lengths greater than hexsz

320 + + parse-options-cb: stop clamping "--abbrev=" to hash length

321 + + config: fix segfault when parsing "core.abbrev" without repo

322

323 Setting core.abbrev too early before the repository set-up

324 (typically in "git clone") caused segfault, which as been

325 corrected.

326

291 - Will merge to 'next'.

327 + Will merge to 'master'.

328 source: <cover.1718178996.git.ps@pks.im>

329

330

@@ -304,13 +340,14 @@ Release tarballs are available at:

340

341

342 * tb/multi-pack-reuse-fix (2024-06-11) 3 commits

307 - - pack-revindex.c: guard against out-of-bounds pack lookups

308 - - pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse

309 - - midx-write.c: do not read existing MIDX with `packs_to_include`

343 + (merged to 'next' on 2024-06-13 at 1cd0259667)

344 + + pack-revindex.c: guard against out-of-bounds pack lookups

345 + + pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse

346 + + midx-write.c: do not read existing MIDX with `packs_to_include`

347

348 Assorted fixes to multi-pack-index code paths.

349

313 - Will merge to 'next'.

350 + Will merge to 'master'.

351 source: <cover.1718126886.git.me@ttaylorr.com>

352

353

@@ -334,6 +371,8 @@ Release tarballs are available at:

371

372 "git mktree" has been rewritten, taking advantage of the cache-tree

373 API.

374 +

375 + Waiting for comments or a reroll.

376 source: <pull.1746.git.1718130288.gitgitgadget@gmail.com>

377

378

@@ -380,14 +419,15 @@ Release tarballs are available at:

419

420

421 * jc/heads-are-branches (2024-06-04) 3 commits

383 - - show-ref: introduce --branches and deprecate --heads

384 - - ls-remote: introduce --branches and deprecate --heads

385 - - refs: call branches branches

422 + (merged to 'next' on 2024-06-14 at b56b59d1d7)

423 + + show-ref: introduce --branches and deprecate --heads

424 + + ls-remote: introduce --branches and deprecate --heads

425 + + refs: call branches branches

426

427 The "--heads" option of "ls-remote" and "show-ref" has been been

428 deprecated; "--branches" replaces "--heads".

429

390 - Comments?

430 + Will merge to 'master'.

431 source: <20240604220145.3260714-1-gitster@pobox.com>

432

433

@@ -421,15 +461,15 @@ Release tarballs are available at:

461

462

463 * rj/format-patch-auto-cover-with-interdiff (2024-06-07) 2 commits

424 - - format-patch: assume --cover-letter for diff in multi-patch series

425 - - t4014: cleanups in a few tests

464 + (merged to 'next' on 2024-06-13 at 3fad4afcfd)

465 + + format-patch: assume --cover-letter for diff in multi-patch series

466 + + t4014: cleanups in a few tests

467

468 "git format-patch --interdiff" for multi-patch series learned to

469 turn on cover letters automatically (unless told never to enable

470 cover letter with "--no-cover-letter" and such).

471

431 - Will merge to 'next'.

432 - source: <9f520828-f87e-49b1-aa4b-c00ec6bb0133@gmail.com>

472 + Will merge to 'master'.

473

474

475 * rs/diff-exit-code-with-external-diff (2024-06-10) 3 commits

@@ -454,7 +494,7 @@ Release tarballs are available at:

494 variable did nothing but giving a "this does not do anything"

495 warning. Finally remove it.

496

457 - Comments?

497 + Will merge to 'next'.

498 source: <xmqqikynqdvq.fsf@gitster.g>

499

500

@@ -465,7 +505,7 @@ Release tarballs are available at:

505 attributes in a bare repository, but failed to document it. This

506 has been corrected.

507

468 - Comments?

508 + Will merge to 'next'.

509 source: <xmqqa5jzqd5k.fsf_-_@gitster.g>

510

511

@@ -570,36 +610,19 @@ Release tarballs are available at:

610 source: <20240523225007.2871766-1-gitster@pobox.com>

611

612

573 -* cc/upload-pack-missing-action (2024-05-24) 3 commits

574 - - upload-pack: allow configuring a missing-action

575 - - pack-objects: use the missing action API

576 - - rev-list: refactor --missing=<missing-action>

577 -

578 - Allow a server S that is a lazy clone of another repository X to

579 - respond to a request by C that is a lazy clone of S in a way that

580 - it omits objects it itself does not have (and has to be lazily

581 - fetched from X).

582 -

583 - I would say this is a terribly irresponsive design, especially

584 - there is no negociation for S to learn if the objects it is going

585 - to omit is obtainable by C from elsewhere.

586 -

587 - Will discard.

588 - source: <20240524163926.2019648-1-christian.couder@gmail.com>

589 -

590 -

591 -* ps/document-breaking-changes (2024-06-04) 4 commits

592 - - BreakingChanges: document that we do not plan to deprecate git-checkout

593 - - BreakingChanges: document removal of grafting

594 - - BreakingChanges: document upcoming change from "sha1" to "sha256"

595 - - docs: introduce document to announce breaking changes

613 +* ps/document-breaking-changes (2024-06-14) 4 commits

614 + (merged to 'next' on 2024-06-14 at 8089bf6f81)

615 + + BreakingChanges: document that we do not plan to deprecate git-checkout

616 + + BreakingChanges: document removal of grafting

617 + + BreakingChanges: document upcoming change from "sha1" to "sha256"

618 + + docs: introduce document to announce breaking changes

619

620 The structure of the document that records longer-term project

621 decisions to deprecate/remove/update various behaviour has been

622 outlined.

623

601 - Getting there.

602 - source: <cover.1717504292.git.ps@pks.im>

624 + Will merge to 'master'.

625 + source: <cover.1718345026.git.ps@pks.im>

626

627

628 * ps/ref-storage-migration (2024-06-06) 14 commits

@@ -618,7 +641,7 @@ Release tarballs are available at:

641 + setup: unset ref storage when reinitializing repository version

642 + Merge branch 'ps/pseudo-ref-terminology' into ps/ref-storage-migration

643 + Merge branch 'ps/refs-without-the-repository-updates' into ps/ref-storage-migration

621 - (this branch is used by ps/use-the-repository.)

644 + (this branch is used by ps/use-the-repository and sj/ref-fsck.)

645

646 Allow migrating a repository that uses the files backend for its

647 ref storage to use the reftable backend, with limitations.

@@ -627,7 +650,10 @@ Release tarballs are available at:

650 source: <cover.1717649802.git.ps@pks.im>

651

652

630 -* tb/pseudo-merge-reachability-bitmap (2024-05-24) 25 commits

653 +* tb/pseudo-merge-reachability-bitmap (2024-06-14) 27 commits

654 + (merged to 'next' on 2024-06-14 at 447d99e1c3)

655 + + pack-bitmap.c: ensure pseudo-merge offset reads are bounded

656 + + Documentation/technical/bitmap-format.txt: add missing position table

657 (merged to 'next' on 2024-06-03 at fcaa39de12)

658 + t/perf: implement performance tests for pseudo-merge bitmaps

659 + pseudo-merge: implement support for finding existing merges

@@ -654,89 +680,59 @@ Release tarballs are available at:

680 + Documentation/gitpacking.txt: describe pseudo-merge bitmaps

681 + Documentation/gitpacking.txt: initial commit

682 + Merge branch 'tb/pack-bitmap-write-cleanups' into tb/pseudo-merge-reachability-bitmap

657 - (this branch is used by tb/pseudo-merge-reachability-bitmap-fixes.)

683

684 The pseudo-merge reachability bitmap to help more efficient storage

685 of the reachability bitmap in a repository with too many refs has

686 been added.

687

663 - On hold until we get comments on the follow-up topic.

688 + Will merge to 'next'?

689 source: <cover.1716499565.git.me@ttaylorr.com>

690 + source: <cover.1718392943.git.me@ttaylorr.com>

691

692

693 * kn/update-ref-symref (2024-06-07) 8 commits

668 - - update-ref: add support for 'symref-update' command

669 - - reftable: pick either 'oid' or 'target' for new updates

670 - - update-ref: add support for 'symref-create' command

671 - - update-ref: add support for 'symref-delete' command

672 - - update-ref: add support for 'symref-verify' command

673 - - refs: specify error for regular refs with `old_target`

674 - - refs: create and use `ref_update_expects_existing_old_ref()`

675 - - Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref

694 + (merged to 'next' on 2024-06-13 at 5cf8d7513e)

695 + + update-ref: add support for 'symref-update' command

696 + + reftable: pick either 'oid' or 'target' for new updates

697 + + update-ref: add support for 'symref-create' command

698 + + update-ref: add support for 'symref-delete' command

699 + + update-ref: add support for 'symref-verify' command

700 + + refs: specify error for regular refs with `old_target`

701 + + refs: create and use `ref_update_expects_existing_old_ref()`

702 + + Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref

703

704 "git update-ref --stdin" learned to handle transactional updates of

705 symbolic-refs.

706

680 - Will merge to 'next'.

707 + Will merge to 'master'.

708 source: <20240607133304.2333280-1-knayak@gitlab.com>

709

710

684 -* ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit

685 - - archive: make --add-virtual-file honor --prefix

686 -

687 - The "--add-virtual-file" option of "git archive", added primarily

688 - to help "git diagnose", has always ignored the "--prefix", but

689 - been documented to honor it.

690 -

691 - Iffy if updating the implementation is the best approach.

692 - cf. <bc3711a7-37d5-46bc-979e-83bd0b2cf900@web.de>

693 - source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@gmail.com>

694 -

695 -

711 * tb/precompose-getcwd (2024-05-31) 1 commit

712 - macOS: ls-files path fails if path of workdir is NFD

713

714 We forgot to normalize the result of getcwd() to NFC on macOS where

700 - all other paths are normalized, which has been corrected.

715 + all other paths are normalized, which has been corrected. This still

716 + does not address the case where core.precomposeUnicode configuration

717 + is not defined globally.

718 +

719 + Will merge to 'next'.

720 source: <20240531193156.28046-1-tboegi@web.de>

721

722

723 * pw/rebase-i-error-message (2024-05-30) 2 commits

705 - - rebase -i: improve error message when picking merge

706 - - rebase -i: pass struct replay_opts to parse_insn_line()

724 + (merged to 'next' on 2024-06-13 at dbec12cfda)

725 + + rebase -i: improve error message when picking merge

726 + + rebase -i: pass struct replay_opts to parse_insn_line()

727

728 When the user adds to "git rebase -i" instruction to "pick" a merge

729 commit, the error experience is not pleasant. Such an error is now

730 caught earlier in the process that parses the todo list.

731

712 - Expecting a reroll.

713 - cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@gmail.com>

732 + Will merge to 'master'.

733 source: <pull.1672.v3.git.1717076630.gitgitgadget@gmail.com>

734

735

717 -* ew/khash-to-khashl (2024-03-28) 3 commits

718 - - khashl: fix ensemble lookups on empty table

719 - - treewide: switch to khashl for memory savings

720 - - list-objects-filter: use kh_size API

721 -

722 - The hashtable library "khash.h" has been replaced with "khashl.h"

723 - that has better memory usage characteristics.

724 -

725 - Will discard.

726 - cf. <xmqqy1a4ao3t.fsf@gitster.g>

727 - source: <20240328101356.300374-1-e@80x24.org>

728 -

729 -

730 -* ds/doc-config-reflow (2024-03-14) 1 commit

731 - - config.txt: perform some minor reformatting

732 -

733 - Reflow a paragraph in the documentation source without any effect

734 - to the formatted text.

735 -

736 - Will discard.

737 - source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>

738 -

739 -

736 * ie/config-includeif-hostname (2024-03-19) 2 commits

737 - config: learn the "hostname:" includeIf condition

738 - t: add a test helper for getting hostname

@@ -838,3 +834,67 @@ Release tarballs are available at:

834 Discarded.

835 False positives in "-Og -Wall -Werror" are too annoying.

836 source: <cover.1718001244.git.ps@pks.im>

837 +

838 +

839 +* ds/doc-config-reflow (2024-03-14) 1 commit

840 + . config.txt: perform some minor reformatting

841 +

842 + Reflow a paragraph in the documentation source without any effect

843 + to the formatted text.

844 +

845 + Discarded.

846 + source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>

847 +

848 +

849 +* ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit

850 + . archive: make --add-virtual-file honor --prefix

851 +

852 + The "--add-virtual-file" option of "git archive", added primarily

853 + to help "git diagnose", has always ignored the "--prefix", but

854 + been documented to honor it.

855 +

856 + Discarded.

857 + source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@gmail.com>

858 +

859 +

860 +* cc/upload-pack-missing-action (2024-05-24) 3 commits

861 + . upload-pack: allow configuring a missing-action

862 + . pack-objects: use the missing action API

863 + . rev-list: refactor --missing=<missing-action>

864 +

865 + Allow a server S that is a lazy clone of another repository X to

866 + respond to a request by C that is a lazy clone of S in a way that

867 + it omits objects it itself does not have (and has to be lazily

868 + fetched from X).

869 +

870 + I would say this is a terribly irresponsive design, especially

871 + there is no negociation for S to learn if the objects it is going

872 + to omit is obtainable by C from elsewhere.

873 +

874 + Discarded.

875 + source: <20240524163926.2019648-1-christian.couder@gmail.com>

876 +

877 +

878 +* ew/khash-to-khashl (2024-03-28) 3 commits

879 + . khashl: fix ensemble lookups on empty table

880 + . treewide: switch to khashl for memory savings

881 + . list-objects-filter: use kh_size API

882 +

883 + The hashtable library "khash.h" has been replaced with "khashl.h"

884 + that has better memory usage characteristics.

885 +

886 + Discarded.

887 + cf. <20240419214644.M168521@dcvr>

888 + source: <20240328101356.300374-1-e@80x24.org>

889 +

890 +

891 +* tb/pseudo-merge-reachability-bitmap-fixes (2024-06-06) 2 commits

892 + - pack-bitmap.c: ensure pseudo-merge offset reads are bounded

893 + - Documentation/technical/bitmap-format.txt: add missing position table

894 + (this branch uses tb/pseudo-merge-reachability-bitmap.)

895 +

896 + Two rather straight-forward fixes to the base topic that is cooking

897 + in 'next'. Once people find it satisfactory, I plan to merge them

898 + into the base topic.

899 +

900 + Merged into the base topic.

What's cooking (2024/06 #05)