Revert "completion: fix shell expansion of items"
This reverts commit 25ae7cfd19c8f21721363c64163cd5d9d1135b20. That patch does fix expansion of weird variables in some simple tests, but it also seems to break other things, like expansion of refs by "git checkout". While we're sorting out the correct solution, we are much better with the original bug (people with metacharacters in their completions occasionally see an error message) than the current bug (ref completion does not work at all). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 25, 2012 at 00:31 UTC
666ca59a8c88e1750386fa64c7ed4be698fd1b2a
1 file changed
+1
-8
contrib/completion/git-completion.bash
+1
-8
@@ -225,13 +225,6 @@ _get_comp_words_by_ref ()
225
fi
226
fi
227
228
-# Quotes the argument for shell reuse
229
-__git_quote()
230
-{
231
- local quoted=${1//\'/\'\\\'\'}
232
- printf "'%s'" "$quoted"
233
-}
234
-
228
# Generates completion reply with compgen, appending a space to possible
229
# completion words, if necessary.
230
# It accepts 1 to 4 arguments:
@@ -268,7 +261,7 @@ __gitcomp ()
261
__gitcomp_nl ()
262
{
263
local IFS=$'\n'
271
- COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
264
+ COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
265
}
266
267
__git_heads ()