mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 13:21:19 +08:00 
			
		
		
		
	merge master
This commit is contained in:
		
							parent
							
								
									6d5e4eaebc
								
							
						
					
					
						commit
						c6b339f532
					
				@ -79,16 +79,16 @@ function steeef_chpwd {
 | 
			
		||||
add-zsh-hook chpwd steeef_chpwd
 | 
			
		||||
 | 
			
		||||
function steeef_precmd {
 | 
			
		||||
    # check for untracked files or updated submodules, since vcs_info doesn't
 | 
			
		||||
    if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
 | 
			
		||||
        PR_GIT_UPDATE=1
 | 
			
		||||
        FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
 | 
			
		||||
    else
 | 
			
		||||
        FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
 | 
			
		||||
    fi
 | 
			
		||||
    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 | 
			
		||||
 | 
			
		||||
    if [[ -n "$PR_GIT_UPDATE" ]] ; then
 | 
			
		||||
        # check for untracked files or updated submodules, since vcs_info doesn't
 | 
			
		||||
        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
 | 
			
		||||
            PR_GIT_UPDATE=1
 | 
			
		||||
            FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
 | 
			
		||||
        else
 | 
			
		||||
            FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
 | 
			
		||||
        fi
 | 
			
		||||
        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 | 
			
		||||
 | 
			
		||||
        vcs_info 'prompt'
 | 
			
		||||
        PR_GIT_UPDATE=
 | 
			
		||||
    fi
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user