From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2012 17:25:52 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e609b270ad3ca4db2e9b7ba14c1d36d2deb8563?hp=-c

Merge branch 'maint'

* maint:
Revert "completion: fix shell expansion of items"
---

8e609b270ad3ca4db2e9b7ba14c1d36d2deb8563
diff --combined contrib/completion/git-completion.bash
index c48cd19f12,5b255cba69..be800e09bd
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -225,13 -225,6 +225,6 @@@ _get_comp_words_by_ref (
  fi
  fi
  
- # Quotes the argument for shell reuse
- __git_quote()
- {
- 	local quoted=${1//\'/\'\\\'\'}
- 	printf "'%s'" "$quoted"
- }
- 
  # Generates completion reply with compgen, appending a space to possible
  # completion words, if necessary.
  # It accepts 1 to 4 arguments:
@@@ -268,7 -261,7 +261,7 @@@ __gitcomp (
  __gitcomp_nl ()
  {
  	local IFS=$'\n'
- 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
+ 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
  }
  
  __git_heads ()
@@@ -882,15 -875,11 +875,15 @@@ _git_branch (
  	done
  
  	case "$cur" in
 +	--set-upstream-to=*)
 +		__gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"
 +		;;
  	--*)
  		__gitcomp "
  			--color --no-color --verbose --abbrev= --no-abbrev
  			--track --no-track --contains --merged --no-merged
 -			--set-upstream --edit-description --list
 +			--set-upstream-to= --edit-description --list
 +			--unset-upstream
  			"
  		;;
  	*)
@@@ -1083,7 -1072,7 +1076,7 @@@ _git_diff (
  }
  
  __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
 -			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
 +			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
  "
  
  _git_difftool ()