summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-04-23 20:17:40 -0700
committerRobby Russell <robby@planetargon.com>2013-04-23 20:17:40 -0700
commitd6a36b175646fa2a79466f050b07d47c2342b75e (patch)
tree7b7bfefcaf2937bdbae6cdac254ae0f1f7ecab3c
parentb61555d7c0a7120c6eea9c87254b729b3990b5da (diff)
parentef8e3a67f293ab3d4dfc67da5af321de7c019ca4 (diff)
downloadzsh-d6a36b175646fa2a79466f050b07d47c2342b75e.tar.gz
zsh-d6a36b175646fa2a79466f050b07d47c2342b75e.tar.bz2
zsh-d6a36b175646fa2a79466f050b07d47c2342b75e.zip
Merge pull request #1575 from mguindin/agnoster-change
[agnoster-theme] modifying theme for dirty/staged files
-rw-r--r--themes/agnoster.zsh-theme15
1 files changed, 13 insertions, 2 deletions
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 75e095776..a9de8c84e 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -71,7 +71,6 @@ prompt_context() {
prompt_git() {
local ref dirty
if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
- ZSH_THEME_GIT_PROMPT_DIRTY='±'
dirty=$(parse_git_dirty)
ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
if [[ -n $dirty ]]; then
@@ -79,7 +78,19 @@ prompt_git() {
else
prompt_segment green black
fi
- echo -n "${ref/refs\/heads\//⭠ }$dirty"
+
+ setopt promptsubst
+ autoload -Uz vcs_info
+
+ zstyle ':vcs_info:*' enable git
+ zstyle ':vcs_info:*' get-revision true
+ zstyle ':vcs_info:*' check-for-changes true
+ zstyle ':vcs_info:*' stagedstr '✚'
+ zstyle ':vcs_info:git:*' unstagedstr '●'
+ zstyle ':vcs_info:*' formats ' %u%c'
+ zstyle ':vcs_info:*' actionformats '%u%c'
+ vcs_info
+ echo -n "${ref/refs\/heads\//⭠ }${vcs_info_msg_0_}"
fi
}