X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=7413feed78f20feb635ad55f098c59a2afc2a54c;hb=d9635e9c539465792b1920437b52fa8792a71650;hp=628f6cada89431acd23d612f7e0b10649348e088;hpb=3d9c54d7b39faab35f0b30459fe4e2c7f32124b8;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 628f6cad..7413feed 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -103,8 +103,10 @@ int main(int argc, char **argv)
 
 	setup_git_directory();
 	git_config(git_default_config);
-	if (argc != 3 || get_sha1(argv[2], sha1))
+	if (argc != 3)
 		usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
+	if (get_sha1(argv[2], sha1))
+		die("Not a valid object name %s", argv[2]);
 
 	opt = 0;
 	if ( argv[1][0] == '-' ) {
@@ -133,8 +135,7 @@ int main(int argc, char **argv)
 		return !has_sha1_file(sha1);
 
 	case 'p':
-		if (get_sha1(argv[2], sha1) ||
-		    sha1_object_info(sha1, type, NULL))
+		if (sha1_object_info(sha1, type, NULL))
 			die("Not a valid object name %s", argv[2]);
 
 		/* custom pretty-print here */