[PATCH] Add a function for getting a struct tree for an ent.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/tree.c b/tree.c
index 8f490b8984bf95a13720ffb2d9b23a2dd8c03394..315b6a5d1ce0e83fc75a399a3b74e51f46c5b392 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,5 +1,7 @@
 #include "tree.h"
 #include "blob.h"
 #include "tree.h"
 #include "blob.h"

+#include "commit.h"
+#include "tag.h"

 #include "cache.h"
 #include <stdlib.h>
 
 #include "cache.h"
 #include <stdlib.h>
 


@@ -212,3 +214,22 @@ int parse_tree(struct tree *item)
        free(buffer);
        return ret;
 }
        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);
+}

diff --git a/tree.h b/tree.h
index 0df065ae363c016b17db26f00b982396baf066db..9975e88216dc6924c1d6e9ec3c7ae6d90c2df1dd 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -32,4 +32,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
 
 int parse_tree(struct tree *tree);
 
 
 int parse_tree(struct tree *tree);
 

+/* Parses and returns the tree in the given ent, chasing tags and commits. */
+struct tree *parse_tree_indirect(const unsigned char *sha1);
+

 #endif /* TREE_H */
 #endif /* TREE_H */