X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=d775a1545beb84caf05cae8980fb2d839240fdea;hb=e24317b4d093e4b148996172d0b749f09a0e6f2e;hp=6bbb0ca0174265626a228b143fe348f4eb186f0c;hpb=11e7d5c594e79258f73c8c2a2e7e90dd60d05ce3;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 6bbb0ca0..d775a154 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,22 +12,30 @@ int main(int argc, char **argv)
 	void *buf;
 	unsigned long size;
 
+	setup_git_directory();
 	if (argc != 3 || get_sha1(argv[2], sha1))
-		usage("cat-file [-t | tagname] <sha1>");
+		usage("git-cat-file [-t | -s | <type>] <sha1>");
 
-	if (!strcmp("-t", argv[1])) {
-		buf = read_sha1_file(sha1, type, &size);
-		if (buf) {
-			buf = type;
-			size = strlen(type);
-			type[size] = '\n';
+	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("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 +45,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;