Skip to content

Commit

Permalink
cache-tree: subdirectory tests
Browse files Browse the repository at this point in the history
Add tests to confirm that invalidation of subdirectories neither over-
nor under-invalidates.

Signed-off-by: David Turner <dturner@twitter.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David Turner authored and Junio C Hamano committed Jul 11, 2014
1 parent 969dd8c commit 59a8adb
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions t/t0090-cache-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ test_shallow_cache_tree () {
}

test_invalid_cache_tree () {
echo "invalid (0 subtrees)" >expect &&
printf "SHA #(ref) (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >>expect &&
cmp_cache_tree expect
printf "invalid %s ()\n" "" "$@" >expect &&
test-dump-cache-tree | \
sed -n -e "s/[0-9]* subtrees//" -e '/#(ref)/d' -e '/^invalid /p' >actual &&
test_cmp expect actual
}

test_no_cache_tree () {
Expand All @@ -49,6 +50,25 @@ test_expect_success 'git-add invalidates cache-tree' '
test_invalid_cache_tree
'

test_expect_success 'git-add in subdir invalidates cache-tree' '
test_when_finished "git reset --hard; git read-tree HEAD" &&
mkdir dirx &&
echo "I changed this file" >dirx/foo &&
git add dirx/foo &&
test_invalid_cache_tree
'

test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
git tag no-children &&
test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
mkdir dir1 dir2 &&
test_commit dir1/a &&
test_commit dir2/b &&
echo "I changed this file" >dir1/a &&
git add dir1/a &&
test_invalid_cache_tree dir1/
'

test_expect_success 'update-index invalidates cache-tree' '
test_when_finished "git reset --hard; git read-tree HEAD" &&
echo "I changed this file" >foo &&
Expand Down

0 comments on commit 59a8adb

Please sign in to comment.