f04246aa4820031c025ed25baf0df23d786d38fd

Author
Martin Schrodi <pfault@f4n.de>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella)

Diff

 1diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
 2index 0a9f83d361cd5f9229440f2505a055b3d8c597ea..8585e66be551eb66652eb1689061418218751e64 100644
 3--- a/themes/rkj-repos.zsh-theme
 4+++ b/themes/rkj-repos.zsh-theme
 5@@ -16,14 +16,15 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
 6 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
 7 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
 8 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
 9+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[grey]%}"
10+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
11 
12 function mygit() {
13-  ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
14-  gitdir=$(git rev-parse --git-dir 2> /dev/null) || return
15-  heads=($gitdir/refs/heads/*(N)) ; [[ -z $heads ]] && ref2="" || ref2=$(git rev-parse HEAD | head -c 6)
16-  ref="$ref1 %{$fg[grey]%}$ref2"
17-  #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
18-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
19+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
20+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
21+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
22+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
23+  fi
24 }
25 
26 function retcode() {}