summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-09-25 04:31:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-25 16:00:28 (GMT)
commit666ca59a8c88e1750386fa64c7ed4be698fd1b2a (patch)
tree57db9f9cf60a5dbff1b4f87ed53475b56f285c73
parent1a002c73ba63799dda75a4c28da5b562eea7a3ff (diff)
downloadgit-666ca59a8c88e1750386fa64c7ed4be698fd1b2a.zip
git-666ca59a8c88e1750386fa64c7ed4be698fd1b2a.tar.gz
git-666ca59a8c88e1750386fa64c7ed4be698fd1b2a.tar.bz2
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>
-rw-r--r--contrib/completion/git-completion.bash9
1 files changed, 1 insertions, 8 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3b98290..5b255cb 100644
--- 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 ()