Merge branch 'maint'

* maint:
Revert "completion: fix shell expansion of items"

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c48cd19f126158b3dc7453b4ddb7e252ef35c1c2..be800e09bdf0656951c415105e0d32ce0b0edf9e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -225,13 +225,6 @@ _get_comp_words_by_ref ()
 fi
 fi
 
-# Quotes the argument for shell reuse
-__git_quote()
-{
-       local quoted=${1//\'/\'\\\'\'}
-       printf "'%s'" "$quoted"
-}
-
 # Generates completion reply with compgen, appending a space to possible
 # completion words, if necessary.
 # It accepts 1 to 4 arguments:
@@ -268,7 +261,7 @@ __gitcomp ()
 __gitcomp_nl ()
 {
        local IFS=$'\n'
-       COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
+       COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
 }
 
 __git_heads ()