diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-09 22:02:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-09 22:02:26 +0300 |
| commit | fe3939bc2a91ec126313392cabc5777030d14d7b (patch) | |
| tree | c8f2a80c2d1e0aaa299710b541c190780bd66b47 /t/t1092-sparse-checkout-compatibility.sh | |
| parent | fd1ec82547d6139e66556ad3f694ffdc22858670 (diff) | |
| parent | 037f8ea6d961a52deaa8df5150049850a53d61ac (diff) | |
Merge branch 'vd/sparse-reset-checkout-fixes'
Segfault fix-up to an earlier fix to the topic to teach "git reset"
and "git checkout" work better in a sparse checkout.
* vd/sparse-reset-checkout-fixes:
unpack-trees: fix sparse directory recursion check
Diffstat (limited to 't/t1092-sparse-checkout-compatibility.sh')
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 0302e36fd6..b9350c075c 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -380,6 +380,15 @@ test_expect_success 'checkout with modified sparse directory' ' test_all_match git checkout base ' +test_expect_success 'checkout orphan then non-orphan' ' + init_repos && + + test_all_match git checkout --orphan test-orphan && + test_all_match git status --porcelain=v2 && + test_all_match git checkout base && + test_all_match git status --porcelain=v2 +' + test_expect_success 'add outside sparse cone' ' init_repos && |