diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-26 03:12:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-26 20:49:20 +0300 |
commit | db29e6bbaed156ae9025ff0474fd788e58230367 (patch) | |
tree | 08f8404fbac1b99c9e5e14cd9a66e14d67434b7a | |
parent | b71552977030afd6f187c3f13e6b5c892d31a89d (diff) | |
parent | 7d8dc5a1af9da32ac7454499f308db757eb19642 (diff) |
Sync with 'maint'
-rw-r--r-- | Documentation/RelNotes/2.38.2.txt | 47 | ||||
-rw-r--r-- | Documentation/RelNotes/2.39.0.txt | 19 |
2 files changed, 47 insertions, 19 deletions
diff --git a/Documentation/RelNotes/2.38.2.txt b/Documentation/RelNotes/2.38.2.txt new file mode 100644 index 0000000000..00d4b77655 --- /dev/null +++ b/Documentation/RelNotes/2.38.2.txt @@ -0,0 +1,47 @@ +Git 2.38.2 Release Notes +======================== + +This is to backport various fixes accumulated during the development +towards Git 2.39, the next feature release. + + +Fixes since v2.38.1 +------------------- + + * Update CodingGuidelines to clarify what features to use and avoid + in C99. + + * The codepath that reads from the index v4 had unaligned memory + accesses, which has been corrected. + + * "git remote rename" failed to rename a remote without fetch + refspec, which has been corrected. + + * "git clone" did not like to see the "--bare" and the "--origin" + options used together without a good reason. + + * Fix messages incorrectly marked for translation. + + * "git fsck" failed to release contents of tree objects already used + from the memory, which has been fixed. + + * "git rebase -i" can mistakenly attempt to apply a fixup to a commit + itself, which has been corrected. + + * In read-only repositories, "git merge-tree" tried to come up with a + merge result tree object, which it failed (which is not wrong) and + led to a segfault (which is bad), which has been corrected. + + * Force C locale while running tests around httpd to make sure we can + find expected error messages in the log. + + * Fix a logic in "mailinfo -b" that miscomputed the length of a + substring, which lead to an out-of-bounds access. + + * The codepath to sign learned to report errors when it fails to read + from "ssh-keygen". + + * "GIT_EDITOR=: git branch --edit-description" resulted in failure, + which has been corrected. + +Also contains various documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.39.0.txt b/Documentation/RelNotes/2.39.0.txt index f8f739cb87..782bc0edad 100644 --- a/Documentation/RelNotes/2.39.0.txt +++ b/Documentation/RelNotes/2.39.0.txt @@ -45,7 +45,6 @@ Performance, Internal Implementation, Development Support etc. * Update CodingGuidelines to clarify what features to use and avoid in C99. - (merge 438c2f859b ab/coding-guidelines-c99 later to maint). * Avoid false-positive from LSan whose assumption may be broken with higher optimization levels. @@ -58,22 +57,17 @@ Fixes since v2.38 * The codepath that reads from the index v4 had unaligned memory accesses, which has been corrected. - (merge 4a6ed30f96 vd/fix-unaligned-read-index-v4 later to maint). * Fix messages incorrectly marked for translation. - (merge 02cb8b9ee3 ah/fsmonitor-daemon-usage-non-l10n later to maint). * "git fsck" failed to release contents of tree objects already used from the memory, which has been fixed. - (merge 51b27747e5 jk/fsck-on-diet later to maint). * "git clone" did not like to see the "--bare" and the "--origin" options used together without a good reason. - (merge 3b910d6e29 jk/clone-allow-bare-and-o-together later to maint). * "git remote rename" failed to rename a remote without fetch refspec, which has been corrected. - (merge 5a97b38109 jk/remote-rename-without-fetch-refspec later to maint). * Documentation on various Boolean GIT_* environment variables have been clarified. @@ -81,7 +75,6 @@ Fixes since v2.38 * "git rebase -i" can mistakenly attempt to apply a fixup to a commit itself, which has been corrected. - (merge 3e367a5f2f ja/rebase-i-avoid-amending-self later to maint). * "git multi-pack-index repack/expire" used to repack unreachable cruft into a new pack, which have been corrected. @@ -90,26 +83,20 @@ Fixes since v2.38 * In read-only repositories, "git merge-tree" tried to come up with a merge result tree object, which it failed (which is not wrong) and led to a segfault (which is bad), which has been corrected. - (merge 92481d1b26 js/merge-ort-in-read-only-repo later to maint). * Force C locale while running tests around httpd to make sure we can find expected error messages in the log. - (merge 7a2d8ea47e rs/test-httpd-in-C-locale later to maint). * Fix a logic in "mailinfo -b" that miscomputed the length of a substring, which lead to an out-of-bounds access. - (merge 3ef1494685 pw/mailinfo-b-fix later to maint). * The codepath to sign learned to report errors when it fails to read from "ssh-keygen". - (merge 36fb0d07d8 pw/ssh-sign-report-errors later to maint). * Code clean-up that results in plugging a leak. - (merge 246526d019 rs/bisect-start-leakfix later to maint). * "GIT_EDITOR=: git branch --edit-description" resulted in failure, which has been corrected. - (merge e288b3de35 jc/branch-description-unset later to maint). * The code to clean temporary object directories (used for quarantine) tried to remove them inside its signal handler, which @@ -151,15 +138,9 @@ Fixes since v2.38 * Other code cleanup, docfix, build fix, etc. (merge c34a6bd291 so/diff-merges-cleanup later to maint). - (merge 5e7c8b75e7 ab/test-malloc-with-sanitize-leak later to maint). (merge 2a905f8fa8 ah/branch-autosetupmerge-grammofix later to maint). (merge abcac2e19f rj/ref-filter-get-head-description-leakfix later to maint). (merge 71e5473493 hn/parse-worktree-ref later to maint). - (merge 7190b7ebf9 ds/bundle-uri-docfix later to maint). - (merge 45350aeb11 jk/sequencer-missing-author-name-check later to maint). - (merge edbf9a2e20 nb/doc-mergetool-typofix later to maint). - (merge b004c90282 rs/gc-pack-refs-simplify later to maint). - (merge 69c5f17f11 jk/cleanup-callback-parameters later to maint). (merge 7c07f36ad2 ab/unused-annotation later to maint). (merge f7669676d0 rs/use-fspathncmp later to maint). (merge a677d3c416 pw/remove-rebase-p-test later to maint). |