make dpkg-buildpackage always take -k

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 744f649009a3db5a2f38d05f61e0eadb0cb26ff9..4cc18a3fd6feb72d174044579ad73d6999c7ccf7 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -70,6 +70,7 @@ __vcs_get_repo_type()
   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break
+    [ -d "$GIT_DIR" ] && echo git && break
     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break
     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break
@@ -140,9 +141,13 @@ __vcs_set_prompt_variables()
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }
       eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
-      # poor man's replace until I find out how to do named dirs properly
-      # here:
-      [ -d "$GIT_DIR" ] && set -- "${GIT_DIR/$HOME/~}" "$2" "$1"
+      if [ -d "$GIT_DIR" ]; then
+        # poor man's replace until I find out how to do named dirs properly
+        # here:
+        _D="${GIT_DIR/$HOME/~}"
+        set -- "$_D" "$2" "${${1#$_D}%/}"
+        unset _D
+      fi
       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||