diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:35:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-28 10:35:35 -0700 |
| commit | 5d7c37a130833d8e612f6b83f017ffe51a1a6833 (patch) | |
| tree | 6ca634eb0048e97f868992642169b9e1cd99f387 /object.h | |
| parent | 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e (diff) | |
| parent | b794ebeac9151af4a9136ef28a22a06c2afb17cc (diff) | |
| download | git-5d7c37a130833d8e612f6b83f017ffe51a1a6833.tar.gz git-5d7c37a130833d8e612f6b83f017ffe51a1a6833.tar.xz | |
Merge branch 'jk/alloc-commit-id-maint' into maint
* jk/alloc-commit-id-maint:
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. |