From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:23:33 +0000 (-0700)
Subject: Merge branch 'sg/completion-remote' into maint
X-Git-Tag: v2.3.4~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7d6f6e373007553d747b4f0f5083d66fdd0c17c5?ds=inline;hp=-c

Merge branch 'sg/completion-remote' into maint

Code simplification.

* sg/completion-remote:
completion: simplify __git_remotes()
completion: add a test for __git_remotes() helper function
---

7d6f6e373007553d747b4f0f5083d66fdd0c17c5
diff --combined contrib/completion/git-completion.bash
index 1e8965b828,d722b0a895..b8929084d0
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -411,12 -411,9 +411,9 @@@ __git_refs_remotes (
  
  __git_remotes ()
  {
- 	local i IFS=$'\n' d="$(__gitdir)"
+ 	local d="$(__gitdir)"
  	test -d "$d/remotes" && ls -1 "$d/remotes"
- 	for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do
- 		i="${i#remote.}"
- 		echo "${i/.url*/}"
- 	done
+ 	git --git-dir="$d" remote
  }
  
  __git_list_merge_strategies ()
@@@ -2014,7 -2011,6 +2011,7 @@@ _git_config (
  		color.status.changed
  		color.status.header
  		color.status.nobranch
 +		color.status.unmerged
  		color.status.untracked
  		color.status.updated
  		color.ui