factor our networkfs check

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 9c23a0b1ad24e513efc0e1ca1f014f71e35cd46c..423c05a3ad9875e83eec4d3be8d2f3324fd4da6e 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -10,17 +10,21 @@
 # Shamelessly based on http://glandium.org/blog/?p=170
 #
 
+__on_networkfs()
+{
+  case $(df -T . | sed -rne '$s,^[^[:space:]]+[[:space:]]+([^[:space:]]+).*,\1,p') in
+    (cifs|nfs) return 0;;
+  esac
+  return 1
+}
+
 __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
-    readlink -f "$relroot"
-  else
-    echo $PWD
-  fi
+  local dir; dir="$PWD/$(git rev-parse --show-cdup)"
+  # do not use --show-toplevel because it resolves symlinks
+  echo $dir:a
 }
 
 __git_get_branch()
@@ -36,6 +40,7 @@ __git_get_branch()
 __git_print_preprompt()
 {
   [ "$(git config --get core.bare)" = false ] || return
+  __on_networkfs && return
 
   local output
   output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})