X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.c;h=8b42a07b208aceeaa4900c034eea8a5b6b7ac323;hb=924215024c72bc359fad920010dd6b356a5140c8;hp=8dc27e3b7354b8b8cc7d7491621929c78325a645;hpb=0ca14a57f159fc9d0923dbb122705dd8d6a45488;p=git.git

diff --git a/tree.c b/tree.c
index 8dc27e3b..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 <stdlib.h>
 
@@ -21,9 +23,9 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
 	return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
 }
 
-static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, char **paths)
+static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, const char **paths)
 {
-	char *match;
+	const char *match;
 	int pathlen;
 
 	if (!paths)
@@ -59,13 +61,15 @@ static int match_tree_entry(const char *base, int baselen, const char *path, uns
 
 		if (strncmp(path, match, pathlen))
 			continue;
+
+		return 1;
 	}
 	return 0;
 }
 
 static int read_tree_recursive(void *buffer, unsigned long size,
 			       const char *base, int baselen,
-			       int stage, char **match)
+			       int stage, const char **match)
 {
 	while (size) {
 		int len = strlen(buffer)+1;
@@ -115,7 +119,7 @@ static int read_tree_recursive(void *buffer, unsigned long size,
 	return 0;
 }
 
-int read_tree(void *buffer, unsigned long size, int stage, char **match)
+int read_tree(void *buffer, unsigned long size, int stage, const char **match)
 {
 	return read_tree_recursive(buffer, size, "", 0, stage, match);
 }
@@ -144,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;
@@ -165,6 +170,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
 		entry->directory = S_ISDIR(mode) != 0;
 		entry->executable = (mode & S_IXUSR) != 0;
 		entry->symlink = S_ISLNK(mode) != 0;
+		entry->zeropad = *(char *)bufptr == '0';
 		entry->mode = mode;
 		entry->next = NULL;
 
@@ -179,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;
 }
 
@@ -209,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);
+}