The eighteenth batch

[thirdparty/git.git] / t / t6428-merge-conflicts-sparse.sh

diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh
index 142c9aaabc5309078e38cc01607f821520f965fc..8a79bc2e921d433bb9db401c2f9c0f25a9908333 100755 (executable)
--- a/t/t6428-merge-conflicts-sparse.sh
+++ b/t/t6428-merge-conflicts-sparse.sh
@@ -22,6 +22,7 @@ test_description="merge cases"
 #                     underscore notation is to differentiate different
 #                     files that might be renamed into each other's paths.)
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-merge.sh
 
@@ -29,7 +30,7 @@ test_description="merge cases"
 # Testcase basic, conflicting changes in 'numerals'
 
 test_setup_numerals () {
-       test_create_repo numerals_$1 &&
+       git init numerals_$1 &&
        (
                cd numerals_$1 &&
 
@@ -87,7 +88,7 @@ test_expect_success 'conflicting entries written to worktree even if sparse' '
                test_path_is_file numerals &&
 
                git sparse-checkout init &&
-               git sparse-checkout set README &&
+               git sparse-checkout set --no-cone README &&
 
                test_path_is_file README &&
                test_path_is_missing numerals &&
@@ -123,7 +124,7 @@ test_expect_success 'present-despite-SKIP_WORKTREE handled reasonably' '
                test_path_is_file numerals &&
 
                git sparse-checkout init &&
-               git sparse-checkout set README &&
+               git sparse-checkout set --no-cone README &&
 
                test_path_is_file README &&
                test_path_is_missing numerals &&