From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Jan 2016 22:02:45 +0000 (-0800)
Subject: Merge branch 'sg/completion-no-column' into maint
X-Git-Tag: v2.6.5~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/34872f0b3c1d0054fe1981ad87b561a9e9b98c26?ds=inline;hp=-c

Merge branch 'sg/completion-no-column' into maint

The completion script (in contrib/) used to list "git column"
(which is not an end-user facing command) as one of the choices

* sg/completion-no-column:
completion: remove 'git column' from porcelain commands
---

34872f0b3c1d0054fe1981ad87b561a9e9b98c26
diff --combined contrib/completion/git-completion.bash
index 482ca84b45,a795410915..b383ed05c3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -663,10 -663,11 +663,11 @@@ __git_list_porcelain_commands (
  		check-mailmap)    : plumbing;;
  		check-ref-format) : plumbing;;
  		checkout-index)   : plumbing;;
+ 		column)           : internal helper;;
  		commit-tree)      : plumbing;;
  		count-objects)    : infrequent;;
 -		credential-cache) : credentials helper;;
 -		credential-store) : credentials helper;;
 +		credential)       : credentials;;
 +		credential-*)     : credentials helper;;
  		cvsexportcommit)  : export;;
  		cvsimport)        : import;;
  		cvsserver)        : daemon;;
@@@ -735,28 -736,35 +736,28 @@@
  __git_porcelain_commands=
  __git_compute_porcelain_commands ()
  {
 -	__git_compute_all_commands
  	test -n "$__git_porcelain_commands" ||
  	__git_porcelain_commands=$(__git_list_porcelain_commands)
  }
  
 -__git_pretty_aliases ()
 +# Lists all set config variables starting with the given section prefix,
 +# with the prefix removed.
 +__git_get_config_variables ()
  {
 -	local i IFS=$'\n'
 -	for i in $(git --git-dir="$(__gitdir)" config --get-regexp "pretty\..*" 2>/dev/null); do
 -		case "$i" in
 -		pretty.*)
 -			i="${i#pretty.}"
 -			echo "${i/ */}"
 -			;;
 -		esac
 +	local section="$1" i IFS=$'\n'
 +	for i in $(git --git-dir="$(__gitdir)" config --name-only --get-regexp "^$section\..*" 2>/dev/null); do
 +		echo "${i#$section.}"
  	done
  }
  
 +__git_pretty_aliases ()
 +{
 +	__git_get_config_variables "pretty"
 +}
 +
  __git_aliases ()
  {
 -	local i IFS=$'\n'
 -	for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do
 -		case "$i" in
 -		alias.*)
 -			i="${i#alias.}"
 -			echo "${i/ */}"
 -			;;
 -		esac
 -	done
 +	__git_get_config_variables "alias"
  }
  
  # __git_aliased_command requires 1 argument
@@@ -1666,10 -1674,7 +1667,10 @@@ _git_push (
  _git_rebase ()
  {
  	local dir="$(__gitdir)"
 -	if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
 +	if [ -f "$dir"/rebase-merge/interactive ]; then
 +		__gitcomp "--continue --skip --abort --edit-todo"
 +		return
 +	elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
  		__gitcomp "--continue --skip --abort"
  		return
  	fi
@@@ -1776,7 -1781,15 +1777,7 @@@ __git_config_get_set_variables (
  		c=$((--c))
  	done
  
 -	git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
 -	while read -r line
 -	do
 -		case "$line" in
 -		*.*=*)
 -			echo "${line/=*/}"
 -			;;
 -		esac
 -	done
 +	git --git-dir="$(__gitdir)" config $config_file --name-only --list 2>/dev/null
  }
  
  _git_config ()
@@@ -1881,7 -1894,6 +1882,7 @@@
  			--get --get-all --get-regexp
  			--add --unset --unset-all
  			--remove-section --rename-section
 +			--name-only
  			"
  		return
  		;;
@@@ -2112,8 -2124,6 +2113,8 @@@
  		http.noEPSV
  		http.postBuffer
  		http.proxy
 +		http.sslCipherList
 +		http.sslVersion
  		http.sslCAInfo
  		http.sslCAPath
  		http.sslCert
@@@ -2251,7 -2261,12 +2252,7 @@@ _git_remote (
  		__git_complete_remote_or_refspec
  		;;
  	update)
 -		local i c='' IFS=$'\n'
 -		for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do
 -			i="${i#remotes.}"
 -			c="$c ${i/ */}"
 -		done
 -		__gitcomp "$c"
 +		__gitcomp "$(__git_get_config_variables "remotes")"
  		;;
  	*)
  		;;
@@@ -2278,11 -2293,6 +2279,11 @@@ _git_reset (
  
  _git_revert ()
  {
 +	local dir="$(__gitdir)"
 +	if [ -f "$dir"/REVERT_HEAD ]; then
 +		__gitcomp "--continue --quit --abort"
 +		return
 +	fi
  	case "$cur" in
  	--*)
  		__gitcomp "--edit --mainline --no-edit --no-commit --signoff"