From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2018 21:34:32 +0000 (-0800)
Subject: Merge branch 'sb/describe-blob' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23e4c1394467e8154d554cb44c84604289f5a2e7?hp=43cb0704af1a41c9cba8e9377e413c6a1e7983e2

Merge branch 'sb/describe-blob' into next

"git describe $garbage" stopped giving any errors when the garbage
happens to be a string with 40 hexadecimal letters.

* sb/describe-blob:
describe: confirm that blobs actually exist
---

diff --git a/builtin/describe.c b/builtin/describe.c
index c428984706..e4869df7b4 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -502,7 +502,7 @@ static void describe(const char *arg, int last_one)
 
 	if (cmit)
 		describe_commit(&oid, &sb);
-	else if (lookup_blob(&oid))
+	else if (sha1_object_info(oid.hash, NULL) == OBJ_BLOB)
 		describe_blob(oid, &sb);
 	else
 		die(_("%s is neither a commit nor blob"), arg);
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index a5d9015024..bae78c4e89 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -378,4 +378,12 @@ check_describe tags/A --all A
 check_describe tags/c --all c
 check_describe heads/branch_A --all --match='branch_*' branch_A
 
+test_expect_success 'describe complains about tree object' '
+	test_must_fail git describe HEAD^{tree}
+'
+
+test_expect_success 'describe complains about missing object' '
+	test_must_fail git describe $_z40
+'
+
 test_done