X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/ef537759f34970b745d9a36fa30d4cec8ade2482..refs/heads/vcs_info:/.zsh/zshrc/60_vcsprompt diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index a23aab5..237f6c0 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -5,7 +5,7 @@ # Copyright © 1994–2008 martin f. krafft # 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 # @@ -35,12 +35,12 @@ __git_get_branch() __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 - 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]}" @@ -205,7 +205,7 @@ __vcs_print_preprompt() esac } -if ! is_root; then +if false && ! is_root; then # too dangerous to be run as root _update_vcs_prompt_vars_if_vcs_ran() { @@ -225,7 +225,6 @@ if ! is_root; then _print_preprompt() { [[ $? -eq 0 ]] && __vcs_print_preprompt } - chpwd_functions+=_print_preprompt precmd_functions+=_print_preprompt # call it once