diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:59:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:59:25 -0700 |
| commit | 10b944b37b11d6e0597541efdd1fa23c0eecbeff (patch) | |
| tree | 2cbd3d48b1f08edee38c565984aaccdca325ef43 /object.h | |
| parent | Merge branch 'kb/perf-trace' (diff) | |
| parent | diff-tree: avoid lookup_unknown_object (diff) | |
| download | git-10b944b37b11d6e0597541efdd1fa23c0eecbeff.tar.gz git-10b944b37b11d6e0597541efdd1fa23c0eecbeff.zip | |
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.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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. |