Detect the sequenced Git cherry picking action
This commit is contained in:
parent
23844ca744
commit
722353130e
|
@ -67,7 +67,7 @@
|
|||
# Load dependencies.
|
||||
omodload 'trap'
|
||||
|
||||
# Gets the Git special action (am, merge, rebase, etc.).
|
||||
# Gets the Git special action (am, bisect, cherry, merge, rebase).
|
||||
# Borrowed from vcs_info and edited.
|
||||
function _git-action {
|
||||
local action=''
|
||||
|
@ -115,7 +115,12 @@ function _git-action {
|
|||
fi
|
||||
|
||||
if [[ -f "${git_dir}/CHERRY_PICK_HEAD" ]]; then
|
||||
print 'cherry-pick'
|
||||
if [[ -d "${git_dir}/sequencer" ]] ; then
|
||||
print 'cherry-seq'
|
||||
else
|
||||
print 'cherry'
|
||||
fi
|
||||
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue