From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2011 04:37:47 +0000 (-0700)
Subject: Merge branch 'sg/complete-symmetric-diff'
X-Git-Tag: v1.7.5-rc0~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c92e394468c927f129c8f2a138b760f884e3bed?hp=-c

Merge branch 'sg/complete-symmetric-diff'

* sg/complete-symmetric-diff:
bash: complete 'git diff ...branc<TAB>'
bash: fix misindented esac statement in __git_complete_file()
---

1c92e394468c927f129c8f2a138b760f884e3bed
diff --combined contrib/completion/git-completion.bash
index ccdc172a06,0c48f1a733..3b1cc83e2d
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -246,8 -246,6 +246,8 @@@ __git_ps1 (
  				fi
  			elif [ -f "$g/MERGE_HEAD" ]; then
  				r="|MERGING"
 +			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
 +				r="|CHERRY-PICKING"
  			elif [ -f "$g/BISECT_LOG" ]; then
  				r="|BISECTING"
  			fi
@@@ -664,11 -662,14 +664,14 @@@ __git_compute_merge_strategies (
  	: ${__git_merge_strategies:=$(__git_list_merge_strategies)}
  }
  
- __git_complete_file ()
+ __git_complete_revlist_file ()
  {
  	local pfx ls ref cur
  	_get_comp_words_by_ref -n =: cur
  	case "$cur" in
+ 	*..?*:*)
+ 		return
+ 		;;
  	?*:*)
  		ref="${cur%%:*}"
  		cur="${cur#*:}"
@@@ -682,7 -683,7 +685,7 @@@
  		*)
  			ls="$ref"
  			;;
- 	    esac
+ 		esac
  
  		case "$COMP_WORDBREAKS" in
  		*:*) : great ;;
@@@ -707,17 -708,6 +710,6 @@@
  				       s/^.*	//')" \
  			-- "$cur"))
  		;;
- 	*)
- 		__gitcomp "$(__git_refs)"
- 		;;
- 	esac
- }
- 
- __git_complete_revlist ()
- {
- 	local pfx cur
- 	_get_comp_words_by_ref -n =: cur
- 	case "$cur" in
  	*...*)
  		pfx="${cur%...*}..."
  		cur="${cur#*...}"
@@@ -734,6 -724,17 +726,17 @@@
  	esac
  }
  
+ 
+ __git_complete_file ()
+ {
+ 	__git_complete_revlist_file
+ }
+ 
+ __git_complete_revlist ()
+ {
+ 	__git_complete_revlist_file
+ }
+ 
  __git_complete_remote_or_refspec ()
  {
  	local cur words cword
@@@ -1356,11 -1357,11 +1359,11 @@@ _git_diff (
  		return
  		;;
  	esac
- 	__git_complete_file
+ 	__git_complete_revlist_file
  }
  
  __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
 -			tkdiff vimdiff gvimdiff xxdiff araxis p4merge
 +			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
  "
  
  _git_difftool ()