Make fetch/pull scripts terminate cleanly on errors

diff --git a/cat-file.c b/cat-file.c
index d253ff93807fa9bbd66e7cd278f213e06644c31e..be41f516664bc96ebec77c9ab88c3ab8df02ddfa 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,19 +13,23 @@ int main(int argc, char **argv)
        unsigned long size;
 
        if (argc != 3 || get_sha1(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]);
+               usage("git-cat-file [-t | tagname] <sha1>");
+
        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]);
+               buf = read_sha1_file(sha1, type, &size);
+               if (buf) {
+                       buf = type;
+                       size = strlen(type);
+                       type[size] = '\n';
+                       size++;
+               }
+       } 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 +38,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;