mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2024-05-11 05:55:17 +00:00 
			
		
		
		
	feat(git): support trunk branches in git_main_branch (#9417)
				
					
				
			This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							874d83f7b8
						
					
				
				
					commit
					51772732f5
				
			@@ -31,11 +31,14 @@ function work_in_progress() {
 | 
			
		||||
 | 
			
		||||
# Check if main exists and use instead of master
 | 
			
		||||
function git_main_branch() {
 | 
			
		||||
  if [[ -n "$(git branch --list main)" ]]; then
 | 
			
		||||
    echo main
 | 
			
		||||
  else
 | 
			
		||||
    echo master
 | 
			
		||||
  fi
 | 
			
		||||
  local branch
 | 
			
		||||
  for branch in main trunk; do
 | 
			
		||||
    if command git show-ref -q --verify refs/heads/$branch; then
 | 
			
		||||
      echo $branch
 | 
			
		||||
      return
 | 
			
		||||
    fi
 | 
			
		||||
  done
 | 
			
		||||
  echo master
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user