schönerer Promt während Rebase (und Merge?)

1 files changed, 6 insertions, 1 deletions

diff --git a/bash-git-prompt.in b/bash-git-prompt.in
index a8ef63b..c9ac219 100755
--- a/bash-git-prompt.in
+++ b/bash-git-prompt.in
@@ -19,7 +19,12 @@ PS1="$PS1Start"
 if status=$(git status --porcelain 2> /dev/null)
 then
   PS1="$PS1 "
-  branch="$(git symbolic-ref HEAD 2> /dev/null | sed "s|^.*/||")"
+  branch="$((git symbolic-ref HEAD 2> /dev/null || git describe --always) | sed "s|^.*/||")"
+  gitDir="$(git rev-parse --show-toplevel)/$(git rev-parse --git-dir)"
+  if [ -e ${gitDir}/rebase-merge ] || [ -e ${gitDir}/rebase-apply ]
+  then
+    branch="($branch)"
+  fi
   echo "$status" | grep -q "^.\S" && wtClean=false || wtClean=true
   echo "$status" | grep -q "^\S" && idxClean=false || idxClean=true