Fix again2

diff --git a/.bashrc b/.bashrc
index ec0784440bb17d639804e5de730547bffb44a374..22bae7518efb6f74e1ccf0a2389b2cb881e14211 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -4,21 +4,22 @@
 [[ -z "$PS1" ]] && return
 
 # Set prompt
-if test -z  "$debian_chroot"; then
+if [[ -z "$MSYS2_PS1" ]]; then
   PS1='${debian_chroot:+($debian_chroot)}'  # debian
 else
   PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]'    # windows
+
   GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
   COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
   COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
   COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
-  if test -f "$COMPLETION_PATH/git-prompt.sh"
-  then
+  if test -f "$COMPLETION_PATH/git-prompt.sh"; then
     . "$COMPLETION_PATH/git-completion.bash"
     . "$COMPLETION_PATH/git-prompt.sh"
   fi
 fi
 
+
 PS1="$PS1"'\[\033[01;32m\]'     # change color
 PS1="$PS1"'\u@\h'               # user@host
 PS1="$PS1"'\[\033[00m\]'        # change color
@@ -26,16 +27,15 @@ PS1="$PS1"':'                   # :
 PS1="$PS1"'\[\033[01;34m\]'     # change color
 PS1="$PS1"'\w'                  # current working directory
 PS1="$PS1"'\[\033[31m\]'        # change color
-PS1="$PS1"'$(__git_ps1 "(%s)")' # bash function
+PS1="$PS1"'$(__git_ps1 "(%s)")' # bash function (no spaces)
 PS1="$PS1"'\[\033[00m\]'        # change color
 PS1="$PS1"'\$ '                 # prompt
 
 export GIT_PS1_SHOWDIRTYSTATE=1
-#export GIT_PS1_SHOWCOLORHINTS=1
-#export GIT_PS1_SHOWUNTRACKEDFILES=1
-#export GIT_PS1_SHOWSTASHSTATE=1
-#export GIT_PS1_SHOWUPSTREAM="auto"
-#export GIT_PS1_HIDE_IF_PWD_IGNORED=1
+export GIT_PS1_SHOWUNTRACKEDFILES=1
+export GIT_PS1_SHOWSTASHSTATE=1
+export GIT_PS1_SHOWUPSTREAM="auto"
+export GIT_PS1_HIDE_IF_PWD_IGNORED=1
 
 # Whenever displaying the prompt, write the previous line to disk
 export PROMPT_COMMAND="history -a;"