[PATCH 08/11] completion: get rid of __gitcomp_file()
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 27, 2013, 10:19 UTC
- Message-ID
- <1367057994-19887-9-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1367057994-19887-1-git-send-email-felipe.contreras@gmail.com>
Now that we don't use -o filenames, it's no different from __gitcomp_nl().
The only reason we might want it is for other shells, like zsh, which can do more useful things if they know it's a file, like colouring the output. But that can be done in the zsh completion.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- contrib/completion/git-completion.bash | 29 +---------------------------- contrib/completion/git-completion.zsh | 9 --------- 2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5dd6646..a9b6a48 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -237,24 +237,6 @@ __gitcomp_nl () __gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }" } -# Generates completion reply with compgen from newline-separated possible -# completion filenames. -# It accepts 1 to 3 arguments: -# 1: List of possible completion filenames, separated by a single newline. -# 2: A directory prefix to be added to each possible completion filename -# (optional). -# 3: Generate possible completion matches for this word (optional). -__gitcomp_file () -{ - local IFS=$'\n' - - # XXX does not work when the directory prefix contains a tilde, - # since tilde expansion is not applied. - # This means that COMPREPLY will be empty and Bash default - # completion will be used. - __gitcompadd "$1" "${2-}" "${3-$cur}" "" -} - # Process path list returned by "ls-files" and "diff-index --name-only" # commands, in order to list only file names relative to a specified # directory, and append a slash to directory names. @@ -518,7 +500,7 @@ __git_complete_index_file () ;; esac - __gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_" + __gitcomp_nl "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_" "" } __git_complete_file () @@ -2594,15 +2576,6 @@ if [[ -n ${ZSH_VERSION-} ]]; then compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } - __gitcomp_file () - { - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -Q -p "${2-}" -f -- ${=1} && _ret=0 - } - __git_zsh_helper () { emulate -L ksh diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index cf8116d..4577502 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -60,15 +60,6 @@ __gitcomp_nl () compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } -__gitcomp_file () -{ - emulate -L zsh - - local IFS=$'\n' - compset -P '*[=:]' - compadd -Q -p "${2-}" -f -- ${=1} && _ret=0 -} - _git () { local _ret=1
-- 1.8.2.1.1031.g2ee5873