From 57be7b743fbd7afb86edaac3ac86ef34182f86b9 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 9 Mar 2015 20:03:05 +0000 Subject: 34673: vcs_info git: Fix error message when rebase hasn't started --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 1 + 1 file changed, 1 insertion(+) (limited to 'Functions') 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]}") -- cgit 1.4.1