From: xiaogaozi Date: Fri, 4 May 2012 14:51:48 +0000 (+0800) Subject: Change the test expression of Git X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=cd7eaaa066d74588a9508c335240ed3e0248fab3;p=common%2Fbash_it.git Change the test expression of Git --- diff --git a/.gitignore b/.gitignore index 32e62de..25042cb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ aliases/custom.aliases.bash lib/custom.bash plugins/custom.plugins.bash *.swp +.*.un~ diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 15bd4aa..f096fda 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -31,7 +31,7 @@ RBFU_THEME_PROMPT_PREFIX=' |' RBFU_THEME_PROMPT_SUFFIX='|' function scm { - if [[ -d .git ]]; then SCM=$SCM_GIT + if [[ -f .git/HEAD ]]; then SCM=$SCM_GIT elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$SCM_GIT elif [[ -d .hg ]]; then SCM=$SCM_HG elif [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG