Fix newline and trailing space issues

pull/1687/head
Noah Gorny 2020-10-28 21:02:47 +02:00 committed by Noah Gorny
parent 507e4bec82
commit 1f5d9b757f
4 changed files with 3 additions and 6 deletions

View File

@ -8,4 +8,3 @@ alias tfv='terraform validate'
alias tfp='terraform plan' alias tfp='terraform plan'
alias tfa='terraform apply' alias tfa='terraform apply'
alias tfd='terraform destory' alias tfd='terraform destory'

View File

@ -13,4 +13,3 @@ alias tgva='terragrunt validate-all'
alias tgpa='terragrunt plan-all' alias tgpa='terragrunt plan-all'
alias tgaa='terragrunt apply-all' alias tgaa='terragrunt apply-all'
alias tgda='terragrunt destroy-all' alias tgda='terragrunt destroy-all'

View File

@ -3,4 +3,3 @@
if _command_exists kind; then if _command_exists kind; then
eval "$(kind completion bash)" eval "$(kind completion bash)"
fi fi

View File

@ -11,7 +11,7 @@ function _git-symbolic-ref {
function _git-branch { function _git-branch {
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
test -n "${VCS_STATUS_LOCAL_BRANCH}" && echo "${VCS_STATUS_LOCAL_BRANCH}" || return 1 test -n "${VCS_STATUS_LOCAL_BRANCH}" && echo "${VCS_STATUS_LOCAL_BRANCH}" || return 1
else else
git symbolic-ref -q --short HEAD 2> /dev/null || return 1 git symbolic-ref -q --short HEAD 2> /dev/null || return 1
fi fi
} }
@ -19,7 +19,7 @@ function _git-branch {
function _git-tag { function _git-tag {
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}" test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}"
else else
git describe --tags --exact-match 2> /dev/null git describe --tags --exact-match 2> /dev/null
fi fi
} }
@ -40,7 +40,7 @@ function _git-short-sha {
function _git-friendly-ref { function _git-friendly-ref {
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
_git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatus _git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatus
else else
_git-branch || _git-tag || _git-commit-description || _git-short-sha _git-branch || _git-tag || _git-commit-description || _git-short-sha
fi fi
} }