do not print preprompt in git bare repos

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index aeabd7744054d431ec6e7f93a2ce7009af9d3d3e..07ea29388fdeba3ac45de18284ec9aa8eab6ef94 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -27,23 +27,25 @@ __git_get_branch()
 {
   # return the name of the git branch we're on
   local ref
 {
   # return the name of the git branch we're on
   local ref

-  ref=$(git symbolic-ref -q HEAD 2>/dev/null \
-     || git-name-rev --name-only HEAD 2>/dev/null) || return 1
+  ref=$(git --git-dir="$PWD" symbolic-ref -q HEAD 2>/dev/null \
+     || git --git-dir="$PWD" name-rev --name-only HEAD 2>/dev/null) || return 1

   echo "${ref#refs/heads/}"
 }
 
 __git_print_preprompt()
 {
   echo "${ref#refs/heads/}"
 }
 
 __git_print_preprompt()
 {

+  [ "$(git config --get core.bare)" = false ] || return
+

   local output
   output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
   local output
   output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:

-    print "${(F)output[1,-2]}"
+    print "${${(F)output[1,-2]}//\.\.\./…}"

   fi
   output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
   fi
   output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:

-    print "${(F)output[1,-2]}"
+    print "${${(F)output[1,-2]}//\.\.\./…}"

   fi
 }
 
   fi
 }