4f00d2ec7b · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jun 2026, #08)

3 -X-master-at: 26d8d94e94df5535eecd036f16627493506a0614

4 -X-next-at: 0e7f024ab5a9fbe85f03c2e2a9e851d80bd6640a

2 +Subject: What's cooking in git.git (Jun 2026, #09)

3 +X-master-at: ab776a62a78576513ee121424adb19597fbb7613

4 +X-next-at: 234d366ad24a8ff7c16a867f3ef2bcd89aa774ae

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

6

7 -What's cooking in git.git (Jun 2026, #08)

7 +What's cooking in git.git (Jun 2026, #09)

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

9

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

@@ -17,15 +17,9 @@ A topic without enough support may be discarded after a long period

17 of no activity (of course they can be resubmitted when new interests

18 arise).

19

20 -Git 2.55-rc2 will be tagged tomorrow. There are a few topics I want

21 -to merge to 'master' before it happens, but other than these topics,

22 -I expect nothing will move to 'master' before the final. The tree

23 -is feature-frozen, and remaining topics in 'next' will stay in "Will

24 -cook in 'next'" instead of "Will merge to 'master'" state. We'd

25 -want to force ourselves to concentrate on addressing topics that are

26 -important fixes but still in the "Needs review" state, and of

27 -course, find any correct any regressions relative to Git 2.54, until

28 -we are ready to tag Git 2.55 final.

20 +Git 2.55-rc2 has been tagged. The tree is in deep feature-freeze,

21 +and remaining topics in 'next' will stay in "Will cook in 'next'"

22 +instead of "Will merge to 'master'" state, until Git 2.55 final.

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

@@ -58,31 +52,84 @@ Release tarballs are available at:

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

53 [Graduated to 'master']

54

61 -* js/objects-larger-than-4gb-on-windows-more (2026-06-15) 7 commits

62 - (merged to 'next' on 2026-06-18 at 2b3ac350e6)

63 - + odb: use size_t for object_info.sizep and the size APIs

64 - + packfile,delta: drop the `cast_size_t_to_ulong()` wrappers

65 - + pack-objects: use size_t for in-core object sizes

66 - + packfile: widen unpack_entry()'s size out-parameter to size_t

67 - + pack-objects(check_pack_inflate()): use size_t instead of unsigned long

68 - + patch-delta: use size_t for sizes

69 - + compat/msvc: use _chsize_s for ftruncate

55 +* hn/macos-linker-warning (2026-06-19) 1 commit

56 + (merged to 'next' on 2026-06-22 at 0e7f024ab5)

57 + + config.mak.uname: avoid macOS dup-library warning

58

71 - Will cook in 'next'.

72 - cf. <ajPhBn7n1wR-sii4@pks.im>

73 - source: <pull.2137.v2.git.1781524349.gitgitgadget@gmail.com>

59 + Xcode 15 and later has a linker set to complain when the same library

60 + archive is listed twice on the command line. Squelch the annoyance.

61 + cf. <ajjspU7lJ01GgrBw@pks.im>

62 + source: <pull.2314.v3.git.git.1781901127385.gitgitgadget@gmail.com>

63

64

76 -* kw/gitattributes-typofix (2026-06-15) 1 commit

77 - (merged to 'next' on 2026-06-17 at 14ff167ef8)

78 - + gitattributes: fix eol attribute for Perl scripts

65 +* js/win32-localtime-r (2026-06-22) 1 commit

66 + (merged to 'next' on 2026-06-22 at 67d3fa726d)

67 + + win32: ensure that `localtime_r()` is declared even in i686 builds

68

80 - Will cook in 'next'.

81 - cf. <ai-5vfY8D84UhsB4@pks.im>

82 - source: <pull.2151.v2.git.1781510039164.gitgitgadget@gmail.com>

69 + Build-fix for 32-bit Windows.

70 + source: <pull.2157.git.1782117847057.gitgitgadget@gmail.com>

71 +

72 +

73 +* ps/gitlab-ci-windows (2026-06-15) 1 commit

74 + (merged to 'next' on 2026-06-22 at 6d177c61ea)

75 + + gitlab-ci: migrate Windows builds away from Chocolatey

76 +

77 + Wean the Windows builds in GitLab CI procedure away from

78 + (unfortunately unreliable) Chocolatey to install dependencies.

79 + cf. <ajP5owy3r_GyuLqk@denethor>

80 + source: <20260615-b4-pks-gitlab-ci-drop-chocolatey-v1-1-51a6e7d5e388@pks.im>

81

82 --------------------------------------------------

85 -[New Topics]

83 +[Stalled]

84 +

85 +* jt/config-lock-timeout (2026-05-17) 1 commit

86 + - config: retry acquiring config.lock, configurable via core.configLockTimeout

87 +

88 + Configuration file locking now retries for a short period, avoiding

89 + failures when multiple processes attempt to update the configuration

90 + simultaneously.

91 +

92 + Waiting for response(s) to review comment(s) for too long, stalled.

93 + cf. <agrIrGwSMFlKTx9x@pks.im>

94 + source: <20260517132111.1014901-1-joerg@thalheim.io>

95 +

96 +

97 +* js/parseopt-subcommand-autocorrection (2026-04-27) 11 commits

98 + - SQUASH???

99 + - doc: document autocorrect API

100 + - parseopt: add tests for subcommand autocorrection

101 + - parseopt: enable subcommand autocorrection for git-remote and git-notes

102 + - parseopt: autocorrect mistyped subcommands

103 + - autocorrect: provide config resolution API

104 + - autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT

105 + - autocorrect: use mode and delay instead of magic numbers

106 + - help: move tty check for autocorrection to autocorrect.c

107 + - help: make autocorrect handling reusable

108 + - parseopt: extract subcommand handling from parse_options_step()

109 +

110 + The parse-options library learned to auto-correct misspelled

111 + subcommand names.

112 +

113 + Waiting for response(s) to review comment(s) for too long, stalled.

114 + cf. <xmqq33yzd9yf.fsf@gitster.g>

115 + cf. <SY0P300MB0801E50FCB7EB2F45CD15208CE042@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

116 + source: <SY0P300MB0801677A2A1E0FD38D06A841CE2A2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

117 +

118 +

119 +* cl/conditional-config-on-worktree-path (2026-05-24) 2 commits

120 + - config: add "worktree" and "worktree/i" includeIf conditions

121 + - config: refactor include_by_gitdir() into include_by_path()

122 +

123 + The [includeIf "condition"] conditional inclusion facility for

124 + configuration files has learned to use the location of worktree

125 + in its condition.

126 +

127 + Waiting for response(s) to review comment(s) for too long, stalled.

128 + cf. <xmqq8q97et9b.fsf@gitster.g>

129 + source: <20260525-includeif-worktree-v5-0-1efe525d025a@black-desk.cn>

130 +

131 +--------------------------------------------------

132 +[Cooking]

133

134 * kk/merge-base-exhaustion (2026-06-20) 6 commits

135 - Documentation/technical: add paint-down-to-common doc

@@ -112,16 +159,6 @@ Release tarballs are available at:

159 source: <c4c5ade901ff95b0f95939ea818870e4f3d59da1.1781971201.git.ben.knoble+github@gmail.com>

160

161

115 -* js/win32-localtime-r (2026-06-22) 1 commit

116 - (merged to 'next' on 2026-06-22 at 67d3fa726d)

117 - + win32: ensure that `localtime_r()` is declared even in i686 builds

118 -

119 - Build-fix for 32-bit Windows.

120 -

121 - Will merge to 'master'.

122 - source: <pull.2157.git.1782117847057.gitgitgadget@gmail.com>

123 -

124 -

162 * ps/connected-generic-promisor-checks (2026-06-22) 4 commits

163 - connected: search promisor objects generically

164 - odb/source-packed: support flags when iterating an object prefix

@@ -167,67 +204,17 @@ Release tarballs are available at:

204 Needs review.

205 source: <20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>

206

170 ---------------------------------------------------

171 -[Stalled]

172 -

173 -* jt/config-lock-timeout (2026-05-17) 1 commit

174 - - config: retry acquiring config.lock, configurable via core.configLockTimeout

175 -

176 - Configuration file locking now retries for a short period, avoiding

177 - failures when multiple processes attempt to update the configuration

178 - simultaneously.

179 -

180 - Waiting for response(s) to review comment(s) for too long, stalled.

181 - cf. <agrIrGwSMFlKTx9x@pks.im>

182 - source: <20260517132111.1014901-1-joerg@thalheim.io>

183 -

184 -

185 -* js/parseopt-subcommand-autocorrection (2026-04-27) 11 commits

186 - - SQUASH???

187 - - doc: document autocorrect API

188 - - parseopt: add tests for subcommand autocorrection

189 - - parseopt: enable subcommand autocorrection for git-remote and git-notes

190 - - parseopt: autocorrect mistyped subcommands

191 - - autocorrect: provide config resolution API

192 - - autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT

193 - - autocorrect: use mode and delay instead of magic numbers

194 - - help: move tty check for autocorrection to autocorrect.c

195 - - help: make autocorrect handling reusable

196 - - parseopt: extract subcommand handling from parse_options_step()

197 -

198 - The parse-options library learned to auto-correct misspelled

199 - subcommand names.

200 -

201 - Waiting for response(s) to review comment(s) for too long, stalled.

202 - cf. <xmqq33yzd9yf.fsf@gitster.g>

203 - cf. <SY0P300MB0801E50FCB7EB2F45CD15208CE042@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

204 - source: <SY0P300MB0801677A2A1E0FD38D06A841CE2A2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

205 -

206 -

207 -* cl/conditional-config-on-worktree-path (2026-05-24) 2 commits

208 - - config: add "worktree" and "worktree/i" includeIf conditions

209 - - config: refactor include_by_gitdir() into include_by_path()

210 -

211 - The [includeIf "condition"] conditional inclusion facility for

212 - configuration files has learned to use the location of worktree

213 - in its condition.

214 -

215 - Waiting for response(s) to review comment(s) for too long, stalled.

216 - cf. <xmqq8q97et9b.fsf@gitster.g>

217 - source: <20260525-includeif-worktree-v5-0-1efe525d025a@black-desk.cn>

218 -

219 ---------------------------------------------------

220 -[Cooking]

207

208 * jc/submittingpatches-design-critiques (2026-06-20) 1 commit

223 - - SubmittingPatches: address design critiques

209 + (merged to 'next' on 2026-06-22 at 7495b5f9d6)

210 + + SubmittingPatches: address design critiques

211

212 The documentation in SubmittingPatches has been updated to clarify how

213 patch contributors should respond to design and viability critiques,

214 and how the resolution of such critiques should be recorded in the

215 final commit messages.

216

230 - Will merge to 'next'.

217 + Will cook in 'next'.

218 cf. <ajjwYGWZ6hQWr600@pks.im>

219 source: <xmqqeci0g4mz.fsf@gitster.g>

220

@@ -245,18 +232,6 @@ Release tarballs are available at:

232 source: <cover.1782028813.git.wy@wyuan.org>

233

234

248 -* ps/gitlab-ci-windows (2026-06-15) 1 commit

249 - (merged to 'next' on 2026-06-22 at 6d177c61ea)

250 - + gitlab-ci: migrate Windows builds away from Chocolatey

251 -

252 - Wean the Windows builds in GitLab CI procedure away from

253 - (unfortunately unreliable) Chocolatey to install dependencies.

254 -

255 - Will merge to 'master'.

256 - cf. <ajP5owy3r_GyuLqk@denethor>

257 - source: <20260615-b4-pks-gitlab-ci-drop-chocolatey-v1-1-51a6e7d5e388@pks.im>

258 -

259 -

235 * ty/migrate-ignorecase (2026-06-19) 2 commits

236 - config: use repo_ignore_case() to access core.ignorecase

237 - environment: move ignore_case into repo_config_values

@@ -265,8 +240,8 @@ Release tarballs are available at:

240 core.ignorecase configuration) has been migrated into struct

241 repo_config_values to tie it to a specific repository instance.

242

268 - Waiting for response(s) to review comment(s).

269 - cf. <xmqqjyrr7ipf.fsf@gitster.g>

243 + Waiting for comments from Johannes.

244 + cf. <xmqqzf0mzc7j.fsf@gitster.g>

245 source: <20260619155152.642760-1-cat@malon.dev>

246

247

@@ -283,7 +258,7 @@ Release tarballs are available at:

258 like --stat, --check, -G, to the specified range:path.

259

260 Waiting for response(s) to review comment(s).

286 - cf. <xmqq8q8bpl03.fsf@gitster.g>

261 + cf. <CAC2QwmKEHb+LL4ZkQwq+Rw8eyDXzdBp_nxa_d+Ecx0K1icNqQA@mail.gmail.com>

262 source: <pull.2152.git.1781806593.gitgitgadget@gmail.com>

263

264

@@ -313,18 +288,6 @@ Release tarballs are available at:

288 source: <20260619-pks-t4216-drop-unused-prereq-v1-1-2ce0d7bea088@pks.im>

289

290

316 -* hn/macos-linker-warning (2026-06-19) 1 commit

317 - (merged to 'next' on 2026-06-22 at 0e7f024ab5)

318 - + config.mak.uname: avoid macOS dup-library warning

319 -

320 - Xcode 15 and later has a linker set to complain when the same library

321 - archive is listed twice on the command line. Squelch the annoyance.

322 -

323 - Will merge to 'master'.

324 - cf. <ajjspU7lJ01GgrBw@pks.im>

325 - source: <pull.2314.v3.git.git.1781901127385.gitgitgadget@gmail.com>

326 -

327 -

291 * mh/fetch-follow-remote-head-config (2026-06-19) 8 commits

292 (merged to 'next' on 2026-06-22 at 423079e1c8)

293 + fetch: fixup a misaligned comment

@@ -395,13 +358,14 @@ Release tarballs are available at:

358

359

360 * mv/log-follow-mergy (2026-06-21) 1 commit

398 - - log: improve --follow following renames for non-linear history

361 + (merged to 'next' on 2026-06-22 at f7e984a003)

362 + + log: improve --follow following renames for non-linear history

363

364 "git log --follow" has been updated to handle non-linear history, in

365 which the path being tracked gets renamed differently in multiple

366 history lines, better.

367

404 - Will merge to 'next'.

368 + Will cook in 'next'.

369 source: <ajjU4w2B0NlZffw1@collabora.com>

370

371

@@ -462,7 +426,8 @@ Release tarballs are available at:

426 into prio_queue itself, speeding up commit traversal workflows and

427 simplifying callers.

428

465 - Needs review.

429 + On hold, waiting for kk/prio-queue-get-put-fusion to land first.

430 + cf. <CAL71e4MYNiScZjTwkApjDAjRh2LM0_SP59h5HCTywV-Pua03tw@mail.gmail.com>

431 source: <pull.2140.v4.git.1780945851.gitgitgadget@gmail.com>

432

433

@@ -692,18 +657,19 @@ Release tarballs are available at:

657

658

659 * tb/pack-path-walk-bitmap-delta-islands (2026-06-21) 5 commits

695 - - pack-objects: support `--delta-islands` with `--path-walk`

696 - - pack-objects: extract `record_tree_depth()` helper

697 - - pack-objects: support reachability bitmaps with `--path-walk`

698 - - t/perf: drop p5311's lookup-table permutation

699 - - Merge branch 'ds/path-walk-filters' into tb/pack-path-walk-bitmap-delta-islands

660 + (merged to 'next' on 2026-06-22 at 59cf1663e7)

661 + + pack-objects: support `--delta-islands` with `--path-walk`

662 + + pack-objects: extract `record_tree_depth()` helper

663 + + pack-objects: support reachability bitmaps with `--path-walk`

664 + + t/perf: drop p5311's lookup-table permutation

665 + + Merge branch 'ds/path-walk-filters' into tb/pack-path-walk-bitmap-delta-islands

666

667 The pack-objects command now supports using reachability bitmaps and

668 delta-islands concurrently with the `--path-walk` option, allowing

669 faster packaging by falling back to path-walk when bitmaps cannot

670 fully satisfy the request.

671

706 - Will merge to 'next'.

672 + Will cook in 'next'.

673 cf. <xmqqwlvq1qyy.fsf@gitster.g>

674 source: <cover.1782082975.git.me@ttaylorr.com>

675

@@ -898,7 +864,8 @@ Release tarballs are available at:

864 "git checkout --track=..." learned to optionally fetch the branch

865 from the remote the new branch will work with.

866

901 - Needs review.

867 + Waiting for response(s) to review comment(s).

868 + cf. <12998c3a-ff69-4a98-9ed6-18aa0224e75e@gmail.com>

869 source: <pull.2281.v14.git.git.1781786652.gitgitgadget@gmail.com>

870

871

@@ -919,14 +886,15 @@ Release tarballs are available at:

886

887

888 * pw/status-rebase-todo (2026-06-22) 2 commits

922 - - status: improve rebase todo list parsing

923 - - sequencer: factor out parsing of todo commands

889 + (merged to 'next' on 2026-06-22 at a32de5bd17)

890 + + status: improve rebase todo list parsing

891 + + sequencer: factor out parsing of todo commands

892

893 The display of the rebase todo list in "git status" has been

894 improved to correctly abbreviate object IDs for more commands and

895 avoid misinterpreting refs as object IDs.

896

929 - Will merge to 'next'.

897 + Will cook in 'next'.

898 cf. <xmqqechy1o7p.fsf@gitster.g>

899 source: <cover.1782117361.git.phillip.wood@dunelm.org.uk>

900

What's cooking (2026/06 #09)