Merge branch 'sg/diff-indent-heuristic-non-experimental'

diff --git a/object.h b/object.h
index 47301186a47e544625726480611adde465737229..0120892bbd39034e3c49c2c068421df421ba9222 100644 (file)
--- a/object.h
+++ b/object.h
@@ -118,7 +118,7 @@ struct object *get_indexed_object(unsigned int);
  */
 struct object *lookup_object(struct repository *r, const struct object_id *oid);
 
-void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
+void *create_object(struct repository *r, const struct object_id *oid, void *obj);
 
 void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);