diff options
| author | Sven Lito <me@svenlito.com> | 2010-10-09 18:56:51 +0100 |
|---|---|---|
| committer | Sven Lito <me@svenlito.com> | 2010-10-09 18:56:51 +0100 |
| commit | 8bef74081e9dda6e1d6c5854c2fcedb9145031ba (patch) | |
| tree | 83b0adc4084a0c4d3948a34d21796dab9e811d69 /lib | |
| parent | 425b0ef89fcd40b6b235347e32d8efd44709a802 (diff) | |
| parent | df126ef5ba7461fb227a0fa39c3d416d94b08931 (diff) | |
| download | zsh-8bef74081e9dda6e1d6c5854c2fcedb9145031ba.tar.gz zsh-8bef74081e9dda6e1d6c5854c2fcedb9145031ba.tar.bz2 zsh-8bef74081e9dda6e1d6c5854c2fcedb9145031ba.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/functions.zsh | 2 | ||||
| -rw-r--r-- | lib/git.zsh | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/lib/functions.zsh b/lib/functions.zsh index 561586cba..e494f1f4d 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -5,7 +5,7 @@ function title { print -nR $'\033k'$1$'\033'\\\ print -nR $'\033]0;'$2$'\a' - elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then + elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then # Use this one instead for XTerms: print -nR $'\033]0;'$*$'\a' fi diff --git a/lib/git.zsh b/lib/git.zsh index 889dd98df..57a78e27f 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -11,3 +11,31 @@ parse_git_dirty () { echo "$ZSH_THEME_GIT_PROMPT_CLEAN" fi } + +# get the status of the working tree +git_prompt_status() { + INDEX=$(git status --porcelain 2> /dev/null) + STATUS="" + if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" + fi + if $(echo "$INDEX" | grep '^A ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" + elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" + fi + if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" + fi + if $(echo "$INDEX" | grep '^R ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS" + fi + if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" + fi + if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" + fi + echo $STATUS +} + |