diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-22 21:09:31 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-22 21:25:08 +0200 |
| commit | bb0757d56c7a2f0d337f1e22f9796f4090866480 (patch) | |
| tree | 193a59f31bf3c257bc6af4ba4a756adbce4a98b6 /tests/index/cache.c | |
| parent | 12e1803188407e6ee18b9bd22186dd5d02c8ba78 (diff) | |
| download | libgit2-bb0757d56c7a2f0d337f1e22f9796f4090866480.tar.gz | |
tree-cache: correct the entry_count calculation
The entry_count field is the amount of index entries covered by a
particular cache entry, that is how many files are there (recursively)
under a particular directory.
The current code that attemps to do this is severely defincient and is
trying to count the amount of children, which always comes up to zero.
We don't even need to recount, since we have the information during the
cache creation. We can take that number and keep it, as we only ever
invalidate or replace.
Diffstat (limited to 'tests/index/cache.c')
| -rw-r--r-- | tests/index/cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/index/cache.c b/tests/index/cache.c index 17a61a9f5..de5cd8308 100644 --- a/tests/index/cache.c +++ b/tests/index/cache.c @@ -38,7 +38,7 @@ void test_index_cache__write_extension_at_root(void) cl_git_pass(git_index_open(&index, index_file)); cl_assert(index->tree); - cl_assert_equal_i(0, index->tree->entry_count); + cl_assert_equal_i(git_index_entrycount(index), index->tree->entry_count); cl_assert_equal_i(0, index->tree->children_count); cl_assert(git_oid_equal(&id, &index->tree->oid)); @@ -106,7 +106,7 @@ void test_index_cache__read_tree_no_children(void) cl_assert(index->tree); cl_assert(git_oid_equal(&id, &index->tree->oid)); cl_assert_equal_i(0, index->tree->children_count); - cl_assert_equal_i(0, index->tree->entry_count); /* 0 is a placeholder here */ + cl_assert_equal_i(git_index_entrycount(index), index->tree->entry_count); memset(&entry, 0x0, sizeof(git_index_entry)); entry.path = "new.txt"; @@ -169,7 +169,7 @@ void test_index_cache__two_levels(void) cl_assert_equal_i(1, index->tree->children_count); tree_cache = git_tree_cache_get(index->tree, "subdir"); cl_assert(tree_cache); - cl_assert_equal_i(0, tree_cache->entry_count); + cl_assert_equal_i(1, tree_cache->entry_count); } void test_index_cache__read_tree_children(void) @@ -226,11 +226,11 @@ void test_index_cache__read_tree_children(void) cache = git_tree_cache_get(index->tree, "subdir/even-deeper"); cl_assert(cache); - cl_assert_equal_i(0, cache->entry_count); + cl_assert_equal_i(1, cache->entry_count); cache = git_tree_cache_get(index->tree, "subdir2"); cl_assert(cache); - cl_assert_equal_i(0, cache->entry_count); + cl_assert_equal_i(1, cache->entry_count); git_index_free(index); } |