From 86fa96860b42d13dac3b1023817dfc177a91324c Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 18 Oct 2022 16:15:33 -0400 Subject: [PATCH 1/2] Makefile: force -O0 when compiling with SANITIZE=leak Cherry pick commit d3775de0 (Makefile: force -O0 when compiling with SANITIZE=leak, 2022-10-18), as otherwise the leak checker at GitHub Actions CI seems to fail with a false positive. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index cac3452edb..aa615fe4b6 100644 --- a/Makefile +++ b/Makefile @@ -1338,6 +1338,7 @@ BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS endif ifneq ($(filter leak,$(SANITIZERS)),) BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS +BASIC_CFLAGS += -O0 SANITIZE_LEAK = YesCompiledWithIt endif ifneq ($(filter address,$(SANITIZERS)),) From e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Oct 2022 15:24:23 -0700 Subject: [PATCH 2/2] Downmerge a bit more for 2.38.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.38.2.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Documentation/RelNotes/2.38.2.txt b/Documentation/RelNotes/2.38.2.txt index 00d4b77655..086b900f6c 100644 --- a/Documentation/RelNotes/2.38.2.txt +++ b/Documentation/RelNotes/2.38.2.txt @@ -44,4 +44,17 @@ Fixes since v2.38.1 * "GIT_EDITOR=: git branch --edit-description" resulted in failure, which has been corrected. + * Documentation on various Boolean GIT_* environment variables have + been clarified. + + * "git multi-pack-index repack/expire" used to repack unreachable + cruft into a new pack, which have been corrected. + + * The code to clean temporary object directories (used for + quarantine) tried to remove them inside its signal handler, which + was a no-no. + + * "git branch --edit-description" on an unborh branch misleadingly + said that no such branch exists, which has been corrected. + Also contains various documentation updates and code clean-ups.