From 600975cec72311c7279f20e09cdb8d78ed81526e Mon Sep 17 00:00:00 2001 From: Mario Fernandez Date: Tue, 17 Jan 2012 12:17:38 +0100 Subject: [PATCH] Add function to display if there is a rebase, merge or bisect going on on the prompt --- lib/git.zsh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/git.zsh b/lib/git.zsh index defa062c6..b54d13069 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -62,3 +62,22 @@ git_prompt_status() { fi 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 +}