e834cad326 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

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

3 X-master-at: 94f057755b7941b321fd11fec1b2e3ca5313a4e0

4 -X-next-at: 6539524ca2a07762a89180718112132867e16309

4 +X-next-at: 4f69b47b940100b02630f745a52f9d9850f122b2

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

6

7 -What's cooking in git.git (Apr 2026, #07)

7 +What's cooking in git.git (Apr 2026, #08)

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

9

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

@@ -19,11 +19,9 @@ arise).

19

20 Git 2.54 has been released, and the tip of 'next' has acquired a

21 handful more topics, but no update to 'master' yet to kick off the

22 -new cycle has happened (yet). I will go offline for a couple of

23 -weeks starting this evening. There is no designated interim

24 -maintainer this time, but I trust that the community can self

25 -organize if the shape of the release and the tree turns out to be

26 -super bad ;-).

22 +new cycle has happened (yet). I am still mostly offline for a

23 +couple of weeks, but just had a chance to pick up updates to a

24 +handful of topics.

25

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

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

@@ -56,6 +54,70 @@ Release tarballs are available at:

54 --------------------------------------------------

55 [New Topics]

56

57 +* en/ort-cached-rename-with-trivial-resolution (2026-04-20) 1 commit

58 + - merge-ort: handle cached rename & trivial resolution interaction better

59 +

60 + "ort" merge backend improvements.

61 +

62 + Will merge to 'next'.

63 + source: <pull.2095.git.1776724214171.gitgitgadget@gmail.com>

64 +

65 +

66 +* en/ort-harden-against-corrupt-trees (2026-04-20) 5 commits

67 + - cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts

68 + - merge-ort: abort merge when trees have duplicate entries

69 + - merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()

70 + - merge-ort: drop unnecessary show_all_errors from collect_merge_info()

71 + - merge-ort: propagate callback errors from traverse_trees_wrapper()

72 +

73 + "ort" merge backend handles merging corrupt trees better by

74 + aborting when it should.

75 +

76 + Needs review.

77 + source: <pull.2096.git.1776731171.gitgitgadget@gmail.com>

78 +

79 +

80 +* jk/revert-aa-reap-transport-child-processes (2026-04-22) 1 commit

81 + - Revert "transport-helper, connect: use clean_on_exit to reap children on abnormal exit"

82 +

83 + Revert a recent change that introduced a regression to help mksh users.

84 +

85 + Will merge to 'next'.

86 + source: <20260422230020.GA1839627@coredump.intra.peff.net>

87 +

88 +

89 +* js/ci-github-actions-update (2026-04-21) 4 commits

90 + - ci: bump actions/checkout from v5 to v6

91 + - ci: bump actions/github-script from v8 to v9

92 + - ci: bump actions/{upload,download}-artifact to v7 and v8

93 + - ci: bump microsoft/setup-msbuild from v2 to v3

94 +

95 + Update various GitHub Actions versions.

96 +

97 + Will merge to 'next'.

98 + source: <pull.2097.git.1776775319.gitgitgadget@gmail.com>

99 +

100 +

101 +* mf/format-patch-cover-letter-format-docfix (2026-04-22) 1 commit

102 + - Fix docs for format.commitListFormat

103 +

104 + Docfix.

105 +

106 + Will merge to 'next'.

107 + source: <576d29f15e016889e02c253713656cd8cbf1f04c.1776894255.git.mroik@delayed.space>

108 +

109 +

110 +* sg/t6112-unwanted-tilde-expansion-fix (2026-04-21) 1 commit

111 + - t6112: avoid tilde expansion

112 +

113 + Test fix.

114 +

115 + Will merge to 'next'?

116 + source: <20260421192132.51172-1-szeder.dev@gmail.com>

117 +

118 +--------------------------------------------------

119 +[Cooking]

120 +

121 * pw/status-rebase-todo (2026-04-20) 2 commits

122 - status: improve rebase todo list parsing

123 - sequencer: factor out parsing of todo commands

@@ -67,8 +129,6 @@ Release tarballs are available at:

129 Needs review.

130 source: <cover.1776697483.git.phillip.wood@dunelm.org.uk>

131

70 ---------------------------------------------------

71 -[Cooking]

132

133 * sb/userdiff-lisp-family (2026-04-14) 2 commits

134 (merged to 'next' on 2026-04-20 at 5897c04899)

@@ -82,20 +142,21 @@ Release tarballs are available at:

142 source: <pull.2000.v4.git.1776220063.gitgitgadget@gmail.com>

143

144

85 -* ss/t7004-unhide-git-failures (2026-04-14) 3 commits

145 +* ss/t7004-unhide-git-failures (2026-04-20) 3 commits

146 - t7004: avoid subshells to capture git exit codes

147 - t7004: dynamically grab expected state in tests

88 - - t7004: drop hardcoded tag count in invalid name test

148 + - t7004: drop hardcoded tag count for state verification

149

150 Test clean-up.

151

92 - Expecting a (hopefully trivial) reroll?

93 - cf. <aeXTcZ7K9a6kUIbk@pks.im>

94 - source: <20260414141828.27576-1-r.siddharth.shrimali@gmail.com>

152 + Will merge to 'next'.

153 + cf. <aecNc-BNwaqFlg5c@pks.im>

154 + source: <20260421053334.5414-1-r.siddharth.shrimali@gmail.com>

155

156

97 -* tb/pseudo-merge-bugfixes (2026-04-13) 8 commits

157 +* tb/pseudo-merge-bugfixes (2026-04-21) 9 commits

158 - pack-bitmap: prevent pattern leak on pseudo-merge re-assignment

159 + - Documentation: fix broken `sampleRate` in gitpacking(7)

160 - pack-bitmap: reject pseudo-merge "sampleRate" of 0

161 - pack-bitmap: parse commits in `find_pseudo_merge_group_for_ref()`

162 - pack-bitmap: fix pseudo-merge lookup for shared commits

@@ -104,15 +165,17 @@ Release tarballs are available at:

165 - t5333: demonstrate various pseudo-merge bugs

166 - t/helper: add 'test-tool bitmap write' subcommand

167

107 - Expecting a reroll.

108 - cf. <ad60PJ/pM/wG3krQ@nand.local>

109 - source: <cover.1776124588.git.me@ttaylorr.com>

168 + Fixes many bugs in pseudo-merge code.

169

170 + Expecting (hopefully minor and final) reroll.

171 + cf. <CABPp-BGkfavqezk2SV3+K6iF8MLm8j_=ijHiPDLmv_U_o_Ykgg@mail.gmail.com>

172 + source: <cover.1776801694.git.me@ttaylorr.com>

173

112 -* ds/fetch-negotiation-options (2026-04-15) 7 commits

174 +

175 +* ds/fetch-negotiation-options (2026-04-22) 7 commits

176 - send-pack: pass negotiation config in push

114 - - remote: add negotiationRequire config as default for --negotiation-require

115 - - fetch: add --negotiation-require option for negotiation

177 + - remote: add remote.*.negotiationInclude config

178 + - fetch: add --negotiation-include option for negotiation

179 - remote: add remote.*.negotiationRestrict config

180 - transport: rename negotiation_tips

181 - fetch: add --negotiation-restrict option

@@ -123,7 +186,7 @@ Release tarballs are available at:

186 restrict negotiation to a specific set of refs.

187

188 Needs review.

126 - source: <pull.2085.v2.git.1776266066.gitgitgadget@gmail.com>

189 + source: <pull.2085.v3.git.1776871546.gitgitgadget@gmail.com>

190

191

192 * en/backfill-fixes-and-edges (2026-04-15) 3 commits

@@ -233,26 +296,27 @@ Release tarballs are available at:

296 source: <xmqqzf3aofdj.fsf_-_@gitster.g>

297

298

236 -* ps/test-set-e-clean (2026-04-20) 12 commits

237 - - t: detect errors outside of test cases

238 - - t9902: fix use of `read` with `set -e`

239 - - t6002: fix use of `expr` with `set -e`

240 - - t1301: don't fail in case setfacl(1) doesn't exist or fails

241 - - t0008: silence error in subshell when using `grep -v`

242 - - t: prepare `test_when_finished ()`/`test_atexit()` for `set -e`

243 - - t: prepare execution of potentially failing commands for `set -e`

244 - - t: prepare conditional test execution for `set -e`

245 - - t: prepare `git config --unset` calls for `set -e`

246 - - t: prepare `stop_git_daemon ()` for `set -e`

247 - - t: prepare `test_must_fail ()` for `set -e`

248 - - t: prepare `test_match_signal ()` calls for `set -e`

299 +* ps/test-set-e-clean (2026-04-21) 12 commits

300 + (merged to 'next' on 2026-04-23 at 4f69b47b94)

301 + + t: detect errors outside of test cases

302 + + t9902: fix use of `read` with `set -e`

303 + + t6002: fix use of `expr` with `set -e`

304 + + t1301: don't fail in case setfacl(1) doesn't exist or fails

305 + + t0008: silence error in subshell when using `grep -v`

306 + + t: prepare `test_when_finished ()`/`test_atexit()` for `set -e`

307 + + t: prepare execution of potentially failing commands for `set -e`

308 + + t: prepare conditional test execution for `set -e`

309 + + t: prepare `git config --unset` calls for `set -e`

310 + + t: prepare `stop_git_daemon ()` for `set -e`

311 + + t: prepare `test_must_fail ()` for `set -e`

312 + + t: prepare `test_match_signal ()` calls for `set -e`

313

314 The test suite harness and many individual test scripts have been

315 updated to work correctly when 'set -e' is in effect, which helps

316 detect misspelled test commands.

317

254 - Will merge to 'next'.

255 - source: <20260420-b4-pks-tests-with-set-e-v5-0-7d3d68292f6b@pks.im>

318 + Will merge to 'master'.

319 + source: <20260421-b4-pks-tests-with-set-e-v6-0-26330e3061ab@pks.im>

320

321

322 * js/adjust-tests-to-explicitly-access-bare-repo (2026-04-02) 17 commits

@@ -296,15 +360,16 @@ Release tarballs are available at:

360

361

362 * bc/rust-by-default (2026-04-09) 4 commits

299 - - Enable Rust by default

300 - - Linux: link against libdl

301 - - ci: install cargo on Alpine

302 - - docs: update version with default Rust support

363 + (merged to 'next' on 2026-04-23 at fb9310bfae)

364 + + Enable Rust by default

365 + + Linux: link against libdl

366 + + ci: install cargo on Alpine

367 + + docs: update version with default Rust support

368

369 Rust support is enabled by default (but still allows opting out) in

370 some future version of Git.

371

307 - Will merge to 'next'.

372 + Will merge to 'master'.

373 source: <20260409224434.1861422-1-sandals@crustytoothpaste.net>

374

375

@@ -581,7 +646,7 @@ Release tarballs are available at:

646 source: <V2_CV_name-rev_--format.51b@msgid.xyz>

647

648

584 -* js/parseopt-subcommand-autocorrection (2026-03-16) 10 commits

649 +* js/parseopt-subcommand-autocorrection (2026-04-22) 10 commits

650 - doc: document autocorrect API

651 - parseopt: add tests for subcommand autocorrection

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

@@ -596,9 +661,8 @@ Release tarballs are available at:

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

662 subcommand names.

663

599 - Expecting review responses.

600 - cf. <xmqqse9zo93p.fsf@gitster.g>

601 - source: <SY0P300MB080186A23FB9582AD793F0D1CE40A@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

664 + Comments?

665 + source: <SY0P300MB0801AE56F740AD087D22B35ACE2D2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

666

667

668 * ab/clone-default-object-filter (2026-03-14) 1 commit

What's cooking (2026/04 #08)