# 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
#
__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]}"
# shortcut: if there are no arguments, return a default prompt
if [ -z "${1:-}" ]; then
- pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<..<%~%<<}"
+ pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<…<%~%<<}"
echo "$pwdnamed"
return
fi
prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
minlen=${_PROMPT_PATH_MINLEN:-10}
(( $prelen < $minlen )) && prelen=$minlen
- prefix="${(%):-%${prelen}<..<%-${precomps}~%<<}"
+ prefix="${(%):-%${prelen}<…<%-${precomps}~%<<}"
echo "'$prefix'" "'$branch'" "'$postfix'"
}
NONE) :;;
*) warn "$repotype repositories not (yet) supported in the prompt";;
esac
- local p="%${MAXLEN}<..<%~%<<"
+ local p="%${MAXLEN}<…<%~%<<"
#TODO find a better way so we don't have to nuke $psvar, but since the
# %(nv.true.false) check for prompts checks element count, not
# content, that's all we get for now
_print_preprompt() {
[[ $? -eq 0 ]] && __vcs_print_preprompt
}
- chpwd_functions+=_print_preprompt
precmd_functions+=_print_preprompt
# call it once