X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=describe.c;h=aa3434a4cbfe62563b7621ddd7e72be3adbea1cc;hp=ff65742615cb6862d3699e4f301d671a7eadc2e2;hb=HEAD;hpb=521a3f676794987bfd03703fe58fbec46ed69d49

diff --git a/describe.c b/describe.c
index ff657426..aa3434a4 100644
--- a/describe.c
+++ b/describe.c
@@ -67,7 +67,7 @@ static int get_name(const char *path, const unsigned char *sha1)
 	 * Otherwise only annotated tags are used.
 	 */
 	if (!strncmp(path, "refs/tags/", 10)) {
-		if (object->type == tag_type)
+		if (object->type == TYPE_TAG)
 			prio = 2;
 		else
 			prio = 1;
@@ -105,11 +105,11 @@ static void describe(char *arg, int last_one)
 	static int initialized = 0;
 	struct commit_name *n;
 
-	if (get_sha1(arg, sha1) < 0)
-		usage(describe_usage);
+	if (get_sha1(arg, sha1))
+		die("Not a valid object name %s", arg);
 	cmit = lookup_commit_reference(sha1);
 	if (!cmit)
-		usage(describe_usage);
+		die("%s is not a valid '%s' object", arg, commit_type);
 
 	if (!initialized) {
 		initialized = 1;