Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] vcs_info: test -f .git/rebase-merge/done before reading it
- X-seq: zsh-workers 33755
- From: Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] vcs_info: test -f .git/rebase-merge/done before reading it
- Date: Sat, 22 Nov 2014 18:20:52 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h= references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=postfix2; t= 1416676860; bh=wnJCHKOfRtYywTvOnyN8Jqd38dHFXdBMXr5pv6POmTM=; b=b AAPDsfQ4YcBIypVIhFmsEqEuk2mqwfKKsv1Vy2ZDYNGi5d+E8QEH72sLhY2uaNfh k69Jh7FuRDGTnz+S4X7wNCxAHY9Cq6Vtp2TAM9YTQWFu+75cBPXIcq1cTJ1d5dO8 a6KOnAZizKqGCzoihbGPHjekfOAJV429uym3EzE4xE=
- In-reply-to: <5470C427.4050805@thequod.de>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- References: <5470C427.4050805@thequod.de>
From: Daniel Hahler <git@xxxxxxxxxx>
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 48d552f..fe1c356 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -204,11 +204,13 @@ then
VCS_INFO_git_handle_patches
elif [[ -d "${gitdir}/rebase-merge" ]]; then
patchdir="${gitdir}/rebase-merge"
- local p
- for p in ${(f)"$(< "${patchdir}/done")"}; do
- # remove action
- git_patches_applied+=("${${(s: :)p}[2,-1]}")
- done
+ if [[ -f ${patchdir}/done ]]; then
+ local p
+ for p in ${(f)"$(< "${patchdir}/done")"}; do
+ # remove action
+ git_patches_applied+=("${${(s: :)p}[2,-1]}")
+ done
+ fi
git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"})
VCS_INFO_git_handle_patches
elif [[ -d "${gitdir}/rebase-apply" ]]; then
--
2.1.0
Messages sorted by:
Reverse Date,
Date,
Thread,
Author