diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d8d36720d..a586be32f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ * 30490: Completion/Unix/Command/_java: Complete files for the -keystore argument. + * 30639: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + Add support for showing the current action is cherry-pick (happens + when cherry-picking a range). + 2013-03-05 Peter Stephenson <p.w.stephenson@ntlworld.com> * users/17666: Doc/Zsh/contrib.yo, Functions/Misc/zcalc: -f @@ -570,5 +574,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5814 $ +* $Revision: 1.5815 $ ***************************************************** diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index e40571a0e..787e76302 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -52,6 +52,17 @@ VCS_INFO_git_getaction () { printf '%s' "bisect" return 0 fi + + if [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]] ; then + if [[ -d "${gitdir}/sequencer" ]] ; then + gitaction=cherry-seq + else + gitaction=cherry + fi + printf '%s' ${gitaction} + return 0 + fi + return 1 } |