Re: [POC PATCH 5/5] completion: avoid compgen to fix expansion issues in __gitcomp_nl()

[SZEDER Gábor]

On Fri, Sep 28, 2012 at 12:09:35PM +0200, SZEDER Gábor wrote:
>  __gitcomp_nl ()
>  {
>       local IFS=$'\n'
> -     COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> +     COMPREPLY=($(echo "$1" |sed -n "/^${3-$cur}/ {

$cur can be a path, so it can contain /, which then breaks this sed
expression.  Here's a fixup:


diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index 2df865fd..d30f376f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -260,8 +260,8 @@ __gitcomp ()
 #    appended.
 __gitcomp_nl ()
 {
-       local IFS=$'\n'
-       COMPREPLY=($(echo "$1" |sed -n "/^${3-$cur}/ {
+       local IFS=$'\n' cur_=${3-$cur}
+       COMPREPLY=($(echo "$1" |sed -n "/^${cur_//\//\\/}/ {
                s/^/${2-}/
                s/$/${4- }/
                p
-- 
1.7.12.1.490.g14283db

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html