Re: [PATCH v9 3/3] branch: add worktree info on verbose output

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mar 18, 2019, 12:10 UTC
Message-ID: <20190318121054.GC24175@szeder.dev>
In-Reply-To: <20190316013807.38756-4-nbelakovski@gmail.com>

On Fri, Mar 15, 2019 at 06:38:07PM -0700, nbelakovski@gmail.com wrote:

Show 13 quoted lines

> diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
> index ceb74e0826..e5dc23e225 100755
> --- a/t/t3203-branch-output.sh
> +++ b/t/t3203-branch-output.sh
> @@ -328,4 +328,23 @@ test_expect_success '--color overrides auto-color' '
>  	test_cmp expect.color actual
>  '
>  
> +test_expect_success 'verbose output lists worktree path' '
> +	one=$(git rev-parse --short HEAD) &&
> +	two=$(git rev-parse --short master) &&
> +	cat >expect <<-EOF &&
> +	* (HEAD detached from fromtag) $one one

This 'HEAD detached from ..." message is translated ...

Show 12 quoted lines

> +	  ambiguous                    $one one
> +	  branch-one                   $two two
> +	+ branch-two                   $one ($(pwd)/worktree_dir) one
> +	  master                       $two two
> +	  ref-to-branch                $two two
> +	  ref-to-remote                $two two
> +	EOF
> +	git worktree add worktree_dir branch-two &&
> +	git branch -vv >actual &&
> +	rm -r worktree_dir &&
> +	git worktree prune &&
> +	test_cmp expect actual

... therefore here you should use 'test_i18ncmp', as otherwise the GETTEXT_POISON test run fails.

Show 6 quoted lines

> +'
> +
>  test_done
> -- 
> 2.14.2
>