From ee698fbae3e4663a41da9c3c7abcf24b00edf292 Mon Sep 17 00:00:00 2001 From: Eduardo Bellido Bellido Date: Fri, 1 Aug 2014 00:49:57 +0200 Subject: [PATCH 1/2] Added support to git old versions --- themes/base.theme.bash | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index ef2e5b79..2715a514 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -74,8 +74,8 @@ function git_prompt_vars { SCM_GIT_BEHIND='' SCM_GIT_STASH='' if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then - local status="$(git status -bs --porcelain 2> /dev/null)" - if [[ -n "$(grep -v ^# <<< "${status}")" ]]; then + local status="$(git status --porcelain 2> /dev/null)" + if [[ -n "${status}" ]] && [[ "${status}" != "\n" ]]; then SCM_DIRTY=1 SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY} else @@ -89,9 +89,9 @@ function git_prompt_vars { SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX} SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX} - local ref=$(git symbolic-ref -q --short HEAD 2> /dev/null) + local ref=$(git symbolic-ref -q HEAD 2> /dev/null) if [[ -n "$ref" ]]; then - SCM_BRANCH=$ref + SCM_BRANCH=${ref#refs/heads/} SCM_IS_BRANCH=1 SCM_IS_TAG=0 else @@ -99,7 +99,6 @@ function git_prompt_vars { SCM_IS_TAG=1 SCM_IS_BRANCH=0 fi - # SCM_BRANCH=$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match 2> /dev/null) SCM_CHANGE=$(git rev-parse HEAD 2>/dev/null) local ahead_re='.+ahead ([0-9]+).+' local behind_re='.+behind ([0-9]+).+' From f9448f5ebba43cc4b99f532d8f839efcb36902d0 Mon Sep 17 00:00:00 2001 From: Eduardo Bellido Bellido Date: Wed, 13 Aug 2014 22:47:34 +0200 Subject: [PATCH 2/2] Fix regression in git prompt --- themes/base.theme.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 2715a514..b2d7639d 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -74,7 +74,7 @@ function git_prompt_vars { SCM_GIT_BEHIND='' SCM_GIT_STASH='' if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then - local status="$(git status --porcelain 2> /dev/null)" + local status="$(git status -b --porcelain 2> /dev/null || git status --porcelain 2> /dev/null)" if [[ -n "${status}" ]] && [[ "${status}" != "\n" ]]; then SCM_DIRTY=1 SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}