mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2024-05-11 05:55:17 +00:00 
			
		
		
		
	Fix parse_git_dirty() when status.branch is set.
This commit is contained in:
		
							
								
								
									
										19
									
								
								lib/git.zsh
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								lib/git.zsh
									
									
									
									
									
								
							@@ -10,26 +10,23 @@ function git_prompt_info() {
 | 
			
		||||
 | 
			
		||||
# Checks if working tree is dirty
 | 
			
		||||
parse_git_dirty() {
 | 
			
		||||
  local SUBMODULE_SYNTAX=''
 | 
			
		||||
  local GIT_STATUS=''
 | 
			
		||||
  local CLEAN_MESSAGE='nothing to commit (working directory clean)'
 | 
			
		||||
  local STATUS=''
 | 
			
		||||
  local FLAGS
 | 
			
		||||
  FLAGS=('--porcelain')
 | 
			
		||||
  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
 | 
			
		||||
    if [[ $POST_1_7_2_GIT -gt 0 ]]; then
 | 
			
		||||
          SUBMODULE_SYNTAX="--ignore-submodules=dirty"
 | 
			
		||||
      FLAGS+='--ignore-submodules=dirty'
 | 
			
		||||
    fi
 | 
			
		||||
    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
 | 
			
		||||
        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
 | 
			
		||||
    else
 | 
			
		||||
        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
 | 
			
		||||
      FLAGS+='--untracked-files=no'
 | 
			
		||||
    fi
 | 
			
		||||
    if [[ -n $GIT_STATUS ]]; then
 | 
			
		||||
    STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
 | 
			
		||||
  fi
 | 
			
		||||
  if [[ -n $STATUS ]]; then
 | 
			
		||||
    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
 | 
			
		||||
  else
 | 
			
		||||
    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
 | 
			
		||||
  fi
 | 
			
		||||
  else
 | 
			
		||||
    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
 | 
			
		||||
  fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# get the difference between the local and remote branches
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user