From c2b3f2b3cdbf5ad9feb978dd367d77561a1271f7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 2 Jul 2024 09:04:10 -0700 Subject: [PATCH 1/2] Yet another batch of post 2.45.2 updates from the 'master' front Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.45.3.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Documentation/RelNotes/2.45.3.txt b/Documentation/RelNotes/2.45.3.txt index 90098d2536f2d5..2a1e9aa60879aa 100644 --- a/Documentation/RelNotes/2.45.3.txt +++ b/Documentation/RelNotes/2.45.3.txt @@ -77,4 +77,31 @@ Fixes since v2.45.2 * Varargs functions that are unannotated as printf-like or execl-like have been annotated as such. + * The "-k" and "--rfc" options of "format-patch" will now error out + when used together, as one tells us not to add anything to the + title of the commit, and the other one tells us to add "RFC" in + addition to "PATCH". + + * When the user adds to "git rebase -i" instruction to "pick" a merge + commit, the error experience is not pleasant. Such an error is now + caught earlier in the process that parses the todo list. + + * We forgot to normalize the result of getcwd() to NFC on macOS where + all other paths are normalized, which has been corrected. This still + does not address the case where core.precomposeUnicode configuration + is not defined globally. + + * Earlier we stopped using the tree of HEAD as the default source of + attributes in a bare repository, but failed to document it. This + has been corrected. + + * An unused extern declaration for mingw has been removed to prevent + it from causing build failure. + + * A helper function shared between two tests had a copy-paste bug, + which has been corrected. + + * "git fetch-pack -k -k" without passing "--lock-pack" (which we + never do ourselves) did not work at all, which has been corrected. + Also contains various documentation updates and code clean-ups. From c2ad9d68d642f991bc21b192ad8f99e55bb2c849 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 2 Jul 2024 09:34:47 -0700 Subject: [PATCH 2/2] The eighteenth batch Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.46.0.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Documentation/RelNotes/2.46.0.txt b/Documentation/RelNotes/2.46.0.txt index e9e8b0b27bdef2..eac94717e8605f 100644 --- a/Documentation/RelNotes/2.46.0.txt +++ b/Documentation/RelNotes/2.46.0.txt @@ -186,6 +186,21 @@ Performance, Internal Implementation, Development Support etc. after writing MERGE_HEAD etc. files, which was useless for the purpose to recover from the failure. + * The output from "git cat-file --batch-check" and "--batch-command + (info)" should not be unbuffered, for which some tests have been + added. + + * A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help + transition the codebase to rely less on the availability of the + singleton the_repository instance. + + * "git version --build-options" reports the version information of + OpenSSL and other libraries (if used) in the build. + + * Memory ownership rules for the in-core representation of + remote.*.url configuration values have been straightened out, which + resulted in a few leak fixes and code clarification. + Fixes since v2.45 ----------------- @@ -331,6 +346,16 @@ Fixes since v2.45 never do ourselves) did not work at all, which has been corrected. (merge 96a6621d25 jk/fetch-pack-fsck-wo-lock-pack later to maint). + * CI job to build minimum fuzzers learned to pass NO_CURL=NoThanks to + the build procedure, as its build environment does not offer, or + the rest of the build needs, anything cURL. + (merge 4e66b5a990 jc/fuzz-sans-curl later to maint). + + * "git diff --no-ext-diff" when diff.external is configured ignored + the "--color-moved" option. + (merge 0f4b0d4cf0 rs/diff-color-moved-w-no-ext-diff-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge bf6a86236e jc/worktree-git-path later to maint). (merge 28dc26dc33 rs/remove-unused-find-header-mem later to maint). + (merge 493fdae046 ew/object-convert-leakfix later to maint).