mirror of
				https://github.com/dcarrillo/prezto.git
				synced 2025-11-04 05:09:09 +00:00 
			
		
		
		
	Remove the unnecessary action local variable
This commit is contained in:
		@@ -70,7 +70,6 @@ omodload 'trap'
 | 
			
		||||
# Gets the Git special action (am, bisect, cherry, merge, rebase).
 | 
			
		||||
# Borrowed from vcs_info and edited.
 | 
			
		||||
function _git-action {
 | 
			
		||||
  local action=''
 | 
			
		||||
  local action_dir
 | 
			
		||||
  local git_dir="$(git-dir)"
 | 
			
		||||
 | 
			
		||||
@@ -80,13 +79,12 @@ function _git-action {
 | 
			
		||||
    "${git_dir}/../.dotest"; do
 | 
			
		||||
    if [[ -d "$action_dir" ]] ; then
 | 
			
		||||
      if [[ -f "${action_dir}/rebasing" ]] ; then
 | 
			
		||||
        action='rebase'
 | 
			
		||||
        print 'rebase'
 | 
			
		||||
      elif [[ -f "${action_dir}/applying" ]] ; then
 | 
			
		||||
        action='am'
 | 
			
		||||
        print 'am'
 | 
			
		||||
      else
 | 
			
		||||
        action='am/rebase'
 | 
			
		||||
        print 'am/rebase'
 | 
			
		||||
      fi
 | 
			
		||||
      print "$action"
 | 
			
		||||
      return 0
 | 
			
		||||
    fi
 | 
			
		||||
  done
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user