diff options
| author | Martin Schrodi <pfault@f4n.de> | 2014-04-19 03:04:58 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2015-02-10 19:35:00 +0100 |
| commit | f04246aa4820031c025ed25baf0df23d786d38fd (patch) | |
| tree | 040ffa0392e2a1d3336c3acdf1e37d7970bf1fc3 | |
| parent | c3940cf44a58393906e896decc93542c3ab17f4a (diff) | |
| download | zsh-f04246aa4820031c025ed25baf0df23d786d38fd.tar.gz zsh-f04246aa4820031c025ed25baf0df23d786d38fd.tar.bz2 zsh-f04246aa4820031c025ed25baf0df23d786d38fd.zip | |
rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella)
| -rw-r--r-- | themes/rkj-repos.zsh-theme | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme index 0a9f83d36..8585e66be 100644 --- a/themes/rkj-repos.zsh-theme +++ b/themes/rkj-repos.zsh-theme @@ -16,14 +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 - gitdir=$(git rev-parse --git-dir 2> /dev/null) || return - heads=($gitdir/refs/heads/*(N)) ; [[ -z $heads ]] && ref2="" || ref2=$(git rev-parse HEAD | head -c 6) - 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() {} |