kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2018-02-27 10:33:57 -08:00
parent 796a788a1c a8e7a2bf0f
commit 1ba6846a19
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/describe.c
View File

@ -502,7 +502,7 @@ static void describe(const char *arg, int last_one)


if (cmit) if (cmit)
describe_commit(&oid, &sb); describe_commit(&oid, &sb);
else if (lookup_blob(&oid)) else if (sha1_object_info(oid.hash, NULL) == OBJ_BLOB)
describe_blob(oid, &sb); describe_blob(oid, &sb);
else else
die(_("%s is neither a commit nor blob"), arg); die(_("%s is neither a commit nor blob"), arg);

8
t/t6120-describe.sh
View File

@ -378,4 +378,12 @@ check_describe tags/A --all A
check_describe tags/c --all c check_describe tags/c --all c
check_describe heads/branch_A --all --match='branch_*' branch_A 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 test_done