IlanCosman/tide
1
1
Fork 0
mirror of https://github.com/IlanCosman/tide.git synced 2024-11-22 23:03:26 +03:00
Code Issues Projects Releases Wiki Activity

Add --no-optional-locks to background git status

Browse Source
This commit is contained in:
Ilan Cosman 2021-04-04 20:04:09 -07:00
parent 85d1741f40
commit 8e1dbc1870
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/_tide_item_git.fish
View File

@ -46,10 +46,10 @@ function _tide_item_git
test "$upstreamAhead" = 0 && set -e upstreamAhead
# Git status/stash
test "$isInsideGitDir" = true && set -l gitOptions "-C $gitDir/.."
test "$isInsideGitDir" = true && set -l gitSetDirOption "-C $gitDir/.."
set -l gitInfo (git $gitOptions status --porcelain)
set -l stash (git $gitOptions stash list | count) || set -e stash
set -l gitInfo (git $gitSetDirOption --no-optional-locks status --porcelain)
set -l stash (git $gitSetDirOption stash list | count) || set -e stash
set -l conflicted (string match --regex '^UU' $gitInfo | count) || set -e conflicted
set -l staged (string match --regex '^[ADMR].' $gitInfo | count) || set -e staged
set -l dirty (string match --regex '^.[ADMR]' $gitInfo | count) || set -e dirty