upstream/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-20 07:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(git-prompt): fix clean prompt when stash is not empty (#9978)

Browse Source 
Fixes #9978
This commit is contained in:
Marc Cornellà 2021-12-29 11:51:05 +01:00
parent 7e4273f440
commit bc7bc74469
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/git-prompt/README.md
View File

@ -11,7 +11,8 @@ plugins=(... git-prompt)
See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
## Prerequisites
## Requirements
This plugin uses `python`, so your host needs to have it installed
## Examples
@ -30,7 +31,7 @@ The prompt may look like the following:
By default, the general appearance of the prompt is:
```
```text
(<branch><branch tracking>|<local status>)
```
@ -58,9 +59,8 @@ The symbols are as follows:
## Customisation
- Set the variable `ZSH_THEME_GIT_PROMPT_CACHE` to any value in order to enable caching.
- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`)
- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`)
to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
to see what variables are available.
**Enjoy!**

2
plugins/git-prompt/gitstatus.py
View File

@ -81,7 +81,7 @@ for st in status:
staged.append(st)
stashed = get_stash()
if not changed and not staged and not conflicts and not untracked and not stashed:
if not changed and not staged and not conflicts and not untracked:
clean = 1
else:
clean = 0