25a2f029a48fee31c67b64de2b8c24d70beebd4b
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge pull request #1399 from tresni/patch-1
Update themes/minimal.zsh-theme
Diff
1diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
2index ee3ab6b224a097a3072d894ac111d11adc7bf77c..a2a16031f9c886975eba293f7b876a40c20d805e 100644
3--- a/themes/minimal.zsh-theme
4+++ b/themes/minimal.zsh-theme
5@@ -1,15 +1,18 @@
6 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
7-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
8-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
9-ZSH_THEME_GIT_PROMPT_CLEAN=""
10+ZSH_THEME_GIT_PROMPT_SUFFIX=""
11+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} "
12+ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
13+ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
14+ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
15+ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
16+ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
17
18-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
19-git_custom_status() {
20- local cb=$(current_branch)
21- if [ -n "$cb" ]; then
22- echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
23- fi
24+vcs_status() {
25+ if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
26+ svn_prompt_info
27+ else
28+ git_prompt_info
29+ fi
30 }
31
32-
33-PROMPT='%2~ $(git_custom_status) »%b '
34+PROMPT='%2~ $(vcs_status)»%b '