diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-09 09:03:02 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-09 09:03:02 -0800 |
| commit | d8162cdded893abd83b31a8107ee604ecd45c719 (patch) | |
| tree | 78e5b40fb1f3dc9c2b61c1a7aa42689a22e0645d | |
| parent | 6d7a275972918bf535e80a688914ba8f39f65110 (diff) | |
| parent | b9a989fea5f0462b3ced71a33abd3cec3e7809cb (diff) | |
| download | zsh-d8162cdded893abd83b31a8107ee604ecd45c719.tar.gz zsh-d8162cdded893abd83b31a8107ee604ecd45c719.tar.bz2 zsh-d8162cdded893abd83b31a8107ee604ecd45c719.zip | |
Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
| -rw-r--r-- | lib/git.zsh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 95dd3dd43..b1dfce357 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -85,6 +85,9 @@ git_prompt_status() { elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" fi + if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then + STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS" + fi if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" fi @@ -102,7 +105,7 @@ git_prompt_status() { #compare the provided version of git to the version installed and on path #prints 1 if input version <= installed version -#prints -1 otherwise +#prints -1 otherwise function git_compare_version() { local INPUT_GIT_VERSION=$1; local INSTALLED_GIT_VERSION |