mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-27 04:40:59 +01:00
Code Releases Activity

34673: vcs_info git: Fix error message when rebase hasn't started

Browse source
This commit is contained in:
Daniel Shahaf 2015-03-09 20:03:05 +00:00
parent 69ada95acd
commit 57be7b743f
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -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]}")