[PATCH 04/17] read-cache.c: clear and free "sparse_checkout_patterns"
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 3, 2022, 17:06 UTC
- Message-ID
- <patch-04.17-68a390619b9-20221103T164632Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.17-00000000000-20221103T164632Z-avarab@gmail.com>
The "sparse_checkout_patterns" member was added to the "struct index_state" in 836e25c51b2 (sparse-checkout: hold pattern list in index, 2021-03-30), but wasn't added to discard_index(). Let's do that.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- read-cache.c | 5 +++++ t/t1011-read-tree-sparse-checkout.sh | 1 + t/t2018-checkout-branch.sh | 1 + t/t6435-merge-sparse.sh | 1 + 4 files changed, 8 insertions(+)
diff --git a/read-cache.c b/read-cache.c index 32024029274..7c6477487a7 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2558,6 +2558,11 @@ int discard_index(struct index_state *istate) free_untracked_cache(istate->untracked); istate->untracked = NULL; + if (istate->sparse_checkout_patterns) { + clear_pattern_list(istate->sparse_checkout_patterns); + FREE_AND_NULL(istate->sparse_checkout_patterns); + } + if (istate->ce_mem_pool) { mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries()); FREE_AND_NULL(istate->ce_mem_pool); diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 742f0fa909f..595b24c0adb 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -12,6 +12,7 @@ test_description='sparse checkout tests ' TEST_CREATE_REPO_NO_TEMPLATE=1 +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 771c3c3c50e..8581ad34379 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -3,6 +3,7 @@ test_description='checkout' TEST_CREATE_REPO_NO_TEMPLATE=1 +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # Arguments: [!] <branch> <oid> [<checkout options>] diff --git a/t/t6435-merge-sparse.sh b/t/t6435-merge-sparse.sh index fde4aa3cd1a..78628fb248a 100755 --- a/t/t6435-merge-sparse.sh +++ b/t/t6435-merge-sparse.sh @@ -3,6 +3,7 @@ test_description='merge with sparse files' TEST_CREATE_REPO_NO_TEMPLATE=1 +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # test_file $filename $content
-- 2.38.0.1451.g86b35f4140a