Further clean-up: usage() vs die()

[git.git] / builtin-cat-file.c

diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 8ab136e981d4ba0ed43c6bd9a907c43fd12b8fcd..814fb0743f7a453114991af6c28bb69ef44d4883 100644 (file)
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -94,7 +94,7 @@ static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
        return 0;
 }
 
-int cmd_cat_file(int argc, const char **argv, char **envp)
+int cmd_cat_file(int argc, const char **argv, const char *prefix)
 {
        unsigned char sha1[20];
        char type[20];
@@ -102,7 +102,6 @@ int cmd_cat_file(int argc, const char **argv, char **envp)
        unsigned long size;
        int opt;
 
-       setup_git_directory();
        git_config(git_default_config);
        if (argc != 3)
                usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
@@ -141,7 +140,7 @@ int cmd_cat_file(int argc, const char **argv, char **envp)
 
                /* custom pretty-print here */
                if (!strcmp(type, tree_type))
-                       return execl_git_cmd("ls-tree", argv[2], NULL);
+                       return cmd_ls_tree(2, argv + 1, NULL);
 
                buf = read_sha1_file(sha1, type, &size);
                if (!buf)