[PATCH v7 21/49] completion: zsh: add support for general -C opts
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.zsh | 6 ++++++
t/t9904-completion-zsh.sh | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index b49bce51ac..9e821eab9a 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -206,6 +206,7 @@ __git_zsh_main ()
{
local curcontext="$curcontext" state state_descr line
typeset -A opt_args
+ local -a __git_C_args
_arguments -C \
'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
@@ -221,6 +222,7 @@ __git_zsh_main ()
'--namespace=[set the git namespace]:' \
'--no-replace-objects[do not use replacement refs to replace git objects]' \
'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+ '*-C[run as if git was started in the given path]: :_directories' \
'(-): :->command' \
'(-)*:: :->arg' && return
@@ -243,6 +245,10 @@ __git_zsh_main ()
__git_dir=${~opt_args[--git-dir]}
fi
+ for x in ${(s.:.)opt_args[-C]}; do
+ __git_C_args+=('-C' ${~x})
+ done
+
(( $+opt_args[--help] )) && command='help'
words=( git ${words[@]} )
diff --git a/t/t9904-completion-zsh.sh b/t/t9904-completion-zsh.sh
index ee8cbe3320..27f5b42318 100755
--- a/t/t9904-completion-zsh.sh
+++ b/t/t9904-completion-zsh.sh
@@ -863,7 +863,7 @@ test_expect_success 'checkout completes ref names' '
EOF
'
-test_expect_failure 'git -C <path> checkout uses the right repo' '
+test_expect_success 'git -C <path> checkout uses the right repo' '
test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF
branch-in-other Z
EOF
--
2.33.0
Felipe Contreras <felipe.contreras@gmail.com>