Fix stash during git action #535
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mafredri
reviewed
Feb 27, 2020
| @@ -365,6 +352,10 @@ prompt_pure_async_git_arrows() { | |||
| command git rev-list --left-right --count HEAD...@'{u}' | |||
| } | |||
|
|
|||
| prompt_pure_async_git_stash() { | |||
There was a problem hiding this comment.
Not really requesting a change here as I don't mind doing this as an extra async task, but it should be quite a lightweight command and there could be a little bit of extra overhead in doing this as a separate async task.
There was a problem hiding this comment.
Maybe. Making it async seems like a safer bet.
| @@ -447,6 +436,11 @@ prompt_pure_async_refresh() { | |||
| # Check check if there is anything to pull. | |||
| async_job "prompt_pure" prompt_pure_async_git_dirty ${PURE_GIT_UNTRACKED_DIRTY:-1} | |||
| fi | |||
|
|
|||
| # If stash is enabled, tell async worker to count stashes | |||
| if zstyle -t ":prompt:pure:git:stash" show; then | |||
There was a problem hiding this comment.
I guess this doesn't support removing the stash symbol if the user sets it to false after it has been enabled?
There was a problem hiding this comment.
Right. I'll add else unset prompt_pure_git_stash
camsteffen
force-pushed
the
fix-stash
branch
from
213d042
to
bee95b6
Compare
mafredri
approved these changes
Apr 13, 2020
There was a problem hiding this comment.
Looks great @camsteffen, thanks! We need to incorporate the fix for implicit global variable but other than that, this is great.
Co-Authored-By: Mathias Fredriksson <mafredri@gmail.com>
sileht
pushed a commit
to sileht/pure
that referenced
this pull request
Apr 18, 2020
Co-authored-by: Sindre Sorhus <sindresorhus@gmail.com> Co-authored-by: Mathias Fredriksson <mafredri@gmail.com>
wezzynl
added a commit
to wezzynl/pure
that referenced
this pull request
May 1, 2020
* upstream/master: 1.12.0 Respawn Pure async worker on crash (sindresorhus#543) Use HTTPS links Fix stash during git action (sindresorhus#535) Move Git action after dirty with space and default color (sindresorhus#506)
wezzynl
added a commit
to wezzynl/pure
that referenced
this pull request
Sep 28, 2020
…ster * 'master' of https://github.com/sindresorhus/pure: 1.14.0 More system report improvements (sindresorhus#568) Use GIT_OPTIONAL_LOCKS=0 instead of --no-optional-locks (sindresorhus#569) Show user@host when running in a container (sindresorhus#564) Update zsh-async to v1.8.4 (sindresorhus#566) Add zsh-async version to system report (sindresorhus#567) Bump Pure internal version when publishing package (sindresorhus#565) Update readme.md 1.13.0 Respect Git config `status.showUntrackedFiles` (sindresorhus#542) Add forivall/pure to Ports section in the readme (sindresorhus#556) Fix '--no-optional-locks' argument position (sindresorhus#553) Eliminate unnecessary Git locking (sindresorhus#549) Readme tweaks 1.12.0 Respawn Pure async worker on crash (sindresorhus#543) Use HTTPS links Fix stash during git action (sindresorhus#535) Move Git action after dirty with space and default color (sindresorhus#506)
kutsan
pushed a commit
to kutsan/pure
that referenced
this pull request
Jun 19, 2023
Co-authored-by: Sindre Sorhus <sindresorhus@gmail.com> Co-authored-by: Mathias Fredriksson <mafredri@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #532.
I removed the
%maction fromvcs_infoand instead just added another async task. The%mseems to include extra, unneeded functionality.