From: Jonathan Nieder Date: Thu, 02 Feb 2012 09:05:29 GMT Subject: Re: [PATCH v3 2/4] completion: simplify __git_remotes Message-ID: <20120202090529.GD3823@burratino> In-Reply-To: <1328145320-14071-1-git-send-email-felipe.contreras@gmail.com> Felipe Contreras wrote: > completion: simplify __git_remotes > completion: remove unused code In the same spirit of stealing potential shortlog lines from Junio: -- >8 -- From: Felipe Contreras Subject: completion: use ls -1 instead of rolling a loop to do that ourselves This simplifies the code a great deal. In particular, it allows us to get rid of __git_shopt, which is used only in this fuction to enable 'nullglob' in zsh. [jn: squashed with a patch that actually gets rid of __git_shopt] Signed-off-by: Felipe Contreras Signed-off-by: Jonathan Nieder --- The diffstat says it all. contrib/completion/git-completion.bash | 37 +------------------------------- 1 files changed, 1 insertions(+), 36 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 78be1958..4612dde9 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -644,12 +644,7 @@ __git_refs_remotes () __git_remotes () { local i ngoff IFS=$'\n' d="$(__gitdir)" - __git_shopt -q nullglob || ngoff=1 - __git_shopt -s nullglob - for i in "$d/remotes"/*; do - echo ${i#$d/remotes/} - done - [ "$ngoff" ] && __git_shopt -u nullglob + 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*/}" @@ -2733,33 +2728,3 @@ if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then complete -o bashdefault -o default -o nospace -F _git git.exe 2>/dev/null \ || complete -o default -o nospace -F _git git.exe fi - -if [[ -n ${ZSH_VERSION-} ]]; then - __git_shopt () { - local option - if [ $# -ne 2 ]; then - echo "USAGE: $0 (-q|-s|-u)