From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37612-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 28144 invoked by alias); 14 Jan 2016 00:13:48 -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: 37612
Received: (qmail 3422 invoked from network); 14 Jan 2016 00:13:47 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
Date: Thu, 14 Jan 2016 00:13:43 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] vcs_info git: Set $git_patches_unapplied correctly for
 'rebase-apply' case.
Message-ID: <20160114001343.GA23645@tarsus.local2>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)

This manifested, e.g., in 'git am' of a single patch that had a conflict.
---

 Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index e1cee74..472c10d 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -247,7 +247,9 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
             fi
         fi
         local last="$(< "${patchdir}/last")"
-        git_patches_unapplied=( {$cur..$last} )
+        if (( cur+1 <= last )); then
+          git_patches_unapplied=( {$((cur+1))..$last} )
+        fi
     fi
 
     VCS_INFO_git_handle_patches
-- 
2.1.4