diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2021-03-30 13:11:03 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-30 19:57:48 (GMT) |
commit | 9ad2d5ea71d1470c2fd68b76c36b2ced3612cde3 (patch) | |
tree | d337c74e876983b32c4bc8c80ba1d3d94c82a90e /cache-tree.c | |
parent | 2de37c536d54a28a032491ad4ef97632ef6ab836 (diff) | |
download | git-9ad2d5ea71d1470c2fd68b76c36b2ced3612cde3.zip git-9ad2d5ea71d1470c2fd68b76c36b2ced3612cde3.tar.gz git-9ad2d5ea71d1470c2fd68b76c36b2ced3612cde3.tar.bz2 |
sparse-index: loose integration with cache_tree_verify()
The cache_tree_verify() method is run when GIT_TEST_CHECK_CACHE_TREE
is enabled, which it is by default in the test suite. The logic must
be adjusted for the presence of these directory entries.
For now, leave the test as a simple check for whether the directory
entry is sparse. Do not go any further until needed.
This allows us to re-enable GIT_TEST_CHECK_CACHE_TREE in
t1092-sparse-checkout-compatibility.sh. Further,
p2000-sparse-operations.sh uses the test suite and hence this is enabled
for all tests. We need to integrate with it before we run our
performance tests with a sparse-index.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
-rw-r--r-- | cache-tree.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/cache-tree.c b/cache-tree.c index 950a961..11bf1fc 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -808,6 +808,19 @@ int cache_tree_matches_traversal(struct cache_tree *root, return 0; } +static void verify_one_sparse(struct repository *r, + struct index_state *istate, + struct cache_tree *it, + struct strbuf *path, + int pos) +{ + struct cache_entry *ce = istate->cache[pos]; + + if (!S_ISSPARSEDIR(ce->ce_mode)) + BUG("directory '%s' is present in index, but not sparse", + path->buf); +} + static void verify_one(struct repository *r, struct index_state *istate, struct cache_tree *it, @@ -830,6 +843,12 @@ static void verify_one(struct repository *r, if (path->len) { pos = index_name_pos(istate, path->buf, path->len); + + if (pos >= 0) { + verify_one_sparse(r, istate, it, path, pos); + return; + } + pos = -pos - 1; } else { pos = 0; |