From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Feb 2012 01:49:02 +0000 (-0800)
Subject: Sync with 1.7.9.2
X-Git-Tag: v1.7.10-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb?ds=inline;hp=-c

Sync with 1.7.9.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb
diff --combined contrib/completion/git-completion.bash
index 3a05a5b74c,0acbdda3b8..554e30e961
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -60,18 -60,6 +60,6 @@@
  #       per-repository basis by setting the bash.showUpstream config
  #       variable.
  #
- #
- # To submit patches:
- #
- #    *) Read Documentation/SubmittingPatches
- #    *) Send all patches to the current maintainer:
- #
- #       "Shawn O. Pearce" <spearce@spearce.org>
- #
- #    *) Always CC the Git mailing list:
- #
- #       git@vger.kernel.org
- #
  
  if [[ -n ${ZSH_VERSION-} ]]; then
  	autoload -U +X bashcompinit && bashcompinit
@@@ -298,13 -286,13 +286,13 @@@ __git_ps1 (
  				fi
  			fi
  			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
- 			        git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
+ 				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
  			fi
  
  			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
- 			   if [ -n "$(git ls-files --others --exclude-standard)" ]; then
- 			      u="%"
- 			   fi
+ 				if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+ 					u="%"
+ 				fi
  			fi
  
  			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
@@@ -2512,7 -2500,7 +2500,7 @@@ _git_svn (
  			__gitcomp "
  				--merge --strategy= --verbose --dry-run
  				--fetch-all --no-rebase --commit-url
 -				--revision $cmt_opts $fc_opts
 +				--revision --interactive $cmt_opts $fc_opts
  				"
  			;;
  		set-tree,--*)