Skip to content

Commit

Permalink
Merge pull request #61120 from ixdy/automated-cherry-pick-of-#61068-u…
Browse files Browse the repository at this point in the history
…pstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #61068: Exclude commas when pulling the tag out of the git

Cherry pick of #61068 on release-1.9.

#61068: Exclude commas when pulling the tag out of the git
  • Loading branch information
Kubernetes Submit Queue committed Mar 16, 2018
2 parents 1223fbf + 280851e commit 1935aca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hack/lib/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kube::version::get_version_vars() {
# When a 'git archive' is exported, the '$Format:%D$' below will look
# something like 'HEAD -> release-1.8, tag: v1.8.3' where then 'tag: '
# can be extracted from it.
if [[ '$Format:%D$' =~ tag:\ (v[^ ]+) ]]; then
if [[ '$Format:%D$' =~ tag:\ (v[^ ,]+) ]]; then
KUBE_GIT_VERSION="${BASH_REMATCH[1]}"
fi
fi
Expand Down

0 comments on commit 1935aca

Please sign in to comment.