adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect the sequenced Git cherry picking action

Browse Source
This commit is contained in:
Sorin Ionescu 2012-08-27 20:38:23 -04:00
parent 23844ca744
commit 722353130e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/git/functions/git-info
View File

@ -67,7 +67,7 @@
# Load dependencies. # Load dependencies.
omodload 'trap' 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. # Borrowed from vcs_info and edited.
function _git-action { function _git-action {
local action='' local action=''
@ -115,7 +115,12 @@ function _git-action {
fi fi
if [[ -f "${git_dir}/CHERRY_PICK_HEAD" ]]; then 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 return 0
fi fi