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 ```

Merge pull request #56878 from perotinus/fix-comment-mistake
fa78f344 · Kubernetes Submit Queue · GitHub · d9367542 · e830b539 · fa78f344
Unverified Commit fa78f344 authored Dec 16, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

version.sh hack/lib/version.sh +1 -1

No files found.
--- a/hack/lib/version.sh
+++ b/hack/lib/version.sh
@@ -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: