linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-30 02:44:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missing function

Browse source
This commit is contained in:
Gaetan Semet 2013-06-05 12:11:01 +02:00
commit 64a489e59c
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/git.zsh
View file

@ -114,6 +114,25 @@ git_prompt_status() {
echo $STATUS echo $STATUS
} }
# Checks if there is a bisect, merge or rebase currently going on
git_prompt_rebase_state() {
STATUS=""
if [ -f ".git/BISECT_LOG" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_BISECT"
elif [ -f ".git/MERGE_HEAD" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_MERGE"
else
for dir in rebase rebase-apply rebase-merge ; do
if [ -d ".git/$dir" ] ; then
STATUS="$ZSH_THEME_GIT_PROMPT_STATE_BEFORE$ZSH_THEME_GIT_PROMPT_STATE_REBASE"
break
fi
done
fi
echo $STATUS
}
#compare the provided version of git to the version installed and on path #compare the provided version of git to the version installed and on path
#prints 1 if input version <= installed version #prints 1 if input version <= installed version
#prints -1 otherwise #prints -1 otherwise

2
themes/stibbons.zsh-theme
View file

@ -12,7 +12,7 @@ git_custom_status() {
} }
#RVM and git settings #RVM and git settings
if [[ -s ~/.rvm/scripts/rvm ]] ; then if [[ -s ~/.rvm/scripts/rvm ]] ; then
RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1' RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
else else
if which rbenv &> /dev/null; then if which rbenv &> /dev/null; then