From 1f5d9b757f92da1998cdf19427d0ff494871ca87 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Wed, 28 Oct 2020 21:02:47 +0200 Subject: [PATCH] Fix newline and trailing space issues --- aliases/available/terraform.aliases.bash | 1 - aliases/available/terragrunt.aliases.bash | 1 - completion/available/kind.completion.bash | 1 - themes/githelpers.theme.bash | 6 +++--- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/aliases/available/terraform.aliases.bash b/aliases/available/terraform.aliases.bash index af5276de..d62a8c2c 100644 --- a/aliases/available/terraform.aliases.bash +++ b/aliases/available/terraform.aliases.bash @@ -8,4 +8,3 @@ alias tfv='terraform validate' alias tfp='terraform plan' alias tfa='terraform apply' alias tfd='terraform destory' - diff --git a/aliases/available/terragrunt.aliases.bash b/aliases/available/terragrunt.aliases.bash index f1d7e182..9395b351 100644 --- a/aliases/available/terragrunt.aliases.bash +++ b/aliases/available/terragrunt.aliases.bash @@ -13,4 +13,3 @@ alias tgva='terragrunt validate-all' alias tgpa='terragrunt plan-all' alias tgaa='terragrunt apply-all' alias tgda='terragrunt destroy-all' - diff --git a/completion/available/kind.completion.bash b/completion/available/kind.completion.bash index f7b061fe..be12a2d2 100644 --- a/completion/available/kind.completion.bash +++ b/completion/available/kind.completion.bash @@ -3,4 +3,3 @@ if _command_exists kind; then eval "$(kind completion bash)" fi - diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash index 2d5829ff..ba089392 100644 --- a/themes/githelpers.theme.bash +++ b/themes/githelpers.theme.bash @@ -11,7 +11,7 @@ function _git-symbolic-ref { function _git-branch { if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then 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 fi } @@ -19,7 +19,7 @@ function _git-branch { function _git-tag { if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}" - else + else git describe --tags --exact-match 2> /dev/null fi } @@ -40,7 +40,7 @@ function _git-short-sha { function _git-friendly-ref { if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then _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 fi }