diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:33 (GMT) |
| commit | 7d6f6e373007553d747b4f0f5083d66fdd0c17c5 (patch) | |
| tree | d4ca4edb55a591e90a3576027975b676cbfc0eb4 /contrib | |
| parent | ffac6258de4f72e06b6b2e412deffb00a1abb339 (diff) | |
| parent | 53e53c7c81ce2c7c4cd45f95bc095b274cb28b76 (diff) | |
| download | git-7d6f6e373007553d747b4f0f5083d66fdd0c17c5.zip git-7d6f6e373007553d747b4f0f5083d66fdd0c17c5.tar.gz git-7d6f6e373007553d747b4f0f5083d66fdd0c17c5.tar.bz2 | |
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')
| -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 1e8965b..b892908 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 () |