diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-12-23 01:56:18 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-12-23 01:56:18 +0100 |
| commit | af3a244680a9ab01a4ae9cc4b6ffb0a5b2d98b9c (patch) | |
| tree | 47ee9f0e4900cd4b636de6bb403e805a90ef78db /Functions | |
| parent | ea5d92e0dbe7d86c32bb74a50e1aa574e9c3a504 (diff) | |
| parent | 06b1b7a37a69c9af27f52c9d073c0364bb997dd1 (diff) | |
| download | zsh-af3a244680a9ab01a4ae9cc4b6ffb0a5b2d98b9c.tar.gz zsh-af3a244680a9ab01a4ae9cc4b6ffb0a5b2d98b9c.zip | |
Merge tag 'zsh-5.3.1' into debian
Release 5.3.1.
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 65d8cb182..63109aa46 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -221,7 +221,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then git_patches_applied+=("$p") done if [[ -f "${patchdir}/git-rebase-todo" ]] ; then - git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"}) + git_patches_unapplied=( ${${(f)${"$(<"${patchdir}/git-rebase-todo")"}}:#[#]*} ) fi VCS_INFO_git_handle_patches elif [[ -d "${gitdir}/rebase-apply" ]]; then |