From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:33:57 +0000 (-0800)
Subject: Merge branch 'sb/describe-blob'
X-Git-Tag: v2.17.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1ba6846a19b0358ddf4098d44ba5804646c36412

Merge branch 'sb/describe-blob'

"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
---

1ba6846a19b0358ddf4098d44ba5804646c36412
diff --cc t/t6120-describe.sh
index a5d9015024,50029ff6a8..bae78c4e89
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@@ -374,8 -374,12 +374,16 @@@ test_expect_success ULIMIT_STACK_SIZE '
  	test_cmp expect actual
  '
  
 +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