diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-02 07:46:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-02 07:46:25 -0700 |
| commit | 9293a931868f21029baf55935f2f092c3f06415f (patch) | |
| tree | 1b7b2551124cf83a4c52ce01b8f1bbe8d85c4cda /t/t1092-sparse-checkout-compatibility.sh | |
| parent | e9356ba3ea2a6754281ff7697b3e5a1697b21e24 (diff) | |
| parent | 537e516a39a760fddc4f3f5020c4118943f6c146 (diff) | |
| download | git-9293a931868f21029baf55935f2f092c3f06415f.tar.gz | |
Merge branch 'ds/sparse-checkout-expansion-advice'
When "git sparse-checkout disable" turns a sparse checkout into a
regular checkout, the index is fully expanded. This totally
expected behaviour however had an "oops, we are expanding the
index" advice message, which has been corrected.
* ds/sparse-checkout-expansion-advice:
sparse-checkout: disable advice in 'disable'
Diffstat (limited to 't/t1092-sparse-checkout-compatibility.sh')
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index eb32da2a7f..6e230b5487 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -2355,7 +2355,10 @@ test_expect_success 'advice.sparseIndexExpanded' ' mkdir -p sparse-index/deep/deeper2/deepest && touch sparse-index/deep/deeper2/deepest/bogus && git -C sparse-index status 2>err && - grep "The sparse index is expanding to a full index" err + grep "The sparse index is expanding to a full index" err && + + git -C sparse-index sparse-checkout disable 2>err && + test_line_count = 0 err ' test_expect_success 'cat-file -p' ' |