diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-01-24 17:19:53 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-01-24 17:19:53 +0100 |
| commit | 86ca06fb4b5a835caac37700952207db4c5073cd (patch) | |
| tree | c2686e6d126d59052310c6bb7cd8df6d76fa0fca /Functions/VCS_Info/Backends | |
| parent | 370659ae9ae918a07a7950bbc2827b2593126f7d (diff) | |
| parent | d18ce35d060163ea0d531170b65e1c38311af166 (diff) | |
| download | zsh-86ca06fb4b5a835caac37700952207db4c5073cd.tar.gz zsh-86ca06fb4b5a835caac37700952207db4c5073cd.zip | |
Merge branch 'upstream' at 5.2-dev-1 into debian
Diffstat (limited to 'Functions/VCS_Info/Backends')
| -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 |
2 files changed, 5 insertions, 3 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 |