Re: [PATCH v2] completion: fix __git_complete_worktree_paths

> Use __git to invoke "worktree list" in __git_complete_worktree_paths, to
> respect any "-C" and "--git-dir" options present on the command line.
> 
> Signed-off-by: Rubén Justo <rjusto@gmail.com>
> ---
> 
> I stumbled upon this in a situation like:
> 
>    $ git init /tmp/foo && cd /tmp/foo
>    $ git worktree add --orphan foo_wt
> 
>    $ git init /tmp/bar && cd /tmp/bar
>    $ git worktree add --orphan bar_wt
> 
>    $ cd /tmp/foo
>    $ git -C /tmp/bar worktree remove <TAB>
>    ... expecting /tmp/bar/wt, but ...
>    $ git -C /tmp/bar worktree remove /tmp/foo_wt
> 
> In this iteration, v2, some tests are included.
> 
> The function __git was introduced in 1cd23e9e05 (completion: don't use
> __gitdir() for git commands, 2017-02-03).  It is a small function, so
> I'll include here to ease the review of this patch:
> 
> 	# Runs git with all the options given as argument, respecting any
> 	# '--git-dir=<path>' and '-C <path>' options present on the command line
> 	__git ()
> 	{
> 		git ${__git_C_args:+"${__git_C_args[@]}"} \
> 			${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
> 	}
> 
> 
>  contrib/completion/git-completion.bash |  2 +-
>  t/t9902-completion.sh                  | 24 ++++++++++++++++++++++++
>  2 files changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 444b3efa63..86e55dc67f 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -3571,7 +3571,7 @@ __git_complete_worktree_paths ()
>  	# Generate completion reply from worktree list skipping the first
>  	# entry: it's the path of the main worktree, which can't be moved,
>  	# removed, locked, etc.
> -	__gitcomp_nl "$(git worktree list --porcelain |
> +	__gitcomp_nl "$(__git worktree list --porcelain |
>  		sed -n -e '2,$ s/^worktree //p')"
>  }
>  
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index b16c284181..7c0f82f31a 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -1263,6 +1263,30 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
>  	test_cmp expected out
>  '
>  
> +test_expect_success '__git_complete_worktree_paths' '
> +	test_when_finished "git worktree remove other_wt" &&
> +	git worktree add --orphan other_wt &&
> +	run_completion "git worktree remove " &&
> +	grep other_wt out
> +'
> +
> +test_expect_success '__git_complete_worktree_paths - not a git repository' '
> +	(
> +		cd non-repo &&
> +		GIT_CEILING_DIRECTORIES="$ROOT" &&
> +		export GIT_CEILING_DIRECTORIES &&
> +		test_completion "git worktree remove " "" 2>err &&
> +		test_must_be_empty err
> +	)
> +'

> +'
> +
>  test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' '
>  	test_completion "git switch " <<-\EOF
>  	branch-in-other Z
> -- 
> 2.44.0.1.g0da3aa8f7f
>