From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2024 23:16:33 +0000 (-0700)
Subject: Merge branch 'rj/restore-plug-leaks'
X-Git-Tag: v2.45.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=199074f8932f85abac3b40d8e79c63d9e8f94ca0;p=thirdparty%2Fgit.git

Merge branch 'rj/restore-plug-leaks'

Leaks from "git restore" have been plugged.

* rj/restore-plug-leaks:
  checkout: plug some leaks in git-restore
---

199074f8932f85abac3b40d8e79c63d9e8f94ca0
diff --cc t/t2071-restore-patch.sh
index 27e85be40a,9b25eb39c7..42d5522119
--- a/t/t2071-restore-patch.sh
+++ b/t/t2071-restore-patch.sh
@@@ -2,9 -2,10 +2,10 @@@
  
  test_description='git restore --patch'
  
+ TEST_PASSES_SANITIZE_LEAK=true
  . ./lib-patch-mode.sh
  
 -test_expect_success PERL 'setup' '
 +test_expect_success 'setup' '
  	mkdir dir &&
  	echo parent >dir/foo &&
  	echo dummy >bar &&