aboutsummaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:59:24 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:59:25 -0700
commit10b944b37b11d6e0597541efdd1fa23c0eecbeff (patch)
tree2cbd3d48b1f08edee38c565984aaccdca325ef43 /object.h
parent9f2de9c121c60cba9e55db5263a7bceffcd8fe2d (diff)
parentfa96082617e07d988103854fb96c5e92b7587e72 (diff)
downloadgit-10b944b37b11d6e0597541efdd1fa23c0eecbeff.tar.xz
Merge branch 'jk/alloc-commit-id'
Make sure all in-core commit objects are assigned a unique number so that they can be annotated using the commit-slab API. * jk/alloc-commit-id: diff-tree: avoid lookup_unknown_object object_as_type: set commit index alloc: factor out commit index add object_as_type helper for casting objects parse_object_buffer: do not set object type move setting of object->type to alloc_* functions alloc: write out allocator definitions alloc.c: remove the alloc_raw_commit_node() function
Diffstat (limited to 'object.h')
-rw-r--r--object.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/object.h b/object.h
index 6e12f2c7f4..5e8d8ee548 100644
--- a/object.h
+++ b/object.h
@@ -79,7 +79,9 @@ extern struct object *get_indexed_object(unsigned int);
*/
struct object *lookup_object(const unsigned char *sha1);
-extern void *create_object(const unsigned char *sha1, int type, void *obj);
+extern void *create_object(const unsigned char *sha1, void *obj);
+
+void *object_as_type(struct object *obj, enum object_type type, int quiet);
/*
* Returns the object, having parsed it to find out what it is.