Merge master.kernel.org:/pub/scm/gitk/gitk

diff --git a/cat-file.c b/cat-file.c
index be41f516664bc96ebec77c9ab88c3ab8df02ddfa..ef58970d82ae9d6e62ec43c496ac1677aedeee3f 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,16 +13,22 @@ int main(int argc, char **argv)
        unsigned long size;
 
        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])) {
-               buf = read_sha1_file(sha1, type, &size);
-               if (buf) {
-                       buf = type;
-                       size = strlen(type);
-                       type[size] = '\n';
-                       size++;
+       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;
        } else {
                buf = read_object_with_reference(sha1, argv[1], &size, NULL);
        }