[PATCH] git-tar-tree: make file contents accessible to write_header()

[git.git] / ls-tree.c

diff --git a/ls-tree.c b/ls-tree.c
index c063640..339ac36 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -24,9 +24,9 @@ static void print_path_prefix(struct path_prefix *prefix)
 }
 
 static void list_recursive(void *buffer,
-                         unsigned char *type,
-                         unsigned long size,
-                         struct path_prefix *prefix)
+                          const unsigned char *type,
+                          unsigned long size,
+                          struct path_prefix *prefix)
 {
        struct path_prefix this_prefix;
        this_prefix.prev = prefix;
@@ -72,12 +72,11 @@ static int list(unsigned char *sha1)
 {
        void *buffer;
        unsigned long size;
-       char type[20];
 
-       buffer = read_sha1_file(sha1, type, &size);
+       buffer = read_object_with_reference(sha1, "tree", &size, 0);
        if (!buffer)
                die("unable to read sha1 file");
-       list_recursive(buffer, type, size, NULL);
+       list_recursive(buffer, "tree", size, NULL);
        return 0;
 }
 
@@ -103,7 +102,7 @@ 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)