Abstract out the "name <email> date" handling of commit-tree.c

diff --git a/cat-file.c b/cat-file.c
index 3c47d79a16305d326a65768fe9f37ee25928510b..fa0bb722a2455fd4274f61e800cd9f5a764dda1e 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,20 +12,30 @@ int main(int argc, char **argv)
        void *buf;
        unsigned long size;
 
-       if (argc != 3 || get_sha1_hex(argv[2], sha1))
-               usage("cat-file [-t | tagname] <sha1>");
-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf)
-               die("cat-file %s: bad file", argv[2]);
-       if (!strcmp("-t", argv[1])) {
-               buf = type;
-               size = strlen(type);
-               type[size] = '\n';
-               size++;
-       } else if (strcmp(type, argv[1])) {
-               die("cat-file %s: bad tag", argv[2]);
+       if (argc != 3 || get_sha1(argv[2], sha1))
+               usage("git-cat-file [-t | -s | tagname] <sha1>");
+
+       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);
        }
 
+       if (!buf)
+               die("git-cat-file %s: bad file", argv[2]);
+
        while (size > 0) {
                long ret = write(1, buf, size);
                if (ret < 0) {
@@ -34,9 +44,9 @@ int main(int argc, char **argv)
                        /* Ignore epipe */
                        if (errno == EPIPE)
                                break;
-                       die("cat-file: %s", strerror(errno));
+                       die("git-cat-file: %s", strerror(errno));
                } else if (!ret) {
-                       die("cat-file: disk full?");
+                       die("git-cat-file: disk full?");
                }
                size -= ret;
                buf += ret;