Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
bc7bc744
Unverified
Commit
bc7bc744
authored
Dec 29, 2021
by
Marc Cornellà
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(git-prompt): fix clean prompt when stash is not empty (#9978)
Fixes #9978
parent
7e4273f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
README.md
plugins/git-prompt/README.md
+4
-4
gitstatus.py
plugins/git-prompt/gitstatus.py
+1
-1
No files found.
plugins/git-prompt/README.md
View file @
bc7bc744
...
@@ -11,7 +11,8 @@ plugins=(... git-prompt)
...
@@ -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:
...
@@ -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>)
```
```
...
@@ -58,9 +59,8 @@ The symbols are as follows:
...
@@ -58,9 +59,8 @@ The symbols are as follows:
## Customisation
## Customisation
-
Set the variable
`ZSH_THEME_GIT_PROMPT_CACHE`
to any value in order to enable caching.
-
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 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!**
plugins/git-prompt/gitstatus.py
View file @
bc7bc744
...
@@ -81,7 +81,7 @@ for st in status:
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment