From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 May 2012 22:34:46 +0000 (-0700)
Subject: Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
X-Git-Tag: v1.7.12-rc0~67^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/423b5a104422d56645baf8229bfb496fa49c2a56?ds=inline;hp=-c

Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

By Michael Haggerty (17) and others
via Junio C Hamano (36) and Jeff King (1)
* fc/git-complete-helper: (54 commits)
completion: add new __git_complete helper
Update draft release notes to 1.7.11 (11th batch)
Git 1.7.10.2
document submdule.$name.update=none option for gitmodules
The tenth batch of topics
Update draft release notes to 1.7.10.2
checkout: do not corrupt HEAD on empty repo
apply: remove lego in i18n string in gitdiff_verify_name
dir: convert to strbuf
status: refactor colopts handling
status: respect "-b" for porcelain format
status: fix null termination with "-b"
status: refactor null_termination option
commit: refactor option parsing
Documentation/git-config: describe and clarify "--local <file>" option
reflog-walk: tell explicit --date=default from not having --date at all
clone: fix progress-regression
grep.c: remove redundant line of code
checkout (detached): truncate list of orphaned commits at the new HEAD
t2020-checkout-detach: check for the number of orphaned commits
...
---

423b5a104422d56645baf8229bfb496fa49c2a56
diff --combined t/t9902-completion.sh
index a0ea946327,0f09fd6109..c8f3ec6bec
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@@ -3,9 -3,21 +3,9 @@@
  # Copyright (c) 2012 Felipe Contreras
  #
  
 -if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then
 -	# we are in full-on bash mode
 -	true
 -elif type bash >/dev/null 2>&1; then
 -	# execute in full-on bash mode
 -	unset POSIXLY_CORRECT
 -	exec bash "$0" "$@"
 -else
 -	echo '1..0 #SKIP skipping bash completion tests; bash not available'
 -	exit 0
 -fi
 -
  test_description='test bash completion'
  
 -. ./test-lib.sh
 +. ./lib-bash.sh
  
  complete ()
  {
@@@ -51,7 -63,7 +51,7 @@@ run_completion (
  	local _cword
  	_words=( $1 )
  	(( _cword = ${#_words[@]} - 1 ))
- 	_git && print_comp
+ 	__git_wrap_git && print_comp
  }
  
  test_completion ()