von/vdotfiles
1
0
Fork 0
Code Activity

zsh: rely on locks from git

Browse source
This commit is contained in:
Von Random 2022-08-21 04:43:39 +03:00
parent 6580a41ea6
commit 1eceb3a264
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zsh/prompt-powerline.zsh
View file

@ -109,7 +109,7 @@ precmd.prompt.ro() {
} }
precmd.is_git_repo() { precmd.is_git_repo() {
typeset -g prompt_git_dir typeset prompt_git_dir
prompt_git_dir=$(git rev-parse --git-dir 2>/dev/null) || return 1 prompt_git_dir=$(git rev-parse --git-dir 2>/dev/null) || return 1
[[ ! -e $prompt_git_dir/nozsh ]] [[ ! -e $prompt_git_dir/nozsh ]]
} }
@ -120,7 +120,7 @@ precmd.prompt.pre_git() {
precmd.prompt.git() { precmd.prompt.git() {
typeset raw_status typeset raw_status
raw_status=$(flock -n $prompt_git_dir git --no-optional-locks status --porcelain -bu 2>/dev/null) || return 0 raw_status=$(git status --porcelain -bu 2>/dev/null) || return 0
typeset -A count typeset -A count
typeset branch_status git_status_string IFS= typeset branch_status git_status_string IFS=