Convert struct object to object_id

diff --git a/object.h b/object.h
index 6416247defa133c5c7ca43c69dfe09ae00ac03f7..232727ba3d8fe1a82d8de1647ccc2e60f5452985 100644 (file)
--- a/object.h
+++ b/object.h
@@ -49,9 +49,11 @@ struct object {
        unsigned used : 1;
        unsigned type : TYPE_BITS;
        unsigned flags : FLAG_BITS;
-       unsigned char sha1[20];
+       struct object_id oid;
 };
 
+#define get_object_hash(x) ((x).oid.hash)
+
 extern const char *typename(unsigned int type);
 extern int type_from_string_gently(const char *str, ssize_t, int gentle);
 #define type_from_string(str) type_from_string_gently(str, -1, 0)