Make git-cherry-pick in target "all"

[git.git] / cat-file.c

diff --git a/cat-file.c b/cat-file.c
index 0076fc5..d775a15 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,12 +12,21 @@ int main(int argc, char **argv)
        void *buf;
        unsigned long size;
 
+       setup_git_directory();
        if (argc != 3 || get_sha1(argv[2], sha1))
-               usage("git-cat-file [-t | tagname] <sha1>");
+               usage("git-cat-file [-t | -s | <type>] <sha1>");
 
-       if (!strcmp("-t", argv[1])) {
-               if (!sha1_object_info(sha1, type, &size)) {
-                       printf("%s\n", type);
+       if (!strcmp("-t", argv[1]) || !strcmp("-s", argv[1])) {
+               if (!sha1_object_info(sha1, type,
+                                     argv[1][1] == 's' ? &size : NULL)) {
+                       switch (argv[1][1]) {
+                       case 't':
+                               printf("%s\n", type);
+                               break;
+                       case 's':
+                               printf("%lu\n", size);
+                               break;
+                       }
                        return 0;
                }
                buf = NULL;