Do not report size of the object that cannot be written in local-pull.c

diff --git a/cat-file.c b/cat-file.c
index 6bbb0ca0174265626a228b143fe348f4eb186f0c..be41f516664bc96ebec77c9ab88c3ab8df02ddfa 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
        unsigned long size;
 
        if (argc != 3 || get_sha1(argv[2], sha1))
-               usage("cat-file [-t | tagname] <sha1>");
+               usage("git-cat-file [-t | tagname] <sha1>");
 
        if (!strcmp("-t", argv[1])) {
                buf = read_sha1_file(sha1, type, &size);
@@ -21,13 +21,14 @@ int main(int argc, char **argv)
                        buf = type;
                        size = strlen(type);
                        type[size] = '\n';
+                       size++;
                }
        } else {
                buf = read_object_with_reference(sha1, argv[1], &size, NULL);
        }
 
        if (!buf)
-               die("cat-file %s: bad file", argv[2]);
+               die("git-cat-file %s: bad file", argv[2]);
 
        while (size > 0) {
                long ret = write(1, buf, size);
@@ -37,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;