mirror of https://github.com/status-im/consul.git
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:
commit
eedccc4ca0
|
@ -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)"
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ func GetVersion() string {
|
|||
if GitDescribe == "" && release == "" {
|
||||
release = "dev"
|
||||
}
|
||||
|
||||
if release != "" {
|
||||
version += fmt.Sprintf("-%s", release)
|
||||
if GitCommit != "" {
|
||||
|
|
Loading…
Reference in New Issue