From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20753 invoked by alias); 22 Nov 2014 17:21:11 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33755 Received: (qmail 10344 invoked from network); 22 Nov 2014 17:21:09 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 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= From: Daniel Hahler To: zsh-workers@zsh.org Subject: [PATCH] vcs_info: test -f .git/rebase-merge/done before reading it Date: Sat, 22 Nov 2014 18:20:52 +0100 Message-Id: <1416676852-3355-1-git-send-email-genml+zsh-workers@thequod.de> X-Mailer: git-send-email 2.1.0 In-Reply-To: <5470C427.4050805@thequod.de> References: <5470C427.4050805@thequod.de> From: Daniel Hahler --- 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