Merge branch 'rj/restore-plug-leaks'

Leaks from "git restore" have been plugged.

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

diff --cc builtin/checkout.c
Simple merge

diff --cc t/t2071-restore-patch.sh
index 27e85be40ad6957f9070a609d83ae334776ed855,9b25eb39c76ae75f34c6441773047270ec571d54..42d552211915754e14ddb79d869fc9ba8f517fce
--- 1/t/t2071-restore-patch.sh
--- 2/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 &&