diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:55:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:55:47 -0700 |
| commit | f1c62ee9de2239537167d8791bd5e62403191f66 (patch) | |
| tree | 427a21eea2a4e6e62f700a61d96dbd7b2c2aaa7e /contrib | |
| parent | b0576a6a6dd3b311391090b2ce15f991ac9914cf (diff) | |
| parent | 8ef2794ba8ada6b64afb22ff7b235dce583b9712 (diff) | |
| download | git-f1c62ee9de2239537167d8791bd5e62403191f66.tar.gz git-f1c62ee9de2239537167d8791bd5e62403191f66.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: Document signature showing options
completion: fix shell expansion of items
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index be800e09b..c48cd19f1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -225,6 +225,13 @@ _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: @@ -261,7 +268,7 @@ __gitcomp () __gitcomp_nl () { local IFS=$'\n' - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}")) + COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}")) } __git_heads () |