From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Sep 2012 22:55:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1c62ee9de2239537167d8791bd5e62403191f66?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: Document signature showing options
completion: fix shell expansion of items
---

f1c62ee9de2239537167d8791bd5e62403191f66
diff --combined contrib/completion/git-completion.bash
index be800e09bd,3b98290349..c48cd19f12
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -225,6 -225,13 +225,13 @@@ _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:
@@@ -261,7 -268,7 +268,7 @@@ __gitcomp (
  __gitcomp_nl ()
  {
  	local IFS=$'\n'
- 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+ 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
  }
  
  __git_heads ()
@@@ -875,15 -882,11 +882,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
  			"
  		;;
  	*)
@@@ -1076,7 -1079,7 +1083,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 ()