X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=ls-tree.c;h=30dfcddf74b2d97d9ee2d54bfbb5bfa5cb3160ee;hb=de809dbbce497e0d107562615c1d85ff35b4e0c5;hp=bd99f9ac7b2d6dc23c1ec7d8f03877c20afec63f;hpb=23b127ed085cbe2f853ce63b53c732a7b9e6de74;p=git.git

diff --git a/ls-tree.c b/ls-tree.c
index bd99f9ac..30dfcddf 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -24,7 +24,7 @@ static void print_path_prefix(struct path_prefix *prefix)
 }
 
 static void list_recursive(void *buffer,
-			   const unsigned char *type,
+			   const char *type,
 			   unsigned long size,
 			   struct path_prefix *prefix)
 {
@@ -73,14 +73,15 @@ static int list(unsigned char *sha1)
 	void *buffer;
 	unsigned long size;
 
-	buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
+	buffer = read_object_with_reference(sha1, "tree", &size, 0);
 	if (!buffer)
 		die("unable to read sha1 file");
 	list_recursive(buffer, "tree", size, NULL);
+	free(buffer);
 	return 0;
 }
 
-static const char *ls_tree_usage = "ls-tree [-r] [-z] <key>";
+static const char *ls_tree_usage = "git-ls-tree [-r] [-z] <key>";
 
 int main(int argc, char **argv)
 {
@@ -102,11 +103,8 @@ int main(int argc, char **argv)
 
 	if (argc != 2)
 		usage(ls_tree_usage);
-	if (get_sha1_hex(argv[1], sha1) < 0)
+	if (get_sha1(argv[1], sha1) < 0)
 		usage(ls_tree_usage);
-	sha1_file_directory = getenv(DB_ENVIRONMENT);
-	if (!sha1_file_directory)
-		sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
 	if (list(sha1) < 0)
 		die("list failed");
 	return 0;