X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree-diff.c;h=701fbba65c2d718a2cdff170a6be6d9993ad27d7;hb=459a21bd35675e140e19569e8b5c62c7fc4eee5b;hp=382092bce0be4ac82098ccc9c19d52df80f4eafd;hpb=36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70;p=git.git

diff --git a/tree-diff.c b/tree-diff.c
index 382092bc..701fbba6 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -3,40 +3,13 @@
  */
 #include "cache.h"
 #include "diff.h"
+#include "tree.h"
 
 // What paths are we interested in?
 static int nr_paths = 0;
 static const char **paths = NULL;
 static int *pathlens = NULL;
 
-static void update_tree_entry(struct tree_desc *desc)
-{
-	void *buf = desc->buf;
-	unsigned long size = desc->size;
-	int len = strlen(buf) + 1 + 20;
-
-	if (size < len)
-		die("corrupt tree file");
-	desc->buf = buf + len;
-	desc->size = size - len;
-}
-
-static const unsigned char *extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
-{
-	void *tree = desc->buf;
-	unsigned long size = desc->size;
-	int len = strlen(tree)+1;
-	const unsigned char *sha1 = tree + len;
-	const char *path = strchr(tree, ' ');
-	unsigned int mode;
-
-	if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
-		die("corrupt tree file");
-	*pathp = path+1;
-	*modep = DIFF_FILE_CANON_MODE(mode);
-	return sha1;
-}
-
 static char *malloc_base(const char *base, const char *path, int pathlen)
 {
 	int baselen = strlen(base);
@@ -56,8 +29,8 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
 	const unsigned char *sha1, *sha2;
 	int cmp, pathlen1, pathlen2;
 
-	sha1 = extract(t1, &path1, &mode1);
-	sha2 = extract(t2, &path2, &mode2);
+	sha1 = tree_entry_extract(t1, &path1, &mode1);
+	sha2 = tree_entry_extract(t2, &path2, &mode2);
 
 	pathlen1 = strlen(path1);
 	pathlen2 = strlen(path2);
@@ -109,7 +82,7 @@ static int interesting(struct tree_desc *desc, const char *base)
 	if (!nr_paths)
 		return 1;
 
-	(void)extract(desc, &path, &mode);
+	(void)tree_entry_extract(desc, &path, &mode);
 
 	pathlen = strlen(path);
 	baselen = strlen(base);
@@ -167,7 +140,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
 {
 	unsigned mode;
 	const char *path;
-	const unsigned char *sha1 = extract(desc, &path, &mode);
+	const unsigned char *sha1 = tree_entry_extract(desc, &path, &mode);
 
 	if (opt->recursive && S_ISDIR(mode)) {
 		char type[20];
@@ -176,7 +149,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
 		void *tree;
 
 		tree = read_sha1_file(sha1, type, &inner.size);
-		if (!tree || strcmp(type, "tree"))
+		if (!tree || strcmp(type, tree_type))
 			die("corrupt tree sha %s", sha1_to_hex(sha1));
 
 		inner.buf = tree;
@@ -234,10 +207,10 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
 	struct tree_desc t1, t2;
 	int retval;
 
-	tree1 = read_object_with_reference(old, "tree", &t1.size, NULL);
+	tree1 = read_object_with_reference(old, tree_type, &t1.size, NULL);
 	if (!tree1)
 		die("unable to read source tree (%s)", sha1_to_hex(old));
-	tree2 = read_object_with_reference(new, "tree", &t2.size, NULL);
+	tree2 = read_object_with_reference(new, tree_type, &t2.size, NULL);
 	if (!tree2)
 		die("unable to read destination tree (%s)", sha1_to_hex(new));
 	t1.buf = tree1;