mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-07-20 19:51:02 +02:00
34673: vcs_info git: Fix error message when rebase hasn't started
This commit is contained in:
parent
69ada95acd
commit
57be7b743f
2 changed files with 4 additions and 0 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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]}")
|
||||
|
|
Loading…
Reference in a new issue