f36d08d72e · matheusbsbs/matheus-bagliano

@@ -163,7 +163,6 @@ Performance, Internal Implementation, Development Support etc.

163 * We have been trying out a few language features outside c89; the

164 coding guidelines document did not talk about them and instead had

165 a blanket ban against them.

166 - (merge cc0c42975a jc/post-c89-rules-doc later to maint).

166

167 * A test helper has been introduced to optimize preparation of test

168 repositories with many simple commits, and a handful of test

@@ -177,16 +176,13 @@ Fixes since v2.22

176 ought to be relative to the directory "git init" gets invoked in,

177 but it instead was made relative to the repository, which has been

178 corrected.

180 - (merge e1df7fe43f nd/init-relative-template-fix later to maint).

179

180 * "git worktree add" used to fail when another worktree connected to

181 the same repository was corrupt, which has been corrected.

184 - (merge 105df73e71 nd/corrupt-worktrees later to maint).

182

183 * The ownership rule for the file descriptor to fast-import remote

184 backend was mixed up, leading to unrelated file descriptor getting

185 closed, which has been fixed.

189 - (merge 3203566a71 mh/import-transport-fd-fix later to maint).

186

187 * A "merge -c" instruction during "git rebase --rebase-merges" should

188 give the user a chance to edit the log message, even when there is

@@ -195,82 +191,65 @@ Fixes since v2.22

191 corrected.

192

193 * Code cleanup and futureproof.

198 - (merge 31f5256c82 ds/object-info-for-prefetch-fix later to maint).

194

195 * More parameter validation.

201 - (merge de99eb0c24 es/grep-require-name-when-needed later to maint).

196

197 * "git update-server-info" used to leave stale packfiles in its

198 output, which has been corrected.

205 - (merge e941c48d49 ew/server-info-remove-crufts later to maint).

199

200 * The server side support for "git fetch" used to show incorrect

201 value for the HEAD symbolic ref when the namespace feature is in

202 use, which has been corrected.

210 - (merge 533e088250 jk/HEAD-symref-in-xfer-namespaces later to maint).

203

204 * "git am -i --resolved" segfaulted after trying to see a commit as

205 if it were a tree, which has been corrected.

214 - (merge 7663e438c5 jk/am-i-resolved-fix later to maint).

206

207 * "git bundle verify" needs to see if prerequisite objects exist in

208 the receiving repository, but the command did not check if we are

209 in a repository upfront, which has been corrected.

219 - (merge 3bbbe467f2 js/bundle-verify-require-object-store later to maint).

210

211 * "git merge --squash" is designed to update the working tree and the

212 index without creating the commit, and this cannot be countermanded

213 by adding the "--commit" option; the command now refuses to work

214 when both options are given.

225 - (merge 1d14d0c994 vv/merge-squash-with-explicit-commit later to maint).

215

216 * The data collected by fsmonitor was not properly written back to

217 the on-disk index file, breaking t7519 tests occasionally, which

218 has been corrected.

230 - (merge b5a8169752 js/fsmonitor-unflake later to maint).

219

220 * Update to Unicode 12.1 width table.

233 - (merge 5817f9caa3 bb/unicode-12.1-reiwa later to maint).

221

222 * The command line to invoke a "git cat-file" command from inside

223 "git p4" was not properly quoted to protect a caret and running a

224 broken command on Windows, which has been corrected.

238 - (merge c3f2358de3 mm/p4-unshelve-windows-fix later to maint).

225

226 * "git request-pull" learned to warn when the ref we ask them to pull

227 from in the local repository and in the published repository are

228 different.

243 - (merge 0454220d66 pb/request-pull-verify-remote-ref later to maint).

229

230 * When creating a partial clone, the object filtering criteria is

231 recorded for the origin of the clone, but this incorrectly used a

232 hardcoded name "origin" to name that remote; it has been corrected

233 to honor the "--origin <name>" option.

249 - (merge 1c4a9f9114 xl/record-partial-clone-origin later to maint).

234

235 * "git fetch" into a lazy clone forgot to fetch base objects that are

236 necessary to complete delta in a thin packfile, which has been

237 corrected.

254 - (merge 810e19322d jt/partial-clone-missing-ref-delta-base later to maint).

238

239 * The filter_data used in the list-objects-filter (which manages a

240 lazily sparse clone repository) did not use the dynamic array API

241 correctly---'nr' is supposed to point at one past the last element

242 of the array in use. This has been corrected.

260 - (merge 7140600e2e md/list-objects-filter-memfix later to maint).

243

244 * The description about slashes in gitignore patterns (used to

245 indicate things like "anchored to this level only" and "only

246 matches directories") has been revamped.

265 - (merge 1a58bad014 an/ignore-doc-update later to maint).

247

248 * The URL decoding code has been updated to avoid going past the end

249 of the string while parsing %-<hex>-<hex> sequence.

269 - (merge d37dc239a4 md/url-parse-harden later to maint).

250

251 * The list of for-each like macros used by clang-format has been

252 updated.

273 - (merge fc7e03aace mo/clang-format-for-each-update later to maint).

253

254 * "git branch --list" learned to show branches that are checked out

255 in other worktrees connected to the same repository prefixed with

@@ -280,48 +259,38 @@ Fixes since v2.22

259

260 * Code restructuring during 2.20 period broke fetching tags via

261 "import" based transports.

283 - (merge f80d922355 fc/fetch-with-import-fix later to maint).

262

263 * The commit-graph file is now part of the "files that the runtime

264 may keep open file descriptors on, all of which would need to be

265 closed when done with the object store", and the file descriptor to

266 an existing commit-graph file now is closed before "gc" finalizes a

267 new instance to replace it.

290 - (merge 2d511cfc0b ds/close-object-store later to maint).

268

269 * "git checkout -p" needs to selectively apply a patch in reverse,

270 which did not work well.

294 - (merge 2bd69b9024 pw/add-p-recount later to maint).

271

272 * Code clean-up to avoid signed integer wraparounds during binary search.

297 - (merge 568a05c5ec rs/avoid-overflow-in-midpoint-computation later to maint).

273

274 * "git interpret-trailers" always treated '#' as the comment

275 character, regardless of core.commentChar setting, which has been

276 corrected.

302 - (merge 29c83fc23f jk/trailers-use-config later to maint).

277

278 * "git stash show 23" used to work, but no more after getting

279 rewritten in C; this regression has been corrected.

306 - (merge 63b50c8ffe tg/stash-ref-by-index-fix later to maint).

280

281 * "git rebase --abort" used to leave refs/rewritten/ when concluding

282 "git rebase -r", which has been corrected.

310 - (merge d559f502c5 pw/rebase-abort-clean-rewritten later to maint).

283

284 * An incorrect list of options was cached after command line

285 completion failed (e.g. trying to complete a command that requires

286 a repository outside one), which has been corrected.

315 - (merge 69702523af nd/completion-no-cache-failure later to maint).

287

288 * The code to parse scaled numbers out of configuration files has

289 been made more robust and also easier to follow.

319 - (merge 39c575c969 rs/config-unit-parsing later to maint).

290

291 * The codepath to compute delta islands used to spew progress output

292 without giving the callers any way to squelch it, which has been

293 fixed.

324 - (merge bdbdf42f8a jk/delta-islands-progress-fix later to maint).

294

295 * Protocol capabilities that go over wire should never be translated,

296 but it was incorrectly marked for translation, which has been

@@ -330,23 +299,19 @@ Fixes since v2.22

299

300 * Use "Erase in Line" CSI sequence that is already used in the editor

301 support to clear cruft in the progress output.

333 - (merge 5b12e3123b sg/rebase-progress later to maint).

302

303 * "git submodule foreach" did not protect command line options passed

304 to the command to be run in each submodule correctly, when the

305 "--recursive" option was in use.

338 - (merge 30db18b148 ms/submodule-foreach-fix later to maint).

306

307 * The configuration variable rebase.rescheduleFailedExec should be

308 effective only while running an interactive rebase and should not

309 affect anything when running an non-interactive one, which was not

310 the case. This has been corrected.

344 - (merge 906b63942a js/rebase-reschedule-applies-only-to-interactive later to maint).

311

312 * The "git clone" documentation refers to command line options in its

313 description in the short form; they have been replaced with long

314 forms to make them more recognisable.

349 - (merge bfc8c84ed5 qn/clone-doc-use-long-form later to maint).

315

316 * Generation of pack bitmaps are now disabled when .keep files exist,

317 as these are mutually exclusive features.

@@ -355,28 +320,23 @@ Fixes since v2.22

320 * "git rm" to resolve a conflicted path leaked an internal message

321 "needs merge" before actually removing the path, which was

322 confusing. This has been corrected.

358 - (merge b2b1f615ce jc/denoise-rm-to-resolve later to maint).

323

324 * "git stash --keep-index" did not work correctly on paths that have

325 been removed, which has been fixed.

326 (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).

327

328 * Window 7 update ;-)

365 - (merge eb7c786314 js/mingw-spawn-with-spaces-in-path later to maint).

329

330 * A codepath that reads from GPG for signed object verification read

331 past the end of allocated buffer, which has been fixed.

369 - (merge 64c45dc72e sr/gpg-interface-stop-at-the-end later to maint).

332

333 * "git clean" silently skipped a path when it cannot lstat() it; now

334 it gives a warning.

373 - (merge b09364c47a js/clean-report-too-long-a-path later to maint).

335

336 * "git push --atomic" that goes over the transport-helper (namely,

337 the smart http transport) failed to prevent refs to be pushed when

338 it can locally tell that one of the ref update will fail without

339 having to consult the other end, which has been corrected.

379 - (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint).

340

341 * The internal diff machinery can be made to read out of bounds while

342 looking for --funcion-context line in a corner case, which has been

@@ -384,27 +344,6 @@ Fixes since v2.22

344 (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).

345

346 * Other code cleanup, docfix, build fix, etc.

387 - (merge f547101b26 es/git-debugger-doc later to maint).

388 - (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint).

389 - (merge 0108f47eb3 sw/git-p4-unshelve-branched-files later to maint).

390 - (merge 9df8f734fd cm/send-email-document-req-modules later to maint).

391 - (merge afc3bf6eb1 ab/hash-object-doc later to maint).

392 - (merge 1fde99cfc7 po/doc-branch later to maint).

393 - (merge 459842e1c2 dl/config-alias-doc later to maint).

394 - (merge 5d137fc2c7 cb/fsmonitor-intfix later to maint).

395 - (merge 921d49be86 rs/copy-array later to maint).

396 - (merge cc8d872e69 js/t3404-typofix later to maint).

397 - (merge 729a9b558b cb/mkstemps-uint-type-fix later to maint).

398 - (merge 9dae4fe79f js/gcc-8-and-9 later to maint).

399 - (merge ed33bd8f30 js/t0001-case-insensitive later to maint).

400 - (merge dfa880e336 jw/gitweb-sample-update later to maint).

401 - (merge e532a90a9f sg/t5551-fetch-smart-error-is-translated later to maint).

402 - (merge 8d45ad8c29 jt/t5551-test-chunked later to maint).

403 - (merge 1a64e07d23 sg/git-C-empty-doc later to maint).

404 - (merge 37a2e35395 sg/ci-brew-gcc-workaround later to maint).

405 - (merge 24df0d49c4 js/trace2-signo-typofix later to maint).

347 (merge fbec05c210 cc/test-oidmap later to maint).

407 - (merge 7926cee904 di/readme-markup-fix later to maint).

408 - (merge 02638d1e11 vn/xmmap-gently later to maint).

409 - (merge f7bf24d4dd rm/gpg-program-doc-fix later to maint).

410 - (merge 3aef54e8b8 js/unmap-before-ext-diff later to maint).

348 + (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint).

349 + (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint).

A few more last-minute fixes