Re: [RFC/PATCH 3/5] completion: trivial test improvement
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Nov 17, 2012, 10:59 UTC
- Message-ID
- <20121117105924.GD12052@goldbirke>
- 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:
Show 5 quoted lines
> 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.
Show 31 quoted lines
> 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
>