summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-17 23:01:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-17 23:01:30 (GMT)
commite5b8ce243cc41a859469098a0f26d7ee1b1a49bc (patch)
tree5e0dffe627484eb505d7dd06b7b25f0e8741c1f1 /contrib
parentfbcbcee51c5f209922bb1d4409be2fe9a7c66231 (diff)
parent53e53c7c81ce2c7c4cd45f95bc095b274cb28b76 (diff)
downloadgit-e5b8ce243cc41a859469098a0f26d7ee1b1a49bc.zip
git-e5b8ce243cc41a859469098a0f26d7ee1b1a49bc.tar.gz
git-e5b8ce243cc41a859469098a0f26d7ee1b1a49bc.tar.bz2
Merge branch 'sg/completion-remote'
Code simplification. * sg/completion-remote: completion: simplify __git_remotes() completion: add a test for __git_remotes() helper function
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash7
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c21190d..f5ae5e3 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -411,12 +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 ()