Merge branch 'ma/commit-graph-docs'

diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 1f61eb3e88e30cb2b62040f262a8d24d2758dcfc..25d7c700f6f480076f3ad00e6eeb709f8de517fa 100755 (executable)
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -31,6 +31,20 @@ 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 &&