Merge branch 'dk/blame-keep-origin-blob'

diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index a4912e35cbe3aad886b99859100c762ac0a974af..76330cb5ab79ab0ddfd97e0c06a8f4fb3a74d6c6 100755 (executable)
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -44,14 +44,4 @@ test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
        test_path_is_missing file1
 '
 
-test_expect_success 'checkout with checkout.overlayMode=false deletes files not in <tree-ish>' '
-       >file &&
-       mkdir dir &&
-       >dir/file1 &&
-       git add file dir/file1 &&
-       git -c checkout.overlayMode=false checkout HEAD -- file &&
-       test_path_is_missing file &&
-       test_path_is_file dir/file1
-'
-
 test_done