mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-18 03:40:08 +00:00
fix(git-prompt): fix clean prompt when stash is not empty (#9978)
Fixes #9978
This commit is contained in:
parent
7e4273f440
commit
bc7bc74469
2 changed files with 5 additions and 5 deletions
|
@ -11,7 +11,8 @@ plugins=(... git-prompt)
|
||||||
|
|
||||||
See the [original repository](https://github.com/olivierverdier/zsh-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
|
This plugin uses `python`, so your host needs to have it installed
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
@ -30,7 +31,7 @@ The prompt may look like the following:
|
||||||
|
|
||||||
By default, the general appearance of the prompt is:
|
By default, the general appearance of the prompt is:
|
||||||
|
|
||||||
```
|
```text
|
||||||
(<branch><branch tracking>|<local status>)
|
(<branch><branch tracking>|<local status>)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -62,5 +63,4 @@ The symbols are as follows:
|
||||||
to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
|
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.
|
to see what variables are available.
|
||||||
|
|
||||||
|
|
||||||
**Enjoy!**
|
**Enjoy!**
|
||||||
|
|
|
@ -81,7 +81,7 @@ for st in status:
|
||||||
staged.append(st)
|
staged.append(st)
|
||||||
|
|
||||||
stashed = get_stash()
|
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
|
clean = 1
|
||||||
else:
|
else:
|
||||||
clean = 0
|
clean = 0
|
||||||
|
|
Loading…
Reference in a new issue