aab75327475304ae94a2457623a41da6f02fdc8c

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #3566 from mcornella/pfault-master

Repost #2606: fix git status in rkj-repos theme

Diff

 1diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
 2index eed084f15a9eb722095aaea1262ba06ad32e835f..8585e66be551eb66652eb1689061418218751e64 100644
 3--- a/themes/rkj-repos.zsh-theme
 4+++ b/themes/rkj-repos.zsh-theme
 5@@ -16,13 +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-  ref2=$(git rev-parse HEAD | head -c 6) || return
15-  ref="$ref1 %{$fg[grey]%}$ref2"
16-  #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
17-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
18+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
19+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
20+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
21+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
22+  fi
23 }
24 
25 function retcode() {}