Git fork

The eighteenth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

+24
+24
Documentation/RelNotes/2.50.0.adoc
··· 76 76 been under "scalar"'s control are taught an option not to enable the 77 77 scheduled maintenance on it. 78 78 79 + * The userdiff pattern for shell scripts has been updated to cope 80 + with more bash-isms. 81 + 82 + * "git merge-tree" learned an option to see if it resolves cleanly 83 + without actually creating a result. 84 + 85 + * The commit title in the "rebase -i" todo file are now prefixed with 86 + '#', just like a merge commit being replayed. 87 + 79 88 80 89 Performance, Internal Implementation, Development Support etc. 81 90 -------------------------------------------------------------- ··· 166 175 167 176 * The dependency on the_repository variable has been reduced from the 168 177 code paths in "git replay". 178 + 179 + * Support to create a loose object file with unknown object type has 180 + been dropped. 181 + 182 + * The code path to access the "packed-refs" file while "fsck" is 183 + taught to mmap the file, instead of reading the whole file in the 184 + memory. 185 + 186 + * Assorted fixes for issues found with CodeQL. 169 187 170 188 171 189 Fixes since v2.49 ··· 325 343 automatically (as opposed to be done only upon manual request). 326 344 (merge 6389579b2f ps/ci-gitlab-enable-msvc-meson-job later to maint). 327 345 346 + * "git apply" and "git add -i/-p" code paths no longer unnecessarily 347 + expand sparse-index while working. 348 + (merge ecf9ba20e3 ds/sparse-apply-add-p later to maint). 349 + 328 350 * Other code cleanup, docfix, build fix, etc. 329 351 (merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint). 330 352 (merge 2bfd3b3685 ab/decorate-code-cleanup later to maint). ··· 355 377 (merge e5dd0a05ed ly/am-split-stgit-leakfix later to maint). 356 378 (merge bac220e154 rc/t1001-test-path-is-file later to maint). 357 379 (merge 91db6c735d ly/reftable-writer-leakfix later to maint). 380 + (merge 20e4e9ad0b jc/doc-synopsis-option-markup later to maint). 381 + (merge cddcee7f64 es/meson-configure-build-options-fix later to maint).