projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zshrc: A few changes for the sake of consistency
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
6603e03
..
45abfd1
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-1026,8
+1026,8
@@
else
GREEN=$'%{\e[1;32m%}'
CYAN=$'%{\e[1;36m%}'
WHITE=$'%{\e[1;37m%}'
GREEN=$'%{\e[1;32m%}'
CYAN=$'%{\e[1;36m%}'
WHITE=$'%{\e[1;37m%}'
- MAGENTA='%{\e[1;35m%}'
- YELLOW='%{\e[1;33m%}'
+ MAGENTA=
$
'%{\e[1;35m%}'
+ YELLOW=
$
'%{\e[1;33m%}'
NO_COLOUR=$'%{\e[0m%}'
fi
NO_COLOUR=$'%{\e[0m%}'
fi
@@
-1077,6
+1077,11
@@
fi
#
# This *requires* 'setopt prompt_subst'.
# }}}
#
# This *requires* 'setopt prompt_subst'.
# }}}
+VCS_INFO_adjust () { #{{{
+ [[ -n ${vcs_comm[overwrite_name]} ]] && vcs=${vcs_comm[overwrite_name]}
+ return 0
+}
+# }}}
VCS_INFO_format () { # {{{
local msg
VCS_INFO_format () { # {{{
local msg
@@
-1182,16
+1187,14
@@
VCS_INFO_git_get_data () { # {{{
setopt localoptions extendedglob
local gitdir gitbase gitbranch gitaction msg
setopt localoptions extendedglob
local gitdir gitbase gitbranch gitaction msg
- gitdir="$(git rev-parse --git-dir 2> /dev/null)"
-
- if [[ $? -eq 0 ]] ; then
- gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
- fi
+ gitdir=${vcs_comm[gitdir]}
+ gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
return
fi
if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
return
fi
+ VCS_INFO_adjust
gitaction="$(VCS_INFO_git_getaction ${gitdir})"
msg=$(VCS_INFO_format ${gitaction})
gitaction="$(VCS_INFO_git_getaction ${gitdir})"
msg=$(VCS_INFO_format ${gitaction})
@@
-1284,7
+1287,11
@@
VCS_INFO_bzr_detect() {
}
VCS_INFO_git_detect() {
}
VCS_INFO_git_detect() {
- check_com -c git && git rev-parse --is-inside-work-tree &> /dev/null && return 0
+ if check_com -c git && git rev-parse --is-inside-work-tree &> /dev/null ; then
+ vcs_comm[gitdir]="$(git rev-parse --git-dir 2> /dev/null)" || return 1
+ [[ -d ${vcs_comm[gitdir]}/svn ]] && vcs_comm[overwrite_name]='git-svn'
+ return 0
+ fi
return 1
}
return 1
}
@@
-2327,7
+2334,7
@@
bk() {
# }}}
# {{{ make sure our environment is clean regarding colors
# }}}
# {{{ make sure our environment is clean regarding colors
-for color in BLUE RED GREEN CYAN WHITE ; unset $color
+for color in BLUE RED GREEN CYAN
YELLOW MAGENTA
WHITE ; unset $color
# }}}
# source another config file if present {{{
# }}}
# source another config file if present {{{