github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56878 from perotinus/fix-comment-mistake 

Automatic merge from submit-queue (batch tested with PRs 54902, 56831, 56702, 56287, 56878). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix a comment in hack/lib/version.sh about which tags are used to get the version

The `--tags` flag to `git describe` specifically adds in lightweight tags. This just makes the comment correct.

Alternatively, that flag could be removed from the command, but I think that requires more detailed thinking.

**Release note**:
```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-12-16 09:33:45 -08:00 committed by GitHub
parent d936754269 e830b5390b
commit fa78f3445d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/version.sh
View File

@ -62,7 +62,7 @@ kube::version::get_version_vars() {
fi
fi
# Use git describe to find the version based on annotated tags.
# Use git describe to find the version based on tags.
if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$("${git[@]}" describe --tags --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then
# This translates the "git describe" to an actual semver.org
# compatible semantic version that looks something like this: