makefile: minor fixes needed to match planned tagging format

We want the makefile to help us embed the version and hash of the git
checkout used for the build. Fix getting the hash when a tag is applied
and when the tag is in the form vX.Y (rather than vX.Y.Z).

Signed-off-by: Shachar Sharon <[email protected]>

Author: synarete

Makefile

@@ -5,8 +5,8 @@
 VERSION?=0.0.1
 
 # Commit info
-COMMIT_ID=$(shell git describe --abbrev=40 --always --dirty=+ 2>/dev/null)
-GIT_VERSION=$(shell git describe --match='v[0-9]*.[0-9].[0-9]' 2>/dev/null || echo "(unset)")
+COMMIT_ID=$(shell git describe --abbrev=40 --always --exclude='*' --dirty=+ 2>/dev/null)
+GIT_VERSION=$(shell git describe --match='v[0-9]*.[0-9]' --match='v[0-9]*.[0-9].[0-9]' 2>/dev/null || echo "(unset)")
 
 GO_CMD:=go
 GOFMT_CMD:=gofmt