Merge pull request #2192 from hashicorp/f-short-sha

Switches to the short form of the SHA for the build info.
This commit is contained in:
James Phillips 2016-07-19 15:20:12 -07:00 committed by GitHub
commit 79726d35e4
2 changed files with 1 additions and 2 deletions

View File

@ -15,7 +15,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
cd "$DIR"
# Get the git commit
GIT_COMMIT="$(git rev-parse HEAD)"
GIT_COMMIT="$(git rev-parse --short HEAD)"
GIT_DIRTY="$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)"
GIT_DESCRIBE="$(git describe --tags --always)"

View File

@ -30,7 +30,6 @@ func GetVersion() string {
if GitDescribe == "" && release == "" {
release = "dev"
}
if release != "" {
version += fmt.Sprintf("-%s", release)
if GitCommit != "" {