All of lore.kernel.org
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
	"Björn Gustavsson" <bgustavsson@gmail.com>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	"Robert Zeh" <robert.a.zeh@gmail.com>,
	"Peter van der Does" <peter@avirtualhome.com>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Jeff King" <peff@peff.net>
Subject: Re: [RFC/PATCH 3/5] completion: trivial test improvement
Date: Sat, 17 Nov 2012 11:59:24 +0100	[thread overview]
Message-ID: <20121117105924.GD12052@goldbirke> (raw)
In-Reply-To: <1353116298-11798-4-git-send-email-felipe.contreras@gmail.com>

On Sat, Nov 17, 2012 at 02:38:16AM +0100, Felipe Contreras wrote:
> Instead of passing a dummy "", let's check if the last character is a
> space, and then move the _cword accordingly.
> 
> Apparently we were passing "" all the way to compgen, which fortunately
> expanded it to nothing.

Glad you noticed it, too.
I posted an alternative fix (without any new conditions in the code
path) a while ago:

  http://article.gmane.org/gmane.comp.version-control.git/206525

Will repost it as part of my series shortly.

> Lets do the right thing though.
> 
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>  t/t9902-completion.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index cbd0fb6..0b5e1f5 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -51,6 +51,7 @@ run_completion ()
>  	local _cword
>  	_words=( $1 )
>  	(( _cword = ${#_words[@]} - 1 ))
> +	test "${1: -1}" == ' ' && (( _cword += 1 ))
>  	__git_wrap__git_main && print_comp
>  }
>  
> @@ -156,7 +157,7 @@ test_expect_success '__gitcomp - suffix' '
>  '
>  
>  test_expect_success 'basic' '
> -	run_completion "git \"\"" &&
> +	run_completion "git " &&
>  	# built-in
>  	grep -q "^add \$" out &&
>  	# script
> -- 
> 1.8.0
> 

  reply	other threads:[~2012-11-17 10:59 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-17  1:38 [RFC/PATCH 0/5] completion: compgen/compadd cleanups Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 1/5] completion: get rid of empty COMPREPLY assignments Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 2/5] completion: add new __gitcompadd helper Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 3/5] completion: trivial test improvement Felipe Contreras
2012-11-17 10:59   ` SZEDER Gábor [this message]
2012-11-17  1:38 ` [RFC/PATCH 4/5] completion: get rid of compgen Felipe Contreras
2012-11-17 11:00   ` SZEDER Gábor
2012-11-17 11:42     ` Felipe Contreras
2012-11-17 14:12       ` SZEDER Gábor
2012-11-17 19:33         ` Felipe Contreras
2012-11-18  0:53           ` Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 5/5] completion: refactor __gitcomp_1 Felipe Contreras
2012-11-17 10:58   ` SZEDER Gábor
2012-11-17 11:27     ` Felipe Contreras
2012-11-17 14:13       ` SZEDER Gábor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121117105924.GD12052@goldbirke \
    --to=szeder@ira.uka.de \
    --cc=bgustavsson@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=peter@avirtualhome.com \
    --cc=robert.a.zeh@gmail.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.