git-pull-script: do automatic merges

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