diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-03-09 20:03:05 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-03-09 20:03:37 +0000 |
| commit | 57be7b743fbd7afb86edaac3ac86ef34182f86b9 (patch) | |
| tree | 0c8e1b17f24dd81ffca5f2691fe8b04feb3ed39d /Functions/VCS_Info/Backends | |
| parent | 69ada95acd9cb5c5ea51277f23739affe13cc1fb (diff) | |
| download | zsh-57be7b743fbd7afb86edaac3ac86ef34182f86b9.tar.gz zsh-57be7b743fbd7afb86edaac3ac86ef34182f86b9.tar.xz zsh-57be7b743fbd7afb86edaac3ac86ef34182f86b9.zip | |
34673: vcs_info git: Fix error message when rebase hasn't started
Diffstat (limited to 'Functions/VCS_Info/Backends')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 48d552f68..c348da2a7 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -205,6 +205,7 @@ then elif [[ -d "${gitdir}/rebase-merge" ]]; then patchdir="${gitdir}/rebase-merge" local p + [[ -f "${patchdir}/done" ]] && for p in ${(f)"$(< "${patchdir}/done")"}; do # remove action git_patches_applied+=("${${(s: :)p}[2,-1]}") |