Merge http://members.cox.net/junkio/git-jc.git/

diff --git a/ls-tree.c b/ls-tree.c
index bd99f9ac7b2d6dc23c1ec7d8f03877c20afec63f..339ac36a4cad45acd5d6769bed6c8b01c5da453a 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -73,7 +73,7 @@ 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);
@@ -102,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)