From f1a384425d5ce07db8f44bf173076620f89a1f4f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Nov 2024 14:43:30 +0900 Subject: [PATCH 1/2] Prepare for 2.47.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.47.1.txt | 26 ++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.47.1.txt diff --git a/Documentation/RelNotes/2.47.1.txt b/Documentation/RelNotes/2.47.1.txt new file mode 100644 index 00000000000000..6d7a4d98fbe0ce --- /dev/null +++ b/Documentation/RelNotes/2.47.1.txt @@ -0,0 +1,26 @@ +Git 2.47.1 Release Notes +======================== + +This is to flush accumulated fixes since 2.47.0 on the 'master' +front down to the maintenance track. + + +Fixes since Git 2.47 +-------------------- + + * Use after free and double freeing at the end in "git log -L... -p" + had been identified and fixed. + + * On macOS, fsmonitor can fall into a race condition that results in + a client waiting forever to be notified for an event that have + already happened. This problem has been corrected. + + * "git maintenance start" crashed due to an uninitialized variable + reference, which has been corrected. + + * Fail gracefully instead of crashing when attempting to write the + contents of a corrupt in-core index as a tree object. + + * A "git fetch" from the superproject going down to a submodule used + a wrong remote when the default remote names are set differently + between them. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b3265f7becb422..5fcb9ded7f70f9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.47.0 +DEF_VER=v2.47.1 LF=' ' diff --git a/RelNotes b/RelNotes index 0104513a31630e..768c16d81bf58c 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.47.0.txt \ No newline at end of file +Documentation/RelNotes/2.47.1.txt \ No newline at end of file From 44ac25297194dd437b1b8dd195e50db08ff7d7a0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Nov 2024 14:47:00 +0900 Subject: [PATCH 2/2] The tenth batch Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.48.0.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt index 8eb6f81d3c8a88..33f297ccd21bb4 100644 --- a/Documentation/RelNotes/2.48.0.txt +++ b/Documentation/RelNotes/2.48.0.txt @@ -78,6 +78,10 @@ Performance, Internal Implementation, Development Support etc. * Buildfix and upgrade of Clar to a newer version. + * Documentation mark-up updates. + + * Renaming a handful of variables and structure fields. + Fixes since v2.47 ----------------- @@ -88,25 +92,20 @@ Fixes since v2.47 * Use after free and double freeing at the end in "git log -L... -p" had been identified and fixed. - (merge fc5589d6c1 ds/line-log-asan-fix later to maint). * On macOS, fsmonitor can fall into a race condition that results in a client waiting forever to be notified for an event that have already happened. This problem has been corrected. - (merge 51907f8fee jk/fsmonitor-event-listener-race-fix later to maint). * "git maintenance start" crashed due to an uninitialized variable reference, which has been corrected. - (merge c95547a394 ps/maintenance-start-crash-fix later to maint). * Fail gracefully instead of crashing when attempting to write the contents of a corrupt in-core index as a tree object. - (merge ecb5c4318c ps/cache-tree-w-broken-index-entry later to maint). * A "git fetch" from the superproject going down to a submodule used a wrong remote when the default remote names are set differently between them. - (merge 0c1a9987da db/submodule-fetch-with-remote-name-fix later to maint). * Fixes compile time warnings with 64-bit MSVC. @@ -140,6 +139,12 @@ Fixes since v2.47 semantics for atomic renames when other process(es) have a file opened at the destination path. + * "git gc" discards any objects that are outside promisor packs that + are referred to by an object in a promisor pack, and we do not + refetch them from the promisor at runtime, resulting an unusable + repository. Work it around by including these objects in the + referring promisor pack at the receiving end of the fetch. + * Other code cleanup, docfix, build fix, etc. (merge 1164e270b5 jk/output-prefix-cleanup later to maint). (merge f36b8cbaef jh/config-unset-doc-fix later to maint).