Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.

X-seq: zsh-workers 37612
From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: [PATCH] vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.
Date: Thu, 14 Jan 2016 00:13:43 +0000
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

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

Messages sorted by: Reverse Date, Date, Thread, Author