diff options
| author | Ashley Valent <avalent@atlassian.com> | 2015-02-11 11:22:15 +1100 |
|---|---|---|
| committer | Ashley Valent <avalent@atlassian.com> | 2015-02-11 11:22:15 +1100 |
| commit | 3b6a695b60d81691ab8e31197fc8e0444df0e394 (patch) | |
| tree | 84529e1bc0a54cdd9471e53c597e913797c04014 /themes/rkj-repos.zsh-theme | |
| parent | 3ba10ad0a2ed85c26e096126a7899a401cf8f9e7 (diff) | |
| parent | ef7e53a78d0e4196c2d1e6e5b268209759d51753 (diff) | |
| download | zsh-3b6a695b60d81691ab8e31197fc8e0444df0e394.tar.gz zsh-3b6a695b60d81691ab8e31197fc8e0444df0e394.tar.bz2 zsh-3b6a695b60d81691ab8e31197fc8e0444df0e394.zip | |
Merge branch 'master' of github.com:avalent/oh-my-zsh
Diffstat (limited to 'themes/rkj-repos.zsh-theme')
| -rw-r--r-- | themes/rkj-repos.zsh-theme | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme index eed084f15..8585e66be 100644 --- a/themes/rkj-repos.zsh-theme +++ b/themes/rkj-repos.zsh-theme @@ -16,13 +16,15 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗" ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦" ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈" +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[grey]%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}" function mygit() { - 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 " + if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX " + fi } function retcode() {} |