redirect errors from git-diff to null

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index a23aab5cbf21a0b52f2f2307eaf35d5b141edf6d..399d3445f637c98674c69bee87c0e70cc5baf836 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -5,7 +5,7 @@
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #

-# Source repository: http://git.madduck.net/v/etc/zsh.git
+# Source repository: git://git.madduck.net/etc/zsh.git

 #
 # Shamelessly based on http://glandium.org/blog/?p=170
 #
 #
 # Shamelessly based on http://glandium.org/blog/?p=170
 #


@@ -35,12 +35,12 @@ __git_get_branch()
 __git_print_preprompt()
 {
   local output
 __git_print_preprompt()
 {
   local output

-  output=(${(f):-"$(git diff --stat --relative)"})
+  output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
     print "${(F)output[1,-2]}"
   fi
   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
     print "${(F)output[1,-2]}"
   fi

-  output=(${(f):-"$(git diff --cached --stat --relative)"})
+  output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
     print "${(F)output[1,-2]}"
   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
     print "${(F)output[1,-2]}"


@@ -225,7 +225,6 @@ if ! is_root; then
   _print_preprompt() {
     [[ $? -eq 0 ]] && __vcs_print_preprompt
   }
   _print_preprompt() {
     [[ $? -eq 0 ]] && __vcs_print_preprompt
   }

-  chpwd_functions+=_print_preprompt

   precmd_functions+=_print_preprompt
 
   # call it once
   precmd_functions+=_print_preprompt
 
   # call it once