From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-34673-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 17914 invoked by alias); 7 Mar 2015 04:21:46 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 34673
Received: (qmail 29541 invoked from network); 7 Mar 2015 04:21:45 -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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	daniel.shahaf.name; h=x-sasl-enc:date:from:to:subject:message-id
	:mime-version:content-type; s=mesmtp; bh=1wPasKFZMA6DoT7GOoFzsQ8
	zLwI=; b=ljYbFaJ2FMhD6NgaMIXsXZLX+ilFhdsILXSYazyN3VuwaxCVVCpJHAl
	9nI9MhAgdVeVGY4OAw9ICW8ZqWb9cwN1ZxPJ87kcNgiztfbDWL9FoYtBFg6XqGhP
	YWk3X++F3ijS2+GX7HScezmRyGmf9/1OV0C5ShYyqzpAtvCS6jf8=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	messagingengine.com; h=x-sasl-enc:date:from:to:subject
	:message-id:mime-version:content-type; s=smtpout; bh=1wPasKFZMA6
	DoT7GOoFzsQ8zLwI=; b=ftbVYHduT5QpFIVIyt3YTjMDBpvUFLaji6R6hb8+8sf
	G/AHp1t4fG2AJW8fFm7vZECDabe4U7fMMtn5KIap24Kt4SdO4dKIgRIlbDyOm9rB
	JOjqW0uLeYvl4oSqP4KDpZzWQBxLGaOPFIeRZ+U7X2ukNApxbFrJwOE8cVQFwyH0
	=
X-Sasl-enc: wk/XoxvRRKWd70Q+R7BpYMHKztjqr1Btv6SGUtuh3FNa 1425702103
Date: Sat, 7 Mar 2015 04:21:40 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] vcs_info git: error before start of rebase
Message-ID: <20150307042140.GE2206@tarsus.local2>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

The following:

    1. git rebase -i HEAD^
    2. While editor is running, open a shell.

... results in a warning message before the prompt:

    VCS_INFO_get_data_git:208: no such file or directory: .git/rebase-merge/done                                                                             
Proposed fix:

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 48d552f..c348da2 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -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]}")

Cheers,

Daniel