From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Jun 2011 16:40:02 +0000 (-0700)
Subject: Merge branch 'maint-1.7.4' into maint
X-Git-Tag: v1.7.6~1^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99ac63b092f592b7181f94b6479f3a24dbfc8fdb?hp=-c

Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:
completion: replace core.abbrevguard to core.abbrev
---

99ac63b092f592b7181f94b6479f3a24dbfc8fdb
diff --combined contrib/completion/git-completion.bash
index a7d20df233,58440683c0..93800601f8
--- 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,14 -662,11 +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#*:}"
@@@ -685,7 -680,7 +685,7 @@@
  		*)
  			ls="$ref"
  			;;
 -	    esac
 +		esac
  
  		case "$COMP_WORDBREAKS" in
  		*:*) : great ;;
@@@ -710,6 -705,17 +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#*...}"
@@@ -726,17 -732,6 +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
@@@ -1359,11 -1354,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 ()
@@@ -1511,7 -1506,7 +1511,7 @@@ _git_help (
  		;;
  	esac
  	__git_compute_all_commands
 -	__gitcomp "$__git_all_commands
 +	__gitcomp "$__git_all_commands $(__git_aliases)
  		attributes cli core-tutorial cvs-migration
  		diffcore gitk glossary hooks ignore modules
  		repository-layout tutorial tutorial-2
@@@ -1577,8 -1572,6 +1577,8 @@@ __git_log_common_options=
  	--max-count=
  	--max-age= --since= --after=
  	--min-age= --until= --before=
 +	--min-parents= --max-parents=
 +	--no-min-parents --no-max-parents
  "
  # Options that go well for log and gitk (not shortlog)
  __git_log_gitk_options="
@@@ -2139,7 -2132,7 +2139,7 @@@ _git_config (
  		color.ui
  		commit.status
  		commit.template
- 		core.abbrevguard
+ 		core.abbrev
  		core.askpass
  		core.attributesfile
  		core.autocrlf
@@@ -2710,10 -2703,6 +2710,10 @@@ _git (
  	if [[ -n ${ZSH_VERSION-} ]]; then
  		emulate -L bash
  		setopt KSH_TYPESET
 +
 +		# workaround zsh's bug that leaves 'words' as a special
 +		# variable in versions < 4.3.12
 +		typeset -h words
  	fi
  
  	local cur words cword
@@@ -2765,10 -2754,6 +2765,10 @@@ _gitk (
  	if [[ -n ${ZSH_VERSION-} ]]; then
  		emulate -L bash
  		setopt KSH_TYPESET
 +
 +		# workaround zsh's bug that leaves 'words' as a special
 +		# variable in versions < 4.3.12
 +		typeset -h words
  	fi
  
  	__git_has_doubledash && return