diff options
author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
---|---|---|
committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
commit | 223fd60ba597b8c23569c65878d766c3c933fa70 (patch) | |
tree | 33c5c6a150293e6cf81f26f0f1b9c733dcf8aab7 /themes/rkj-repos.zsh-theme | |
parent | 185cb6e37352cc0d92042e35d259b0de3f5f3886 (diff) | |
parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
download | zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.gz zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.bz2 zsh-223fd60ba597b8c23569c65878d766c3c933fa70.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'themes/rkj-repos.zsh-theme')
-rw-r--r-- | themes/rkj-repos.zsh-theme | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme index 4ab3bc757..6289427c2 100644 --- a/themes/rkj-repos.zsh-theme +++ b/themes/rkj-repos.zsh-theme @@ -18,8 +18,11 @@ ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈" function mygit() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX" + ref1=$(git symbolic-ref HEAD 2> /dev/null) || return + ref2=$(git rev-parse HEAD | head -c 6) || return + ref="$ref1 %{$fg[grey]%}$ref2" + #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX " } function retcode() {} |