summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:23:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:23:33 -0700
commit7d6f6e373007553d747b4f0f5083d66fdd0c17c5 (patch)
treed4ca4edb55a591e90a3576027975b676cbfc0eb4 /contrib/completion/git-completion.bash
parentMerge branch 'mg/doc-status-color-slot' into maint (diff)
parentcompletion: simplify __git_remotes() (diff)
downloadtgif-7d6f6e373007553d747b4f0f5083d66fdd0c17c5.tar.xz
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
Diffstat (limited to 'contrib/completion/git-completion.bash')
-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 1e8965b828..b8929084d0 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 ()