X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=283f4d8577261645d0f5e2d85b7f74f13b848f79;hb=d6db01075b65da2b8584a0450619390893aae103;hp=345d576dcbb16874ebae0cb868c0b416d20f5a3d;hpb=aba06682473e2d797011f966d66c93043e3ed57a;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 345d576d..283f4d85 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -7,75 +7,18 @@
 
 static int stage = 0;
 
-static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode)
-{
-	int len = strlen(pathname);
-	unsigned int size = cache_entry_size(baselen + len);
-	struct cache_entry *ce = malloc(size);
-
-	memset(ce, 0, size);
-
-	ce->ce_mode = create_ce_mode(mode);
-	ce->ce_flags = create_ce_flags(baselen + len, stage);
-	memcpy(ce->name, base, baselen);
-	memcpy(ce->name + baselen, pathname, len+1);
-	memcpy(ce->sha1, sha1, 20);
-	return add_cache_entry(ce, 1);
-}
-
-static int read_tree_recursive(void *buffer, unsigned long size,
-			       const char *base, int baselen)
-{
-	while (size) {
-		int len = strlen(buffer)+1;
-		unsigned char *sha1 = buffer + len;
-		char *path = strchr(buffer, ' ')+1;
-		unsigned int mode;
-
-		if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
-			return -1;
-
-		buffer = sha1 + 20;
-		size -= len + 20;
-
-		if (S_ISDIR(mode)) {
-			int retval;
-			int pathlen = strlen(path);
-			char *newbase = malloc(baselen + 1 + pathlen);
-			void *eltbuf;
-			char elttype[20];
-			unsigned long eltsize;
-
-			eltbuf = read_sha1_file(sha1, elttype, &eltsize);
-			if (!eltbuf || strcmp(elttype, "tree"))
-				return -1;
-			memcpy(newbase, base, baselen);
-			memcpy(newbase + baselen, path, pathlen);
-			newbase[baselen + pathlen] = '/';
-			retval = read_tree_recursive(eltbuf, eltsize,
-						     newbase,
-						     baselen + pathlen + 1);
-			free(eltbuf);
-			free(newbase);
-			if (retval)
-				return -1;
-			continue;
-		}
-		if (read_one_entry(sha1, base, baselen, path, mode) < 0)
-			return -1;
-	}
-	return 0;
-}
-
-static int read_tree(unsigned char *sha1, const char *base, int baselen)
+static int unpack_tree(unsigned char *sha1)
 {
 	void *buffer;
 	unsigned long size;
+	int ret;
 
-	buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
+	buffer = read_object_with_reference(sha1, "tree", &size, NULL);
 	if (!buffer)
 		return -1;
-	return read_tree_recursive(buffer, size, base, baselen);
+	ret = read_tree(buffer, size, stage);
+	free(buffer);
+	return ret;
 }
 
 static char *lockfile_name;
@@ -216,7 +159,7 @@ static void merge_stat_info(struct cache_entry **src, int nr)
 	}
 }
 
-static char *read_tree_usage = "read-tree (<sha> | -m <sha1> [<sha2> <sha3>])";
+static char *read_tree_usage = "git-read-tree (<sha> | -m <sha1> [<sha2> <sha3>])";
 
 int main(int argc, char **argv)
 {
@@ -251,11 +194,11 @@ int main(int argc, char **argv)
 			merge = 1;
 			continue;
 		}
-		if (get_sha1_hex(arg, sha1) < 0)
+		if (get_sha1(arg, sha1) < 0)
 			usage(read_tree_usage);
 		if (stage > 3)
 			usage(read_tree_usage);
-		if (read_tree(sha1, "", 0) < 0)
+		if (unpack_tree(sha1) < 0)
 			die("failed to unpack tree object %s", arg);
 		stage++;
 	}