summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-25 10:25:52 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-25 10:25:52 -0700
commit8e609b270ad3ca4db2e9b7ba14c1d36d2deb8563 (patch)
tree096d3d64df6418bb7619823bec21a03b2cfee398 /contrib
parentb5d156c3622fa522966034c78fd6ed9a15504d46 (diff)
parent666ca59a8c88e1750386fa64c7ed4be698fd1b2a (diff)
downloadgit-8e609b270ad3ca4db2e9b7ba14c1d36d2deb8563.tar.gz
Merge branch 'maint'
* maint: Revert "completion: fix shell expansion of items"
Diffstat (limited to 'contrib')
-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 c48cd19f12..be800e09bd 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 ()