diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:57 -0700 |
| commit | e058b1846c3b2051aab364d7b80e8c1696958a48 (patch) | |
| tree | 0ff9597c8c3ebf2b70a98e5202de8bd67d5e01d7 /t/t1092-sparse-checkout-compatibility.sh | |
| parent | Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store' (diff) | |
| parent | t1092: run "rebase --apply" without "-q" in testing (diff) | |
| download | tgif-e058b1846c3b2051aab364d7b80e8c1696958a48.tar.xz | |
Merge branch 'pw/sparse-cache-tree-verify-fix'
Recent sparse-index addition, namely any use of index_name_pos(),
can expand sparse index entries and breaks any code that walks
cache-tree or existing index entries. One such instance of such a
breakage has been corrected.
* pw/sparse-cache-tree-verify-fix:
t1092: run "rebase --apply" without "-q" in testing
sparse index: fix use-after-free bug in cache_tree_verify()
Diffstat (limited to 't/t1092-sparse-checkout-compatibility.sh')
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index ca91c6a67f..16fbd2c6db 100755 --- 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 && |