diff options
| author | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
|---|---|---|
| committer | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
| commit | 18ef1ee6481dbeca4fbecf3de627f946860ffd5a (patch) | |
| tree | cb07e72538c470bb486596d955c7912c5b05e23e /themes/steeef.zsh-theme | |
| parent | eafd5f325208421b82a770e57441dd1063eb5745 (diff) | |
| parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
| download | zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.gz zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.bz2 zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.zip | |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'themes/steeef.zsh-theme')
| -rw-r--r-- | themes/steeef.zsh-theme | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme index e0080b8a5..13728ca9a 100644 --- a/themes/steeef.zsh-theme +++ b/themes/steeef.zsh-theme @@ -7,14 +7,14 @@ # git untracked files modification from Brian Carper: # http://briancarper.net/blog/570/git-info-in-your-zsh-prompt +export VIRTUAL_ENV_DISABLE_PROMPT=1 + function virtualenv_info { [ $VIRTUAL_ENV ] && echo '('$fg[blue]`basename $VIRTUAL_ENV`%{$reset_color%}') ' } PR_GIT_UPDATE=1 setopt prompt_subst -autoload colors -colors autoload -U add-zsh-hook autoload -Uz vcs_info @@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd function steeef_precmd { if [[ -n "$PR_GIT_UPDATE" ]] ; then # check for untracked files or updated submodules, since vcs_info doesn't - if git ls-files --other --exclude-standard --directory 2> /dev/null | grep -q "."; then + if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then PR_GIT_UPDATE=1 FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})" else |