diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-05-27 22:32:34 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-05-27 22:32:34 +0300 |
| commit | 8c97104c79e7de5c3aa69727c41068e2bb2c91b4 (patch) | |
| tree | 0fc790f5f35fea28a1a1958b4159f8156b72010b /gitstatus | |
| parent | 80b865e73613c6d9d8f7405e9efaefdfc2d484b6 (diff) | |
pull upstream changes from gitstatus
Diffstat (limited to 'gitstatus')
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index 617e6db6..5b2dcb0a 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -181,13 +181,13 @@ function _gitstatus_process_response() { typeset -gi VCS_STATUS_STASHES="${resp[16]}" typeset -g VCS_STATUS_TAG="${resp[17]}" typeset -gi VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 0)) - if (( dirty_max_index_size >= 0 && VCS_STATUS_INDEX_SIZE > dirty_max_index_size )); then + (( dirty_max_index_size >= 0 && VCS_STATUS_INDEX_SIZE > dirty_max_index_size )) && { typeset -gi VCS_STATUS_HAS_UNSTAGED=-1 typeset -gi VCS_STATUS_HAS_UNTRACKED=-1 - else + } || { typeset -gi VCS_STATUS_HAS_UNSTAGED=$((VCS_STATUS_NUM_UNSTAGED > 0)) typeset -gi VCS_STATUS_HAS_UNTRACKED=$((VCS_STATUS_NUM_UNTRACKED > 0)) - fi + } } || { (( ours )) && VCS_STATUS_RESULT=norepo-sync || VCS_STATUS_RESULT=norepo-async unset VCS_STATUS_WORKDIR |