Merge branch 'sg/commit-graph-validate'

diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 090b7fc3d35d1a46a18b8ae385a7cc1213e6650d..40cc004326e2f0f66b74e2fbfa7d8a5cc21363a4 100755 (executable)
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -31,20 +31,6 @@ test_expect_success 'perform sparse checkout of master' '
        test_path_is_file c
 '
 
-test_expect_success 'checkout -b checkout.optimizeNewBranch interaction' '
-       cp .git/info/sparse-checkout .git/info/sparse-checkout.bak &&
-       test_when_finished "
-               mv -f .git/info/sparse-checkout.bak .git/info/sparse-checkout
-               git checkout master
-       " &&
-       echo "/b" >>.git/info/sparse-checkout &&
-       test "$(git ls-files -t b)" = "S b" &&
-       git -c checkout.optimizeNewBranch=true checkout -b fast &&
-       test "$(git ls-files -t b)" = "S b" &&
-       git checkout -b slow &&
-       test "$(git ls-files -t b)" = "H b"
-'
-
 test_expect_success 'merge feature branch into sparse checkout of master' '
        git merge feature &&
        test_path_is_file a &&