Merge branch 'vd/sparse-sparsity-fix-on-read'

[thirdparty/git.git] / t / t1092-sparse-checkout-compatibility.sh

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 59accde1fa3d2ed4f5e858223fb01f94adaeee6e..4eaac6a99b3b44e3ebc94e5ed083245f4d3cfd8f 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -514,7 +514,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
 test_expect_success 'merge, cherry-pick, and rebase' '
        init_repos &&
 
-       for OPERATION in "merge -m merge" cherry-pick rebase
+       for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
        do
                test_all_match git checkout -B temp update-deep &&
                test_all_match git $OPERATION update-folder1 &&