diff options
Diffstat (limited to 'Functions/VCS_Info')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 4 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_maxexports | 2 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_nvcsformats | 1 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_set | 2 | ||||
| -rw-r--r-- | Functions/VCS_Info/vcs_info | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 index 377453f6a..95a534786 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 +++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 @@ -2,7 +2,7 @@ ## perforce support by: Phil Pennock ## Distributed under the same BSD-ish license as zsh itself. -# If user-server is true in the :vcs_info:p4:... context, contact the +# If use-server is true in the :vcs_info:p4:... context, contact the # server to decide whether the directory is handled by Perforce. This can # cause a delay if the network times out, in particular if looking up the # server name failed. Hence this is not the default. If a timeout @@ -10,7 +10,7 @@ # vcs_info_p4_dead_servers and the server is never contacted again. The # array must be edited by hand to remove it. # -# If user-server is false or not set, the function looks to see if there is +# If use-server is false or not set, the function looks to see if there is # a file $P4CONFIG somewhere above in the hierarchy. This is far from # foolproof; in fact it relies on you using the particular working practice # of having such files in all client root directories and nowhere above. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index e1cee7439..472c10d5d 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -247,7 +247,9 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then fi fi local last="$(< "${patchdir}/last")" - git_patches_unapplied=( {$cur..$last} ) + if (( cur+1 <= last )); then + git_patches_unapplied=( {$((cur+1))..$last} ) + fi fi VCS_INFO_git_handle_patches diff --git a/Functions/VCS_Info/VCS_INFO_maxexports b/Functions/VCS_Info/VCS_INFO_maxexports index ea952517f..d697b9abd 100644 --- a/Functions/VCS_Info/VCS_INFO_maxexports +++ b/Functions/VCS_Info/VCS_INFO_maxexports @@ -2,7 +2,7 @@ ## Written by Frank Terbeck <ft@bewatermyfriend.org> ## Distributed under the same BSD-ish license as zsh itself. -setopt localoptions NO_shwordsplit +setopt localoptions NO_shwordsplit unset zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" "max-exports" maxexports || maxexports=2 if [[ ${maxexports} != <-> ]] || (( maxexports < 1 )); then diff --git a/Functions/VCS_Info/VCS_INFO_nvcsformats b/Functions/VCS_Info/VCS_INFO_nvcsformats index 203a86d23..581aa5a97 100644 --- a/Functions/VCS_Info/VCS_INFO_nvcsformats +++ b/Functions/VCS_Info/VCS_INFO_nvcsformats @@ -4,7 +4,6 @@ setopt localoptions noksharrays NO_shwordsplit local c v rr -local -a msgs if [[ $1 == '-preinit-' ]] ; then c='default' diff --git a/Functions/VCS_Info/VCS_INFO_set b/Functions/VCS_Info/VCS_INFO_set index 484c7937d..e3f62ceef 100644 --- a/Functions/VCS_Info/VCS_INFO_set +++ b/Functions/VCS_Info/VCS_INFO_set @@ -2,7 +2,7 @@ ## Written by Frank Terbeck <ft@bewatermyfriend.org> ## Distributed under the same BSD-ish license as zsh itself. -setopt localoptions noksharrays NO_shwordsplit +setopt localoptions noksharrays NO_shwordsplit unset local -i i j if [[ $1 == '--nvcs' ]] ; then diff --git a/Functions/VCS_Info/vcs_info b/Functions/VCS_Info/vcs_info index 628dde9b1..f13f6b501 100644 --- a/Functions/VCS_Info/vcs_info +++ b/Functions/VCS_Info/vcs_info @@ -10,7 +10,7 @@ setopt localoptions noksharrays extendedglob NO_shwordsplit local file func sys -local -a static_functions +local -a static_functions msgs local -i maxexports static_functions=( |