X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.c;h=8b42a07b208aceeaa4900c034eea8a5b6b7ac323;hb=4ddba79db76bd6425f00e99ceb1d82d179319aec;hp=8f490b8984bf95a13720ffb2d9b23a2dd8c03394;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git diff --git a/tree.c b/tree.c index 8f490b89..8b42a07b 100644 --- a/tree.c +++ b/tree.c @@ -1,5 +1,7 @@ #include "tree.h" #include "blob.h" +#include "commit.h" +#include "tag.h" #include "cache.h" #include @@ -146,6 +148,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size) { void *bufptr = buffer; struct tree_entry_list **list_p; + int n_refs = 0; if (item->object.parsed) return 0; @@ -182,11 +185,21 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size) obj = &entry->item.blob->object; } if (obj) - add_ref(&item->object, obj); + n_refs++; entry->parent = NULL; /* needs to be filled by the user */ *list_p = entry; list_p = &entry->next; } + + if (track_object_refs) { + struct tree_entry_list *entry; + unsigned i = 0; + struct object_refs *refs = alloc_object_refs(n_refs); + for (entry = item->entries; entry; entry = entry->next) + refs->ref[i++] = entry->item.any; + set_object_refs(&item->object, refs); + } + return 0; } @@ -212,3 +225,22 @@ int parse_tree(struct tree *item) free(buffer); return ret; } + +struct tree *parse_tree_indirect(const unsigned char *sha1) +{ + struct object *obj = parse_object(sha1); + do { + if (!obj) + return NULL; + if (obj->type == tree_type) + return (struct tree *) obj; + else if (obj->type == commit_type) + obj = &(((struct commit *) obj)->tree->object); + else if (obj->type == tag_type) + obj = ((struct tag *) obj)->tagged; + else + return NULL; + if (!obj->parsed) + parse_object(obj->sha1); + } while (1); +}