diff options
| author | Marc Finet <m.dreadlock@gmail.com> | 2014-09-12 23:30:37 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2014-09-14 12:02:36 +0200 |
| commit | 5e40996891e0eaa9d35177e5e848a4b46d47b97e (patch) | |
| tree | 12200ff0fa3620a9c5cb86c898783c4d96386ab9 | |
| parent | ffd439b69b49c2762eaee888d622d7e843103c62 (diff) | |
| download | zsh-5e40996891e0eaa9d35177e5e848a4b46d47b97e.tar.gz zsh-5e40996891e0eaa9d35177e5e848a4b46d47b97e.tar.xz zsh-5e40996891e0eaa9d35177e5e848a4b46d47b97e.zip | |
33147: vcs_info git: detect revert or cherry-pick with multiple commits
When revert or cherry-pick involve many commits the .git/sequencer directory holds context for the action and no CHERRY_PICK_HEAD exist.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5bf50a499..00896da50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * 33151: Completion/Unix/Command/_git: completion git: support aliases when \n exist + * 33147: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: detect revert or cherry-pick with multiple commits + 2014-09-12 Barton E. Schaefer <schaefer@zsh.org> * 33143: Src/init.c: POSIX_ARGZERO more closely matches bash et al. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 76ab92f33..263a3258e 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -62,6 +62,11 @@ VCS_INFO_git_getaction () { return 0 fi + if [[ -d "${gitdir}/sequencer" ]] ; then + gitaction="cherry-or-revert" + return 0 + fi + return 1 } |