mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-26 16:28:58 +01:00
rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella)
This commit is contained in:
parent
c3940cf44a
commit
f04246aa48
@ -16,14 +16,15 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
|
|||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
|
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
|
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() {
|
function mygit() {
|
||||||
ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
|
if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
|
||||||
gitdir=$(git rev-parse --git-dir 2> /dev/null) || return
|
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
|
||||||
heads=($gitdir/refs/heads/*(N)) ; [[ -z $heads ]] && ref2="" || ref2=$(git rev-parse HEAD | head -c 6)
|
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
|
||||||
ref="$ref1 %{$fg[grey]%}$ref2"
|
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
|
||||||
#ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
|
fi
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function retcode() {}
|
function retcode() {}
|
||||||
|
Loading…
Reference in New Issue
Block a user