Convert struct cache_tree to use struct object_id
Convert the sha1 member of struct cache_tree to struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct cache_tree E1; @@ - E1.sha1 + E1.oid.hash @@ struct cache_tree *E1; @@ - E1->sha1 + E1->oid.hash Fix up one reference to active_cache_tree which was not automatically caught by Coccinelle. These changes are prerequisites for converting parse_object. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
fb4e352b40
commit
e0a9280404
@ -10,7 +10,7 @@ static void dump_one(struct cache_tree *it, const char *pfx, const char *x)
|
||||
"invalid", x, pfx, it->subtree_nr);
|
||||
else
|
||||
printf("%s %s%s (%d entries, %d subtrees)\n",
|
||||
sha1_to_hex(it->sha1), x, pfx,
|
||||
oid_to_hex(&it->oid), x, pfx,
|
||||
it->entry_count, it->subtree_nr);
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ static int dump_cache_tree(struct cache_tree *it,
|
||||
}
|
||||
else {
|
||||
dump_one(it, pfx, "");
|
||||
if (hashcmp(it->sha1, ref->sha1) ||
|
||||
if (oidcmp(&it->oid, &ref->oid) ||
|
||||
ref->entry_count != it->entry_count ||
|
||||
ref->subtree_nr != it->subtree_nr) {
|
||||
/* claims to be valid but is lying */
|
||||
|
Reference in New Issue
Block a user