Git fork

The sixteenth batch

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

+37 -21
+37 -21
Documentation/RelNotes/2.38.0.txt
··· 58 58 material has been lifted from "scalar" and made into a feature of 59 59 "git bugreport". 60 60 61 + * The namespaces used by "log --decorate" from "refs/" hierarchy by 62 + default has been tightened. 63 + 64 + * "git rev-list --ancestry-path=C A..B" is a natural extension of 65 + "git rev-list A..B"; instead of choosing a subset of A..B to those 66 + that have ancestry relationship with A, it lets a subset with 67 + ancestry relationship with C. 68 + 69 + * "scalar" now enables built-in fsmonitor on enlisted repositories, 70 + when able. 71 + 72 + * The bash prompt (in contrib/) learned to optionally indicate when 73 + the index is unmerged. 74 + 61 75 62 76 Performance, Internal Implementation, Development Support etc. 63 77 ··· 122 136 * The common ancestor negotiation exchange during a "git fetch" 123 137 session now leaves trace log. 124 138 139 + * Test portability improvements. 140 + (merge 4d1d843be7 mt/rot13-in-c later to maint). 141 + 125 142 126 143 Fixes since v2.37 127 144 ----------------- ··· 155 172 * Recent update to vimdiff layout code has been made more robust 156 173 against different end-user vim settings. 157 174 158 - * Plug various memory leaks. 159 - (merge ece3974ba6 ab/leakfix later to maint). 160 - 161 - * Plug various memory leaks in test-tool commands. 162 - (merge f40a693450 ab/test-tool-leakfix later to maint). 175 + * Plug various memory leaks, both in the main code and in test-tool 176 + commands. 163 177 164 178 * Fixes a long-standing corner case bug around directory renames in 165 179 the merge-ort strategy. ··· 218 232 * Gitweb had legacy URL shortener that is specific to the way 219 233 projects hosted on kernel.org used to (but no longer) work, which 220 234 has been removed. 221 - (merge 75707da4fa jr/gitweb-title-shortening later to maint). 222 235 223 236 * Fix build procedure for Windows that uses CMake so that it can pick 224 237 up the shell interpreter from local installation location. 225 - (merge 476e54b1c6 ca/unignore-local-installation-on-windows later to maint). 226 238 227 239 * Conditionally allow building Python interpreter on Windows 228 - (merge 2f0623aaa7 js/mingw-with-python later to maint). 229 240 230 241 * Fix to lstat() emulation on Windows. 231 - (merge 82ba1191ff js/lstat-mingw-enotdir-fix later to maint). 232 242 233 243 * Older gcc with -Wall complains about the universal zero initializer 234 244 "struct s = { 0 };" idiom, which makes developers' lives 235 245 inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The 236 246 build procedure has been tweaked to help these compilers. 237 - (merge b53a5f2416 jk/struct-zero-init-with-older-gcc later to maint). 238 247 239 248 * Plug memory leaks in the failure code path in the "merge-ort" merge 240 249 strategy backend. 241 - (merge 1250dff32b js/ort-clean-up-after-failed-merge later to maint). 242 250 243 251 * "git symbolic-ref symref non..sen..se" is now diagnosed as an error. 244 - (merge 04ede97211 lt/symbolic-ref-sanity later to maint). 245 252 246 - * A follow-up fix to a fix for a regression in 2.36. 247 - (merge 99ddc24672 ab/hooks-regression-fix later to maint). 253 + * A follow-up fix to a fix for a regression in 2.36 around hooks. 248 254 249 255 * Avoid repeatedly running getconf to ask libc version in the test 250 256 suite, and instead just as it once per script. 251 - (merge a6a58f7801 pw/use-glibc-tunable-for-malloc-optim later to maint). 252 257 253 258 * Platform-specific code that determines if a directory is OK to use 254 259 as a repository has been taught to report more details, especially 255 260 on Windows. 256 - (merge 3f7207e2ea js/safe-directory-plus later to maint). 257 261 258 262 * "vimdiff3" regression fix. 259 - (merge 34133d9658 fc/vimdiff-layout-vimdiff3-fix later to maint). 260 263 261 264 * "git fsck" reads mode from tree objects but canonicalizes the mode 262 265 before passing it to the logic to check object sanity, which has ··· 264 267 corrected, but to help exiting projects with broken tree objects 265 268 that they cannot fix retroactively, the severity of anomalies this 266 269 code detects has been demoted to "info" for now. 267 - (merge 4dd3b045f5 jk/fsck-tree-mode-bits-fix later to maint). 268 270 269 271 * Fixes to sparse index compatibility work for "reset" and "checkout" 270 272 commands. 271 - (merge b15207b8cf vd/sparse-reset-checkout-fixes later to maint). 272 273 273 274 * An earlier optimization discarded a tree-object buffer that is 274 275 still in use, which has been corrected. ··· 279 280 reimplemented in C recently. 280 281 (merge 716c1f649e jk/pipe-command-nonblock later to maint). 281 282 283 + * The sequencer machinery translated messages left in the reflog by 284 + mistake, which has been corrected. 285 + 286 + * xcalloc(), imitating calloc(), takes "number of elements of the 287 + array", and "size of a single element", in this order. A call that 288 + does not follow this ordering has been corrected. 289 + (merge c4bbd9bb8f sg/xcalloc-cocci-fix later to maint). 290 + 291 + * The preload-index codepath made copies of pathspec to give to 292 + multiple threads, which were left leaked. 293 + (merge 23578904da ad/preload-plug-memleak later to maint). 294 + 295 + * Update the version of Ubuntu used for GitHub Actions CI from 18.04 296 + to 22.04. 297 + (merge ef46584831 ds/github-actions-use-newer-ubuntu later to maint). 298 + 282 299 * Other code cleanup, docfix, build fix, etc. 283 - (merge 94955d576b gc/git-reflog-doc-markup later to maint). 284 - (merge efae7ce692 po/doc-add-renormalize later to maint). 300 + (merge 77b9e85c0f vd/fix-perf-tests later to maint).