turn on extended globbing

[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index a99ca184abf9d869868f29528d71edd349c5edb6..2a672be6a5882a3c86b90403525d8d30b6e7044f 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -1,4 +1,4 @@
-# zshrc/85_git_prompt
+# zshrc/60_vcsprompt

 #
 # Make git information available to the prompt
 #
 #
 # Make git information available to the prompt
 #


@@ -13,6 +13,7 @@
 __git_get_reporoot()
 {
   # return the full path to the root of the current git repository
 __git_get_reporoot()
 {
   # return the full path to the root of the current git repository

+  [ -d "$GIT_DIR" ] && echo "$GIT_DIR" && return 0

   local relroot
   relroot="$(git rev-parse --show-cdup 2>/dev/null)" || return 1
   if [ -n "$relroot" ]; then
   local relroot
   relroot="$(git rev-parse --show-cdup 2>/dev/null)" || return 1
   if [ -n "$relroot" ]; then


@@ -128,7 +129,7 @@ __vcs_get_prompt_path_components()
   prefix="%${prelen}<..<%-${precomps}~%<<"
   prefix="${(%)prefix}"
 
   prefix="%${prelen}<..<%-${precomps}~%<<"
   prefix="${(%)prefix}"
 

-  echo "$prefix" "$branch" "$postfix"
+  echo "'$prefix'" "'$branch'" "'$postfix'"

 }
 
 __vcs_set_prompt_variables()
 }
 
 __vcs_set_prompt_variables()


@@ -143,18 +144,22 @@ __vcs_set_prompt_variables()
         { error "could not determine git repository root"; return 1 }
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }
         { error "could not determine git repository root"; return 1 }
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }

+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
+      [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1"

       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||
         { error "could not determine hg repository root"; return 1 }
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }
       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||
         { error "could not determine hg repository root"; return 1 }
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }

+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")

       ;;
     bzr)
       reporoot="$(__bzr_get_reporoot)" ||
         { error "could not determine bzr repository root"; return 1 }
       branch="$(__bzr_get_branch)" ||
         { error "could not determine bzr branch"; return 1 }
       ;;
     bzr)
       reporoot="$(__bzr_get_reporoot)" ||
         { error "could not determine bzr repository root"; return 1 }
       branch="$(__bzr_get_branch)" ||
         { error "could not determine bzr branch"; return 1 }

+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")

       ;;
     *)
       case "$repotype" in
       ;;
     *)
       case "$repotype" in


@@ -169,7 +174,6 @@ __vcs_set_prompt_variables()
       return
   esac
 
       return
   esac
 

-  set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")

   psvar[1]="$1"
   psvar[2]="$2"
   psvar[3]="$3"
   psvar[1]="$1"
   psvar[2]="$2"
   psvar[3]="$3"