From d17f90ee627076d06a75dbcbc8ede87078615e9e Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 26 Nov 2015 16:02:37 +0100 Subject: [PATCH] conformance: support annotated tags The former code listed all tags with show-ref which lists the actual tag commit hash for annotated tags, not the dereferences hash. Although through `-d` git-show-ref can also dereference annotated tags, this complicated the command even more due do addition unpadding of the found tags. Anyway, this code does the same in one command, available since git 1.7. --- hack/conformance-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/conformance-test.sh b/hack/conformance-test.sh index ee16a6bb1a..68f2359aaa 100755 --- a/hack/conformance-test.sh +++ b/hack/conformance-test.sh @@ -70,7 +70,7 @@ echo -n "Conformance test SHA:" HEAD_SHA=$(git rev-parse HEAD) echo $HEAD_SHA echo "Conformance test version tag(s):" -git show-ref | grep $HEAD_SHA | grep refs/tags +git tag --points-at $HEAD_SHA echo echo "Conformance test checking conformance with Kubernetes version 1.0"