976f154ea2 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2025, #02; Tue, 8)

2 +Subject: What's cooking in git.git (Apr 2025, #03; Fri, 11)

3 X-master-at: 485f5f863615e670fd97ae40af744e14072cfe18

4 -X-next-at: 153de2bbd5a1ce082d4d036a9daca0f0100fe8a1

4 +X-next-at: 082f7c87e043e091852db09dfb249d68a17ac7a4

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

6

7 -What's cooking in git.git (Apr 2025, #02; Tue, 8)

7 +What's cooking in git.git (Apr 2025, #03; Fri, 11)

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

9

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

@@ -51,288 +51,122 @@ Release tarballs are available at:

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

52

53 --------------------------------------------------

54 -[Graduated to 'master']

54 +[New Topics]

55

56 -* aj/doc-restore-p-update (2025-03-18) 1 commit

57 - (merged to 'next' on 2025-03-24 at bdcfdc7f4e)

58 - + doc: restore: remove note on --patch w/ pathspecs

56 +* kn/bundle-dedup-optim (2025-04-08) 2 commits

57 + (merged to 'next' on 2025-04-11 at 082f7c87e0)

58 + + bundle: fix non-linear performance scaling with refs

59 + + t6020: test for duplicate refnames in bundle creation

60

60 - Stale description in "git restore -p" documentation has been

61 - updated.

62 - source: <pull.1504.v2.git.git.1685654097812.gitgitgadget@gmail.com>

61 + Optimize the code to dedup references recorded in a bundle file.

62

64 -

65 -* cc/lop-remote (2025-03-18) 4 commits

66 - (merged to 'next' on 2025-03-24 at 3b685ceef0)

67 - + promisor-remote: compare remote names case sensitively

68 - + promisor-remote: fix possible issue when no URL is advertised

69 - + promisor-remote: fix segfault when remote URL is missing

70 - + t5710: arrange to delete the client before cloning

71 -

72 - Bugfix in newly introduced large-object-promisor remote support.

73 - source: <20250318110008.656695-1-christian.couder@gmail.com>

74 -

75 -

76 -* dk/vimdiff-doc-fix (2025-03-25) 1 commit

77 - (merged to 'next' on 2025-03-29 at d0c7a36752)

78 - + vimdiff: clarify the sigil used for marking the buffer to save

79 -

80 - Doc update.

81 - source: <20250324205327.79627-1-ben.knoble+github@gmail.com>

82 -

83 -

84 -* dm/completion-remote-names-fix (2025-03-23) 2 commits

85 - (merged to 'next' on 2025-03-26 at b9460e20ae)

86 - + completion: fix bugs with slashes in remote names

87 - + completion: add helper to count path components

88 -

89 - The bash command line completion script (in contrib/) has been

90 - updated to cope with remote repository nicknames with slashes in

91 - them.

92 - source: <17274df2746d304db876ebd82ad8d932@mandelberg.org>

93 -

94 -

95 -* en/assert-wo-side-effects (2025-03-21) 3 commits

96 - (merged to 'next' on 2025-03-29 at de89bb3075)

97 - + treewide: replace assert() with ASSERT() in special cases

98 - + ci: add build checking for side-effects in assert() calls

99 - + git-compat-util: introduce ASSERT() macro

100 -

101 - Ensure what we write in assert() does not have side effects,

102 - and introduce ASSERT() macro to mark those that cannot be

103 - mechanically checked for lack of side effects.

104 - source: <pull.1881.v3.git.1742401378.gitgitgadget@gmail.com>

105 -

106 -

107 -* es/meson-build-skip-coccinelle (2025-03-25) 1 commit

108 - (merged to 'next' on 2025-03-29 at 748d830ce7)

109 - + meson: disable coccinelle configuration when building from a tarball

110 -

111 - Build fix.

112 - source: <20250325200920.198057-1-eschwartz@gentoo.org>

113 -

114 -

115 -* fr/vimdiff-layout-fixes (2025-03-25) 2 commits

116 - (merged to 'next' on 2025-03-29 at 367b2105c0)

117 - + mergetools: vimdiff: add tests for layout with REMOTE as the target

118 - + mergetools: vimdiff: fix layout where REMOTE is the target

119 -

120 - Layout configuration in vimdiff backend didn't work as advertised,

121 - which has been corrected.

122 - source: <20250325222311.400748-1-greenfoo@u92.eu>

63 + Will merge to 'master'.

64 + source: <20250408-488-generating-bundles-with-many-references-has-non-linear-performance-v2-0-0802fc36a23d@gmail.com>

65

66

125 -* ja/doc-branch-markup (2025-03-20) 2 commits

126 - (merged to 'next' on 2025-03-24 at ba6e1c7d0b)

127 - + doc: apply new format to git-branch man page

128 - + completion: take into account the formatting backticks for options

67 +* kn/meson-hdr-check (2025-04-08) 4 commits

68 + - meson: add support for 'headers-check'

69 + - meson: move headers definition from 'contrib/coccinelle'

70 + - coccinelle: meson: rename variables to be more specific

71 + - Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-check

72

130 - Doc mark-up updates.

131 - source: <pull.1880.v2.git.1742372183.gitgitgadget@gmail.com>

73 + Add an equivalent to "make hdr-check" target to meson based builds.

74

75 + Getting there.

76 + cf. <xmqqsemiuwhx.fsf@gitster.g>

77 + source: <20250408-505-wire-up-sparse-via-meson-v1-0-17476e5cea3f@gmail.com>

78

134 -* jc/name-rev-stdin (2025-03-12) 6 commits

135 - (merged to 'next' on 2025-03-24 at cfec2e409f)

136 - + name-rev: remove "--stdin" support

137 - + t6120: further modernize

138 - + t6120: avoid hiding "git" exit status

139 - + t: introduce WITH_BREAKING_CHANGES prerequisite

140 - + t: extend test_lazy_prereq

141 - + t: document test_lazy_prereq

79

143 - Using "git name-rev --stdin" as an example, improve the framework to

144 - prepare tests to pretend to be in the future where the breaking

145 - changes have already happened.

146 - source: <20250311212505.2920181-1-gitster@pobox.com>

80 +* ps/object-file-cleanup (2025-04-11) 10 commits

81 + - object-store: merge "object-store-ll.h" and "object-store.h"

82 + - object-store: remove global array of cached objects

83 + - object: split out functions relating to object store subsystem

84 + - object-file: split out functions relating to index subsystem

85 + - object-file: split up concerns of `HASH_*` flags

86 + - object-file: split out functions relating to object store subsystem

87 + - object-file: move `xmmap()` into "wrapper.c"

88 + - object-file: move `git_open_cloexec()` to "compat/open.c"

89 + - object-file: move `safe_create_leading_directories()` into "dir.c"

90 + - Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup

91 + (this branch uses ps/object-wo-the-repository.)

92

93 + Code clean-up.

94

149 -* jh/hash-init-fixes (2025-03-18) 1 commit

150 - (merged to 'next' on 2025-03-24 at 85b8299403)

151 - + index-pack, unpack-objects: restore missing ->init_fn

95 + Will merge to 'next'.

96 + source: <20250411-pks-split-object-file-v2-0-2bea0c9033ae@pks.im>

97

153 - An earlier code refactoring of the hash machinery missed a few

154 - required calls to init_fn.

155 - cf. <Z9rC0VCbh8Noaq4e@pks.im>

156 - source: <20250318111616.113941-1-hmz007@gmail.com>

98

99 +* ab/environment-clean-header (2025-04-09) 1 commit

100 + (merged to 'next' on 2025-04-09 at 845b92c7ef)

101 + + environment.h: remove unused variables

102

159 -* js/imap-send-peer-cert-verify (2025-03-25) 1 commit

160 - (merged to 'next' on 2025-03-26 at 69df4dd915)

161 - + imap-send: explicitly verify the peer certificate

103 + Code clean-up.

104

105 Will merge to 'master'.

164 - source: <pull.1886.git.1742819282360.gitgitgadget@gmail.com>

165 -

166 -

167 -* js/mingw-admins-are-special (2025-03-25) 2 commits

168 - (merged to 'next' on 2025-03-26 at dfcb9661a6)

169 - + test-tool path-utils: support debugging "dubious ownership" issues

170 - + mingw: special-case administrators even more

106 + source: <2c547567-2b72-476c-9fc5-71cac050fa15@gmail.com>

107

172 - "Dubious ownership" checks on Windows has been tightened up.

173 - source: <pull.1893.git.1742899110.gitgitgadget@gmail.com>

108

109 +* cj/refname-avail-check-optim-typofix (2025-04-09) 1 commit

110 + (merged to 'next' on 2025-04-09 at 95fe082872)

111 + + refs: fix duplicated word in comment

112

176 -* kn/ci-meson-check-build-docs-fix (2025-03-20) 1 commit

177 - (merged to 'next' on 2025-03-24 at 135ce9ce61)

178 - + ci/github: add missing 'CI_JOB_IMAGE' env variable

113 + Comment fix.

114

180 - GitHub Actions CI switched on a CI/CD variable that does not exist

181 - when choosing what packages to install etc., which has been

182 - corrected.

183 - source: <20250319163328.525284-1-karthik.188@gmail.com>

184 -

185 -

186 -* ms/reftable-block-writer-errors (2025-03-21) 3 commits

187 - (merged to 'next' on 2025-03-29 at 67fdddb622)

188 - + reftable: adapt write_object_record() to propagate block_writer_add() errors

189 - + reftable: adapt writer_add_record() to propagate block_writer_add() errors

190 - + reftable: propagate specific error codes in block_writer_add()

191 -

192 - Give more meaningful error return values from block writer layer of

193 - the reftable ref-API backend.

194 - cf. <Z9rnZzbEasyRbHIY@pks.im>

195 - source: <20250319152927.1263033-1-meetsoni3017@gmail.com>

196 -

197 -

198 -* ps/ci-meson-check-build-docs (2025-03-12) 1 commit

199 - (merged to 'next' on 2025-03-29 at 5aed226a96)

200 - + ci: perform build and smoke tests for Meson docs

201 -

202 - CI update.

203 - source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>

115 + Will merge to 'master'.

116 + source: <pull.1940.v2.git.git.1743857867327.gitgitgadget@gmail.com>

117

118

206 -* ps/reftable-sans-compat-util (2025-02-18) 18 commits

207 - (merged to 'next' on 2025-03-29 at 4e9fbae111)

208 - + Makefile: skip reftable library for Coccinelle

209 - + reftable: decouple from Git codebase by pulling in "compat/posix.h"

210 - + git-compat-util.h: split out POSIX-emulating bits

211 - + compat/mingw: split out POSIX-related bits

212 - + reftable/basics: introduce `REFTABLE_UNUSED` annotation

213 - + reftable/basics: stop using `SWAP()` macro

214 - + reftable/stack: stop using `sleep_millisec()`

215 - + reftable/system: introduce `reftable_rand()`

216 - + reftable/reader: stop using `ARRAY_SIZE()` macro

217 - + reftable/basics: provide wrappers for big endian conversion

218 - + reftable/basics: stop using `st_mult()` in array allocators

219 - + reftable: stop using `BUG()` in trivial cases

220 - + reftable/record: don't `BUG()` in `reftable_record_cmp()`

221 - + reftable/record: stop using `BUG()` in `reftable_record_init()`

222 - + reftable/record: stop using `COPY_ARRAY()`

223 - + reftable/blocksource: stop using `xmmap()`

224 - + reftable/stack: stop using `write_in_full()`

225 - + reftable/stack: stop using `read_in_full()`

226 - (this branch is used by ps/reftable-api-revamp and ps/reftable-windows-unlink-fix.)

119 +* dd/sparse-glibc-workaround (2025-04-09) 1 commit

120 + (merged to 'next' on 2025-04-09 at 14ee53c8e4)

121 + + sparse: ignore warning from new glibc headers

122

228 - Make the code in reftable library less reliant on the service

229 - routines it used to borrow from Git proper, to make it easier to

230 - use by external users of the library.

231 - cf. <Z-Y1YbE2EVqLZhGO@pks.im>

232 - source: <20250218-pks-reftable-drop-git-compat-util-v6-0-8c1f39fb4c02@pks.im>

123 + Squelch false-positive from sparse.

124

125 + Will merge to 'master'.

126 + source: <a667da3985a0fe943cc0ff6ee8513d731d75a299.1721171853.git.congdanhqx@gmail.com>

127

235 -* pw/build-breaking-changes-doc (2025-03-18) 1 commit

236 - (merged to 'next' on 2025-03-24 at 56efeea47e)

237 - + docs: add BreakingChanges to TECH_DOCS target

128

239 - A documentation page was left out from formatting and installation,

240 - which has been corrected.

241 - source: <pull.1921.git.git.1742308900290.gitgitgadget@gmail.com>

129 +* js/ci-github-update-ubuntu (2025-04-09) 1 commit

130 + (merged to 'next' on 2025-04-09 at fae10a2b5b)

131 + + ci: upgrade `sparse` to supported build agents

132

133 + Adjust to the deprecation of use of Ubuntu 20.04 GitHub Actions CI.

134

244 -* pw/doc-pack-refs-markup-fix (2025-03-18) 1 commit

245 - (merged to 'next' on 2025-03-24 at 3bcea36a83)

246 - + pack-refs doc: fix indentation for --exclude

135 + Will merge to 'master'.

136 + source: <77f82414-261c-d2bc-f911-ed3d4b06c86e@gmx.de>

137

248 - Doc markup fix.

249 - source: <pull.1920.git.git.1742308828163.gitgitgadget@gmail.com>

138

139 +* ps/refname-avail-check-optim (2025-04-09) 1 commit

140 + (merged to 'next' on 2025-04-09 at 0d35104147)

141 + + refs/packed: fix BUG when seeking refs with UTF-8 characters

142

252 -* rs/clear-commit-marks-simplify (2025-03-24) 1 commit

253 - (merged to 'next' on 2025-03-29 at 222799fc4e)

254 - + commit: move clear_commit_marks_many() loop body to clear_commit_marks()

143 + Incorrect sorting of refs with bytes with high-bit set on platforms

144 + with signed char led to a BUG, which has been corrected.

145

256 - Code clean-up.

257 - source: <80bfd7a9-904c-49d8-a367-ca268c096a9f@web.de>

258 -

259 -

260 -* ta/bulk-checkin-signed-compare-false-warning-fix (2025-03-25) 1 commit

261 - (merged to 'next' on 2025-03-29 at 6f33c692ce)

262 - + bulk-checkin: fix sign compare warnings

263 -

264 - Compiler warnings workaround.

265 - source: <20250324214703.7547-1-taahol@utu.fi>

266 -

267 -

268 -* tb/bitamp-typofix (2025-03-21) 1 commit

269 - (merged to 'next' on 2025-03-26 at f068ddb5bb)

270 - + pseudo-merge.h: fix a typo

271 -

272 - Typofix.

273 - source: <3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>

274 -

275 -

276 -* tb/combine-cruft-below-size (2025-03-21) 6 commits

277 - (merged to 'next' on 2025-03-24 at 699b83a925)

278 - + repack: begin combining cruft packs with `--combine-cruft-below-size`

279 - + repack: avoid combining cruft packs with `--max-cruft-size`

280 - + t/t7704-repack-cruft.sh: consolidate `write_blob()`

281 - + t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests

282 - + t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests

283 - + Merge branch 'tb/multi-cruft-pack-refresh-fix' into tb/combine-cruft-below-size

284 -

285 - "git repack" learned "--combine-cruft-below-size" option that

286 - controls how cruft-packs are combined.

287 - source: <cover.1742424671.git.me@ttaylorr.com>

288 -

289 -

290 -* tb/http-curl-keepalive (2025-03-21) 4 commits

291 - (merged to 'next' on 2025-03-29 at 4782cca658)

292 - + http.c: allow custom TCP keepalive behavior via config

293 - + http.c: inline `set_curl_keepalive()`

294 - + http.c: introduce `set_long_from_env()` for convenience

295 - + http.c: remove unnecessary casts to long

296 -

297 - TCP keepalive behaviour on http transports can now be configured by

298 - calling cURL library.

299 - cf. <CABPp-BEn+NfGu1c=ZWjwnFBJgmsxRVSq+Roin-KDQGqKPdDhCg@mail.gmail.com>

300 - source: <cover.1742423021.git.me@ttaylorr.com>

301 -

302 -

303 -* tb/incremental-midx-part-2 (2025-03-21) 14 commits

304 - (merged to 'next' on 2025-03-29 at 1db17d1a9b)

305 - + midx: implement writing incremental MIDX bitmaps

306 - + pack-bitmap.c: use `ewah_or_iterator` for type bitmap iterators

307 - + pack-bitmap.c: keep track of each layer's type bitmaps

308 - + ewah: implement `struct ewah_or_iterator`

309 - + pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs

310 - + pack-bitmap.c: compute disk-usage with incremental MIDXs

311 - + pack-bitmap.c: teach `rev-list --test-bitmap` about incremental MIDXs

312 - + pack-bitmap.c: support bitmap pack-reuse with incremental MIDXs

313 - + pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs

314 - + pack-bitmap.c: teach `bitmap_for_commit()` about incremental MIDXs

315 - + pack-bitmap.c: open and store incremental bitmap layers

316 - + pack-revindex: prepare for incremental MIDX bitmaps

317 - + Documentation: describe incremental MIDX bitmaps

318 - + Documentation: remove a "future work" item from the MIDX docs

319 - (this branch is used by ps/cat-file-filter-batch.)

320 -

321 - Incrementally updating multi-pack index files.

322 - source: <cover.1742493373.git.me@ttaylorr.com>

323 -

324 -

325 -* tb/refspec-fetch-cleanup (2025-03-21) 5 commits

326 - (merged to 'next' on 2025-03-29 at 6cf1359bf4)

327 - + refspec: replace `refspec_item_init()` with fetch/push variants

328 - + refspec: remove refspec_item_init_or_die()

329 - + refspec: replace `refspec_init()` with fetch/push variants

330 - + refspec: treat 'fetch' as a Boolean value

331 - + Merge branch 'jk/fetch-ref-prefix-cleanup' into tb/refspec-fetch-cleanup

146 + Will merge to 'master'.

147 + cf. <20250404205740.GA780449@coredump.intra.peff.net>

148 + source: <20250404-b4-pks-packed-backend-seek-with-utf8-v1-1-6ceb694e3bd7@pks.im>

149 +

150 +

151 +* rj/build-tweaks (2025-04-09) 13 commits

152 + - config.mak.uname: set CSPRNG_METHOD to getrandom on Linux

153 + - config.mak.uname: add arc4random to the cygwin build

154 + - config.mak.uname: add sysinfo() configuration for cygwin

155 + - builtin/gc.c: correct RAM calculation when using sysinfo

156 + - config.mak.uname: add clock_gettime() to the cygwin build

157 + - config.mak.uname: add HAVE_GETDELIM to the cygwin section

158 + - config.mak.uname: only set NO_REGEX on cygwin for v1.7

159 + - config.mak.uname: add a note about NO_STRLCPY for Linux

160 + - Makefile: remove NEEDS_LIBRT build variable

161 + - meson.build: set default help format to html on windows

162 + - meson.build: only set build variables for non-default values

163 + - Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set

164 + - meson.build: remove -DCURL_DISABLE_TYPECHECK

165 +

166 + Various build tweaks, including CSPRNG selection on some platforms.

167

333 - Code clean-up.

334 - cf. <CABPp-BE6JmiXB+pUL1Z4ewVDbG2RBxCdA2m5-WTYtoKMTtu_Xw@mail.gmail.com>

335 - source: <cover.1742338207.git.me@ttaylorr.com>

168 + Comments?

169 + source: <cover.1743859985.git.ramsay@ramsayjones.plus.com>

170

171 --------------------------------------------------

172 [Cooking]

@@ -377,10 +211,12 @@ Release tarballs are available at:

211 - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>

212 - rebase -r: do create merge commit after empty resolution

213

380 - A few fixes around "git status" while "git rebase" is running.

214 + A few fixes around "git status" while "git rebase" is running,

215 + plus a corner case bug fix for "git rebase -r".

216

382 - Comments? It probably deserves a clarifying reroll.

217 + Expecting a (small and hopefully final) clarifying reroll.

218 cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>

219 + cf. <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>

220 source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>

221

222

@@ -476,21 +312,24 @@ Release tarballs are available at:

312

313

314 * kn/blame-porcelain-unblamable (2025-04-07) 1 commit

479 - - blame: print unblamable and ignored commits in porcelain mode

315 + (merged to 'next' on 2025-04-09 at 971ba23ba0)

316 + + blame: print unblamable and ignored commits in porcelain mode

317

318 "git blame --porcelain" mode now talks about unblamable lines and

319 lines that are blamed to an ignored commit.

320

484 - Will merge to 'next'.

321 + Will merge to 'master'.

322 source: <20250403160326.120124-1-karthik.188@gmail.com>

323

324

488 -* ua/update-update-server-info (2025-03-29) 1 commit

489 - - builtin/update-server-info: remove unnecessary if statement

325 +* ua/update-update-server-info (2025-04-08) 1 commit

326 + (merged to 'next' on 2025-04-09 at f0d47e97b5)

327 + + builtin/update-server-info: remove unnecessary if statement

328

491 - Expecting a (hopefully minor and final) reroll.

492 - cf. <xmqqa58snf9c.fsf@gitster.g>

493 - source: <20250329120327.105925-2-usmanakinyemi202@gmail.com>

329 + Code simplification.

330 +

331 + Will merge to 'master'.

332 + source: <20250407195850.299348-2-usmanakinyemi202@gmail.com>

333

334

335 * ab/pathspec-sign-compare-workaround (2025-04-01) 1 commit

@@ -514,19 +353,22 @@ Release tarballs are available at:

353 source: <Z-sO9gcWAi_xh0tI@tapette.crustytoothpaste.net>

354

355

517 -* en/merge-recursive-debug (2025-04-07) 8 commits

518 - - builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

519 - - tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

520 - - merge-recursive.[ch]: thoroughly debug these

521 - - merge, sequencer: switch recursive merges over to ort

522 - - sequencer: switch non-recursive merges over to ort

523 - - merge-ort: enable diff-algorithms other than histogram

524 - - builtin/merge-recursive: switch to using merge_ort_generic()

525 - - checkout: replace merge_trees() with merge_ort_nonrecursive()

356 +* en/merge-recursive-debug (2025-04-08) 8 commits

357 + (merged to 'next' on 2025-04-09 at 555be94c73)

358 + + builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

359 + + tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

360 + + merge-recursive.[ch]: thoroughly debug these

361 + + merge, sequencer: switch recursive merges over to ort

362 + + sequencer: switch non-recursive merges over to ort

363 + + merge-ort: enable diff-algorithms other than histogram

364 + + builtin/merge-recursive: switch to using merge_ort_generic()

365 + + checkout: replace merge_trees() with merge_ort_nonrecursive()

366

527 - Expecting a reroll.

528 - cf. <CABPp-BGN2JCt9BJ0wQqtgNLhD6Qf19PMzYWpjgpJ6O2OcyRCXg@mail.gmail.com>

529 - source: <pull.1898.v2.git.1743891374.gitgitgadget@gmail.com>

367 + Remove remnants of the recursive merge strategy backend, which was

368 + superseded by the ort merge strategy.

369 +

370 + Will merge to 'master'.

371 + source: <pull.1898.v3.git.1744127322.gitgitgadget@gmail.com>

372

373

374 * ja/doc-reset-mv-rm-markup-updates (2025-04-01) 5 commits

@@ -675,7 +517,9 @@ Release tarballs are available at:

517 source: <20250320-b4-pks-mingw-lockfile-flake-v2-0-a84c90cfc6c2@pks.im>

518

519

678 -* jk/fetch-follow-remote-head-fix (2025-03-18) 3 commits

520 +* jk/fetch-follow-remote-head-fix (2025-04-09) 4 commits

521 + (merged to 'next' on 2025-04-09 at 3071fce577)

522 + + fetch: make set_head() call easier to read

523 (merged to 'next' on 2025-04-07 at ba5ac342a5)

524 + fetch: don't ask for remote HEAD if followRemoteHEAD is "never"

525 + fetch: only respect followRemoteHEAD with configured refspecs

@@ -688,6 +532,7 @@ Release tarballs are available at:

532 Will merge to 'master'.

533 cf. <Z9n7myvpnDOWFWqt@nand.local>

534 source: <20250318053905.GA2051217@coredump.intra.peff.net>

535 + source: <20250404085812.GA772404@coredump.intra.peff.net>

536

537

538 * sc/bundle-uri-use-all-refs-in-bundle (2025-03-18) 2 commits

@@ -813,6 +658,7 @@ Release tarballs are available at:

658 + pack-write: stop depending on `the_repository` and `the_hash_algo`

659 + object: stop depending on `the_repository`

660 + csum-file: stop depending on `the_repository`

661 + (this branch is used by ps/object-file-cleanup.)

662

663 The object layer has been updated to take an explicit repository

664 instance as a parameter in more code paths.

@@ -902,55 +748,3 @@ Release tarballs are available at:

748 Expecting a reroll.

749 cf. <CAN2LT1Cc-UaUpabqcGascicR3nk6ZdFythamKje33Orhy5WoNA@mail.gmail.com>

750 source: <20250221190451.12536-1-eric.peijian@gmail.com>

905 -

906 ---------------------------------------------------

907 -[Discarded]

908 -

909 -* jc/ci-meson-check-build-docs-fix (2025-03-14) 1 commit

910 - . install meson for Documentation job

911 - (this branch uses ps/ci-meson-check-build-docs.)

912 -

913 - The documentation CI job tries to build test documentation pages

914 - with both make- and meson-based build procedures, but somehow

915 - forgot to install meson in the Ci environment, which has been

916 - corrected.

917 -

918 - Discarded. kn/ci-meson-check-build-docs-fix gives us the right fix.

919 - cf. <xmqqmsdi49h8.fsf_-_@gitster.g>

920 - cf. <CAOLa=ZRODjYfDXQ8m+hDosV7RBGDWeehzSvsR-+-HCmbS+tAcQ@mail.gmail.com>

921 - source: <20250314184130.GA578421@coredump.intra.peff.net>

922 -

923 -

924 -* js/libgit-cargo-package (2025-03-22) 5 commits

925 - . libgit-{sys,rs}: add license and description fields

926 - . libgit-sys: exclude unnecessary directories in git-src

927 - . libgit-sys: parallelize build with Cargo's jobserver

928 - . libgit-sys: add symlink to git repo root and build out of tree

929 - . libgitpub: move to separate contrib/ directory

930 -

931 - Breaks Windows CI job with "../.." symbolic link in the source.

932 - Retracted for now.

933 - cf. <xnjgoym6makh7q64sp5efvkmcubslklkjeidja45rtl2wjm4jd@xfww2a52hj34>

934 - source: <cover.1742594960.git.steadmon@google.com>

935 -

936 -

937 -* sj/meson-test-environ-fix (2025-03-14) 1 commit

938 - . meson: use test_environment conditionally.

939 -

940 - meson-based build procedure was overly aggressive in using test

941 - environment in two contrib/ directories, which was corrected.

942 -

943 - Superseded by ps/misc-build-fixes.

944 - source: <3d127f293818f935efdb9ca7bb556e6a8f233ef7.1741975557.git.sam@gentoo.org>

945 -

946 -

947 -* jc/doc-attr-tree (2024-12-14) 1 commit

948 - . doc: give attr.tree a bit more visibility

949 -

950 - Make sure that "git --attr-source=X", GIT_ATTR_SOURCE, and

951 - attr.tree configuration variables appear at the same places in the

952 - documentation.

953 -

954 - Discarded.

955 - cf. <20241216111112.GA2201417@coredump.intra.peff.net>

956 - source: <xmqq5xnladwi.fsf@gitster.g>

What's cooking (2025/04 #03)