* [PATCH] vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.
@ 2016-01-14 0:13 Daniel Shahaf
0 siblings, 0 replies; only message in thread
From: Daniel Shahaf @ 2016-01-14 0:13 UTC (permalink / raw)
To: zsh-workers
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-01-14 0:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-14 0:13 [PATCH] vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case Daniel Shahaf
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).