From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 May 2012 19:07:09 +0000 (-0700)
Subject: Merge branch 'fc/git-complete-helper-fix'
X-Git-Tag: v1.7.11-rc0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b19ea23473c45dd6d39b55b3d2134cc812820c41?ds=inline;hp=-c

Merge branch 'fc/git-complete-helper-fix'

Resurrects old behaviour of _git/_gitk for external users.
---

b19ea23473c45dd6d39b55b3d2134cc812820c41
diff --combined contrib/completion/git-completion.bash
index cd92322161,ac29193b0c..1689f99539
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -676,7 -676,9 +676,7 @@@ __git_complete_revlist_file (
  		*)   pfx="$ref:$pfx" ;;
  		esac
  
 -		local IFS=$'\n'
 -		COMPREPLY=($(compgen -P "$pfx" \
 -			-W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
 +		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
  				| sed '/^100... blob /{
  				           s,^.*	,,
  				           s,$, ,
@@@ -690,7 -692,7 +690,7 @@@
  				           s,$,/,
  				       }
  				       s/^.*	//')" \
 -			-- "$cur_"))
 +			"$pfx" "$cur_" ""
  		;;
  	*...*)
  		pfx="${cur_%...*}..."
@@@ -2597,7 -2599,7 +2597,7 @@@ _git_whatchanged (
  	_git_log
  }
  
- _git ()
+ _main_git ()
  {
  	local i c=1 command __git_dir
  
@@@ -2648,7 -2650,7 +2648,7 @@@
  	fi
  }
  
- _gitk ()
+ _main_gitk ()
  {
  	__git_has_doubledash && return
  
@@@ -2700,13 -2702,25 +2700,25 @@@ __git_complete (
  		|| complete -o default -o nospace -F $wrapper $1
  }
  
- __git_complete git _git
- __git_complete gitk _gitk
+ # wrapper for backwards compatibility
+ _git ()
+ {
+ 	__git_wrap_main_git
+ }
+ 
+ # wrapper for backwards compatibility
+ _gitk ()
+ {
+ 	__git_wrap_main_gitk
+ }
+ 
+ __git_complete git _main_git
+ __git_complete gitk _main_gitk
  
  # The following are necessary only for Cygwin, and only are needed
  # when the user has tab-completed the executable name and consequently
  # included the '.exe' suffix.
  #
  if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
- __git_complete git.exe _git
+ __git_complete git.exe _main_git
  fi