From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Dec 2011 21:37:18 +0000 (-0800)
Subject: Merge branch 'sg/complete-refs'
X-Git-Tag: v1.7.9-rc0~81
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2c78075496d818d04cc04583b35af117c3a95ed;p=git.git

Merge branch 'sg/complete-refs'

* sg/complete-refs:
  completion: remove broken dead code from __git_heads() and __git_tags()
  completion: fast initial completion for config 'remote.*.fetch' value
  completion: improve ls-remote output filtering in __git_refs_remotes()
  completion: query only refs/heads/ in __git_refs_remotes()
  completion: support full refs from remote repositories
  completion: improve ls-remote output filtering in __git_refs()
  completion: make refs completion consistent for local and remote repos
  completion: optimize refs completion
  completion: document __gitcomp()

Conflicts:
	contrib/completion/git-completion.bash
---

d2c78075496d818d04cc04583b35af117c3a95ed
diff --cc contrib/completion/git-completion.bash
index b7c1edf1c,16623d7c3..cc1bdf960
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1456,16 -1466,7 +1471,16 @@@ _git_grep (
  		;;
  	esac
  
 +	case "$cword,$prev" in
 +	2,*|*,-*)
 +		if test -r tags; then
- 			__gitcomp "$(__git_match_ctag "$cur" tags)"
++			__gitcomp_nl "$(__git_match_ctag "$cur" tags)"
 +			return
 +		fi
 +		;;
 +	esac
 +
- 	__gitcomp "$(__git_refs)"
+ 	__gitcomp_nl "$(__git_refs)"
  }
  
  _git_help ()