From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 11/29] completion: zsh: fix completion for --no-.. options
Date: Sat, 24 Oct 2020 22:13:25 -0500 [thread overview]
Message-ID: <20201025031343.346913-12-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com>
This was introduced in upstream's bash script, but never in zsh's:
b221b5ab9b (completion: collapse extra --no-.. options)
It has been failing since v2.19.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.zsh | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 17041d0b23..c2a90beb8b 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -56,10 +56,32 @@ __gitcomp ()
case "$cur_" in
--*=)
;;
+ --no-*)
+ local c IFS=$' \t\n'
+ local -a array
+ for c in ${=1}; do
+ if [[ $c == "--" ]]; then
+ continue
+ fi
+ c="$c${4-}"
+ case $c in
+ --*=|*.) ;;
+ *) c="$c " ;;
+ esac
+ array+=("$c")
+ done
+ compset -P '*[=:]'
+ compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+ ;;
*)
local c IFS=$' \t\n'
local -a array
for c in ${=1}; do
+ if [[ $c == "--" ]]; then
+ c="--no-...${4-}"
+ array+=("$c ")
+ break
+ fi
c="$c${4-}"
case $c in
--*=*|*.) ;;
--
2.29.0
next prev parent reply other threads:[~2020-10-25 3:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-25 3:13 [PATCH v2 00/29] completion: zsh: latest patches Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 01/29] completion: zsh: fix __gitcomp_direct() Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 02/29] completion: zsh: fix name due to broken autoloading Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 03/29] completion: zsh: fix bash script extension Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 04/29] completion: zsh: reorganize install instructions Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 05/29] completion: zsh: fix for directories with spaces Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 06/29] completion: zsh: update slave script locations Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 07/29] completion: prompt: fix color for Zsh Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 08/29] completion: zsh: fix for command aliasing Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 09/29] completion: bash: synchronize zsh wrapper Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 10/29] completion: bash: remove " Felipe Contreras
2020-10-25 3:13 ` Felipe Contreras [this message]
2020-10-25 3:13 ` [PATCH v2 12/29] completion: fix conflict with bashcomp Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 13/29] completion: zsh: add missing direct_append Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 14/29] completion: zsh: fix splitting of words Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 15/29] completion: zsh: simplify compadd functions Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 16/29] completion: zsh: simplify direct compadd Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 17/29] completion: zsh: trivial cleanup Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 18/29] completion: zsh: simplify nl_append Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 19/29] completion: zsh: simplify file_direct Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 20/29] completion: zsh: shuffle functions around Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 21/29] completion: zsh: refactor command completion Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 22/29] completion: zsh: improve command tags Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 23/29] completion: zsh: add alias descriptions Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 24/29] completion: zsh: trivial simplification Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 25/29] completion: zsh: add simple version check Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 26/29] completion: bash: trivial cleanup Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 27/29] completion: bash: cleanup cygwin check Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 28/29] completion: bash: remove old compat wrappers Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 29/29] Update copyright notices Felipe Contreras
2020-10-27 20:14 ` [PATCH v2 00/29] completion: zsh: latest patches Junio C Hamano
2020-10-28 1:48 ` 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=20201025031343.346913-12-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/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).