Squashed 'gitstatus/' changes from 1c74c8db..0d23fbd1

0d23fbd1 comments
9c19c9c4 fix a typo in install that prevents the locally built gitstatusd from being used
92fd143f doc cleanup

git-subtree-dir: gitstatus
git-subtree-split: 0d23fbd117ad6afe52fdbd96d08cf38f941be4d3
This commit is contained in:
Roman Perepelitsa 2020-06-14 10:29:29 +02:00
commit 0717e57ff4
4 changed files with 15 additions and 13 deletions

View file

@ -103,9 +103,9 @@ function my_set_prompt() {
if gitstatus_query MY && [[ $VCS_STATUS_RESULT == ok-sync ]]; then
RPROMPT=${${VCS_STATUS_LOCAL_BRANCH:-@${VCS_STATUS_COMMIT}}//\%/%%} # escape %
(( $VCS_STATUS_NUM_STAGED )) && RPROMPT+='+'
(( $VCS_STATUS_NUM_UNSTAGED )) && RPROMPT+='!'
(( $VCS_STATUS_NUM_UNTRACKED )) && RPROMPT+='?'
(( VCS_STATUS_NUM_STAGED )) && RPROMPT+='+'
(( VCS_STATUS_NUM_UNSTAGED )) && RPROMPT+='!'
(( VCS_STATUS_NUM_UNTRACKED )) && RPROMPT+='?'
fi
setopt no_prompt_{bang,subst} prompt_percent # enable/disable correct prompt expansions
@ -204,9 +204,9 @@ function my_set_prompt() {
else
PS1+=" @${VCS_STATUS_COMMIT//\\/\\\\}" # escape backslash
fi
[[ "$VCS_STATUS_HAS_STAGED" == 1 ]] && PS1+='+'
[[ "$VCS_STATUS_HAS_UNSTAGED" == 1 ]] && PS1+='!'
[[ "$VCS_STATUS_HAS_UNTRACKED" == 1 ]] && PS1+='?'
(( VCS_STATUS_HAS_STAGED" )) && PS1+='+'
(( VCS_STATUS_HAS_UNSTAGED" )) && PS1+='!'
(( VCS_STATUS_HAS_UNTRACKED" )) && PS1+='?'
fi
PS1+='\n\$ '