X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=d775a1545beb84caf05cae8980fb2d839240fdea;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=3829fb6097ad9840cca7654f0b8a718100d590ac;hpb=19b2860cba5742ab31fd682b80fefefac19be141;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 3829fb60..d775a154 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,23 +12,31 @@ int main(int argc, char **argv)
 	void *buf;
 	unsigned long size;
 
-	if (argc != 3 || get_sha1_hex(argv[2], sha1))
-		usage("cat-file: 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 (!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 */
+	setup_git_directory();
+	if (argc != 3 || get_sha1(argv[2], sha1))
+		usage("git-cat-file [-t | -s | <type>] <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) {
@@ -37,12 +45,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("git-cat-file: %s", strerror(errno));
+		} else if (!ret) {
+			die("git-cat-file: disk full?");
 		}
 		size -= ret;
 		buf += ret;