undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-dump-cache-tree: invalid trees are not errors

Browse Source 
Do not treat known-invalid trees as errors even when their subtree_nr is
incorrect.  Because git already knows that these trees are invalid,
an incorrect subtree_nr will not cause problems.

Add a couple of comments.

Signed-off-by: David Turner <dturner@twitter.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Turner 2014-07-07 17:33:43 -07:00 committed by Junio C Hamano
parent aecf567cbf
commit 969dd8c612
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test-dump-cache-tree.c
View File

@ -26,16 +26,16 @@ static int dump_cache_tree(struct cache_tree *it,
return 0; return 0;
if (it->entry_count < 0) { if (it->entry_count < 0) {
/* invalid */
dump_one(it, pfx, ""); dump_one(it, pfx, "");
dump_one(ref, pfx, "#(ref) "); dump_one(ref, pfx, "#(ref) ");
if (it->subtree_nr != ref->subtree_nr)
errs = 1;
} }
else { else {
dump_one(it, pfx, ""); dump_one(it, pfx, "");
if (hashcmp(it->sha1, ref->sha1) || if (hashcmp(it->sha1, ref->sha1) ||
ref->entry_count != it->entry_count || ref->entry_count != it->entry_count ||
ref->subtree_nr != it->subtree_nr) { ref->subtree_nr != it->subtree_nr) {
/* claims to be valid but is lying */
dump_one(ref, pfx, "#(ref) "); dump_one(ref, pfx, "#(ref) ");
errs = 1; errs = 1;
} }