mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2024-05-11 05:55:17 +00:00 
			
		
		
		
	rkj-repos: code cleanup and updated with functions from lib/git.zsh (thx mcornella)
This commit is contained in:
		
				
					committed by
					
						
						Marc Cornellà
					
				
			
			
				
	
			
			
			
						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_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() {}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user