diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 109027b34..bdb177cfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-03-09 Daniel Shahaf <d.s@daniel.shahaf.name> + * 34673: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix error message when rebase hasn't started + * 34693: Completion/Unix/Command/_sudo: sudo completion: Don't false positive 'sudo -e' detection 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]}") |