Skip to content

Commit 666ca59

Browse files
peffgitster
authored andcommitted
Revert "completion: fix shell expansion of items"
This reverts commit 25ae7cf. 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1a002c7 commit 666ca59

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

contrib/completion/git-completion.bash

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,6 @@ _get_comp_words_by_ref ()
225225
fi
226226
fi
227227

228-
# Quotes the argument for shell reuse
229-
__git_quote()
230-
{
231-
local quoted=${1//\'/\'\\\'\'}
232-
printf "'%s'" "$quoted"
233-
}
234-
235228
# Generates completion reply with compgen, appending a space to possible
236229
# completion words, if necessary.
237230
# It accepts 1 to 4 arguments:
@@ -268,7 +261,7 @@ __gitcomp ()
268261
__gitcomp_nl ()
269262
{
270263
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}"))
272265
}
273266

274267
__git_heads ()

0 commit comments

Comments
 (0)