From 816084c0acc99cc67cdb0706ab295e107b906e4b Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sun, 11 Dec 2016 04:01:45 +0000 Subject: 40149: vcs_info git: Avoid a fork. --- ChangeLog | 3 +++ Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 53d69d205..8ee4921cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-12-16 Daniel Shahaf + * 40149: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Avoid a fork. + * 40203: Test/B03print.ztst: Resolve 'printf --' question from grandparent commit (thanks Chet). 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 -- cgit 1.4.1