X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=d775a1545beb84caf05cae8980fb2d839240fdea;hb=4ddba79db76bd6425f00e99ceb1d82d179319aec;hp=85a5d4caedec271f6c5e71ec3d7337b33447f581;hpb=62bb99606d0377fc14f206cbdf95acb57149d87a;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 85a5d4ca..d775a154 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -12,11 +12,13 @@ int main(int argc, char **argv)
 	void *buf;
 	unsigned long size;
 
+	setup_git_directory();
 	if (argc != 3 || get_sha1(argv[2], sha1))
-		usage("git-cat-file [-t | -s | tagname] <sha1>");
+		usage("git-cat-file [-t | -s | <type>] <sha1>");
 
 	if (!strcmp("-t", argv[1]) || !strcmp("-s", argv[1])) {
-		if (!sha1_object_info(sha1, type, &size)) {
+		if (!sha1_object_info(sha1, type,
+				      argv[1][1] == 's' ? &size : NULL)) {
 			switch (argv[1][1]) {
 			case 't':
 				printf("%s\n", type);