diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-17 16:01:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-17 16:01:30 -0700 |
| commit | e5b8ce243cc41a859469098a0f26d7ee1b1a49bc (patch) | |
| tree | 5e0dffe627484eb505d7dd06b7b25f0e8741c1f1 /contrib | |
| parent | Merge branch 'es/rebase-i-count-todo' (diff) | |
| parent | completion: simplify __git_remotes() (diff) | |
| download | tgif-e5b8ce243cc41a859469098a0f26d7ee1b1a49bc.tar.xz | |
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.bash | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c21190d751..f5ae5e3a8c 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 () |