diff options
| author | Robby Russell <robby@planetargon.com> | 2015-02-10 11:21:45 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-02-10 11:21:45 -0800 |
| commit | aab75327475304ae94a2457623a41da6f02fdc8c (patch) | |
| tree | 534a76a6e1c6a753538742974ec1cd22a3505d5a /themes/rkj-repos.zsh-theme | |
| parent | 9b8e88d5acf8b06d5a600c2aaeea76925ca3f29f (diff) | |
| parent | f04246aa4820031c025ed25baf0df23d786d38fd (diff) | |
| download | zsh-aab75327475304ae94a2457623a41da6f02fdc8c.tar.gz zsh-aab75327475304ae94a2457623a41da6f02fdc8c.tar.bz2 zsh-aab75327475304ae94a2457623a41da6f02fdc8c.zip | |
Merge pull request #3566 from mcornella/pfault-master
Repost #2606: fix git status in rkj-repos theme
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() {} |