cache: convert struct cache_entry to use struct object_id

diff --git a/builtin/rm.c b/builtin/rm.c
index b2fee3e90ab5439a86b06079c15ca1e4cc303e60..109969d5146410d5651ad88ef633c1e796ad4a91 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -199,7 +199,7 @@ static int check_local_mod(unsigned char *head, int index_only)
                if (no_head
                     || get_tree_entry(head, name, sha1, &mode)
                     || ce->ce_mode != create_ce_mode(mode)
-                    || hashcmp(ce->sha1, sha1))
+                    || hashcmp(ce->oid.hash, sha1))
                        staged_changes = 1;
 
                /*