From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: git-fc@googlegroups.com, Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 25/51] completion: zsh: add excluded options
Date: Tue, 30 Aug 2022 04:31:12 -0500 [thread overview]
Message-ID: <20220830093138.1581538-26-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20220830093138.1581538-1-felipe.contreras@gmail.com>
Add more excluded options, for example: --bare excludes --git-dir.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.zsh | 17 +++++++++--------
t/t9904-zsh-completion.sh | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index f732881958..d2eb221d79 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -217,15 +217,16 @@ __git_zsh_main ()
local -a __git_C_args
_arguments -C \
- '(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
- '(-p --paginate)--no-pager[do not pipe git output into a pager]' \
- '--git-dir=[set the path to the repository]: :_directories' \
- '--bare[treat the repository as a bare repository]' \
+ '(-p --paginate -P --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+ '(-p --paginate -P --no-pager)'{-P,--no-pager}'[do not pipe git output into a pager]' \
+ '(--bare)--git-dir=[set the path to the repository]: :_directories' \
+ '(--git-dir)--bare[treat the repository as a bare repository]' \
'(- :)--version[prints the git suite version]' \
- '--exec-path=[path to where your core git programs are installed]:: :_directories' \
- '--html-path[print the path where git''s HTML documentation is installed]' \
- '--info-path[print the path where the Info files are installed]' \
- '--man-path[print the manpath (see `man(1)`) for the man pages]' \
+ '--exec-path=[path to where your core git programs are installed]: :_directories' \
+ '(- :)--exec-path[print the path where your core git programs are installed]' \
+ '(- :)--html-path[print the path where git''s HTML documentation is installed]' \
+ '(- :)--info-path[print the path where the Info files are installed]' \
+ '(- :)--man-path[print the manpath (see `man(1)`) for the man pages]' \
'--work-tree=[set the path to the working tree]: :_directories' \
'--namespace=[set the git namespace]:' \
'--no-replace-objects[do not use replacement refs to replace git objects]' \
diff --git a/t/t9904-zsh-completion.sh b/t/t9904-zsh-completion.sh
index 7283af3342..d0795ee014 100755
--- a/t/t9904-zsh-completion.sh
+++ b/t/t9904-zsh-completion.sh
@@ -802,7 +802,7 @@ test_expect_success 'general options' '
test_completion "git --no-r" "--no-replace-objects"
'
-test_expect_failure 'general options plus command' '
+test_expect_success 'general options plus command' '
test_completion "git --version check" "" &&
test_completion "git --paginate check" "checkout" &&
test_completion "git --git-dir=foo check" "checkout" &&
--
2.37.2.351.g9bf691b78c.dirty
next prev parent reply other threads:[~2022-08-30 9:34 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 9:30 [PATCH 00/51] completion: revamp Felipe Contreras
2022-08-30 9:30 ` [PATCH 01/51] test: completion add test for __git_cmd_idx Felipe Contreras
2022-08-30 9:30 ` [PATCH 02/51] test: add zsh completion tests Felipe Contreras
2022-08-30 9:30 ` [PATCH 03/51] completion: fix __git_cmd_idx regression for zsh Felipe Contreras
2022-08-30 9:30 ` [PATCH 04/51] completion: bash: trivial cleanup Felipe Contreras
2022-08-30 9:30 ` [PATCH 05/51] completion: zsh: add higher-priority location Felipe Contreras
2022-08-30 9:30 ` [PATCH 06/51] zsh: resolve symlink of script Felipe Contreras
2022-08-30 9:30 ` [PATCH 07/51] zsh: simplify realpath dirname idiom Felipe Contreras
2022-08-30 9:30 ` [PATCH 08/51] test: reset environment variables Felipe Contreras
2022-08-30 9:30 ` [PATCH 09/51] completion: prompt: use generic colors Felipe Contreras
2022-08-30 9:30 ` [PATCH 10/51] completion: fix for suboptions with value Felipe Contreras
2022-08-30 9:30 ` [PATCH 11/51] completion: zsh: trivial improvement Felipe Contreras
2022-08-30 9:30 ` [PATCH 12/51] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2022-08-30 9:31 ` [PATCH 13/51] test: completion: fix currently typed words Felipe Contreras
2022-08-30 9:31 ` [PATCH 14/51] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2022-08-30 9:31 ` [PATCH 15/51] test: completion: add run_func() helper Felipe Contreras
2022-08-30 9:31 ` [PATCH 16/51] completion: bash: remove non-append functionality Felipe Contreras
2022-08-30 9:31 ` [PATCH 17/51] completion: bash: get rid of _append() functions Felipe Contreras
2022-08-30 9:31 ` [PATCH 18/51] completion: bash: get rid of any non-append code Felipe Contreras
2022-08-30 9:31 ` [PATCH 19/51] completion: zsh: fix options with arguments Felipe Contreras
2022-08-30 9:31 ` [PATCH 20/51] completion: zsh: expand --git-dir file argument Felipe Contreras
2022-08-30 9:31 ` [PATCH 21/51] completion: zsh: add support for general -C opts Felipe Contreras
2022-08-30 9:31 ` [PATCH 22/51] completion: zsh: fix for undefined completions Felipe Contreras
2022-08-30 9:31 ` [PATCH 23/51] completion: zsh: add support for general -c opts Felipe Contreras
2022-08-30 9:31 ` [PATCH 24/51] completion: zsh: fix extra space on foo= Felipe Contreras
2022-08-30 9:31 ` Felipe Contreras [this message]
2022-08-30 9:31 ` [PATCH 26/51] completion: zsh: always set compset Felipe Contreras
2022-08-30 9:31 ` [PATCH 27/51] completion: factor out check in __gitcomp Felipe Contreras
2022-08-30 9:31 ` [PATCH 28/51] completion: simplify equal suffix check Felipe Contreras
2022-08-30 9:31 ` [PATCH 29/51] completion: refactor __gitcomp Felipe Contreras
2022-08-30 9:31 ` [PATCH 30/51] completion: simplify __gitcomp Felipe Contreras
2022-08-30 9:31 ` [PATCH 31/51] completion: bash: change suffix check in __gitcomp Felipe Contreras
2022-08-30 9:31 ` [PATCH 32/51] completion: improve __gitcomp suffix code Felipe Contreras
2022-08-30 9:31 ` [PATCH 33/51] test: completion: add missing test Felipe Contreras
2022-08-30 9:31 ` [PATCH 34/51] completion: bash: simplify config_variable_name Felipe Contreras
2022-08-30 9:31 ` [PATCH 35/51] completion: bash: improve __gitcomp description Felipe Contreras
2022-08-30 9:31 ` [PATCH 36/51] completion: add __gitcomp_opts Felipe Contreras
2022-08-30 9:31 ` [PATCH 37/51] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2022-08-30 9:31 ` [PATCH 38/51] completion: bash: shuffle __gitcomp functions Felipe Contreras
2022-08-30 9:31 ` [PATCH 39/51] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2022-08-30 9:31 ` [PATCH 40/51] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2022-08-30 9:31 ` [PATCH 41/51] completion: zsh: fix direct quoting Felipe Contreras
2022-08-30 9:31 ` [PATCH 42/51] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2022-08-30 9:31 ` [PATCH 43/51] completion: zsh: add __gitcompadd helper Felipe Contreras
2022-08-30 9:31 ` [PATCH 44/51] completion: zsh: add correct removable suffix Felipe Contreras
2022-08-30 9:31 ` [PATCH 45/51] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2022-08-30 9:31 ` [PATCH 46/51] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2022-08-30 9:31 ` [PATCH 47/51] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2022-08-30 9:31 ` [PATCH 48/51] completion: bash: trivial cleanup Felipe Contreras
2022-08-30 9:31 ` [PATCH 49/51] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras
2022-08-30 9:31 ` [PATCH 50/51] zsh: remove version Felipe Contreras
2022-08-30 9:31 ` [PATCH 51/51] completion: bash: trivial grammar fix Felipe Contreras
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=20220830093138.1581538-26-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git-fc@googlegroups.com \
--cc=git@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).