Git fork

The sixth batch

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

+16 -1
+16 -1
Documentation/RelNotes/2.38.0.txt
··· 27 27 what locale they are in by sending Accept-Language HTTP header, but 28 28 this was done only for some requests but not others. 29 29 30 + * Introduce a discovery.barerepository configuration variable that 31 + allows users to forbid discovery of bare repositories. 32 + 30 33 31 34 Performance, Internal Implementation, Development Support etc. 32 35 ··· 78 81 79 82 * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't 80 83 correctly record a removed file to the index, which was fixed. 81 - (merge 4788e8b256 js/add-i-delete later to maint). 82 84 83 85 * Certain diff options are currently ignored when combined-diff is 84 86 shown; mark them as incompatible with the feature. ··· 140 142 * An earlier attempt to plug leaks placed a clean-up label to jump to 141 143 at a bogus place, which as been corrected. 142 144 (merge 04393ae7f7 jk/diff-files-cleanup-fix later to maint). 145 + 146 + * Variable quoting fix in the vimdiff driver of "git mergetool" 147 + (merge ccc7b5148b js/vimdiff-quotepath-fix later to maint). 148 + 149 + * "git shortlog -n" relied on the underlying qsort() to be stable, 150 + which shouldn't have. Fixed. 151 + (merge df534dcbaa js/shortlog-sort-stably later to maint). 152 + 153 + * A fix for a regression in test framework. 154 + (merge 7253f7ca9f js/ci-github-workflow-markup later to maint). 155 + 156 + * mkstemp() emulation on Windows has been improved. 157 + (merge ae25974de3 rs/mingw-tighten-mkstemp later to maint). 143 158 144 159 * Other code cleanup, docfix, build fix, etc. 145 160 (merge 5fd9d1738e jk/revisions-doc-markup-fix later to maint).