read-cache: convert to struct object_id

Replace hashcmp with oidcmp.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/read-cache.c b/read-cache.c
index acfb028f480b5545aa82d5c0533fe8bdfc581dfd..72856085f26c3816dba859c57f5f33d703337374 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -160,9 +160,9 @@ static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
        int fd = git_open_cloexec(ce->name, O_RDONLY);
 
        if (fd >= 0) {
        int fd = git_open_cloexec(ce->name, O_RDONLY);
 
        if (fd >= 0) {

-               unsigned char sha1[20];
-               if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
-                       match = hashcmp(sha1, ce->oid.hash);
+               struct object_id oid;
+               if (!index_fd(oid.hash, fd, st, OBJ_BLOB, ce->name, 0))
+                       match = oidcmp(&oid, &ce->oid);

                /* index_fd() closed the file descriptor already */
        }
        return match;
                /* index_fd() closed the file descriptor already */
        }
        return match;