From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: minor git completion tweaks
Date: Fri, 19 Aug 2016 18:49:01 +0200 [thread overview]
Message-ID: <70414.1471625341@hydra.kiddle.eu> (raw)
This is just a few minor tweaks that were suggested off-list following
last week's patch.
Oliver
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ac4c90e..f4011aa 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -249,11 +249,7 @@ _git-bisect () {
;;
esac
;;
- (${(j.|.)~good})
- _arguments \
- ': :__git_commits' && ret=0
- ;;
- (${(j.|.)~good}|skip)
+ (${(j.|.)~bad}|${(j.|.)~good}|skip)
# TODO: skip can take revlists.
_arguments \
'*: :__git_commits' && ret=0
@@ -991,7 +987,7 @@ _git-grep () {
'(-A --after-context)'{-A+,--after-context=}'[show <num> trailing lines, and separate groups of matches]: :__git_guard_number lines' \
'(-B --before-context)'{-B+,--before-context=}'[show <num> leading lines, and separate groups of matches]: :__git_guard_number lines' \
'(-A --after-context -B --before-context -C --context)'{-C+,--context=}'[show <num> leading and trailing lines, and separate groups of matches]: :__git_guard_number lines' \
- '--threads=[use specified number of threads]:threads' \
+ '--threads=[use specified number of threads]:number of threads' \
'(-p --show-function)'{-p,--show-function}'[show preceding line containing function name of match]' \
'(-W --function-context)'{-W,--function-context}'[show whole function where a match was found]' \
'(1)*-f+[read patterns from given file]:pattern file:_files' \
@@ -1926,7 +1922,7 @@ _git-tag () {
_arguments -A '-*' \
- creation \
'(-a --annotate -s --sign -u --local-user)'{-a,--annotate}'[create an unsigned, annotated tag]' \
- '(-a --annotate -s --sign -u --local-user)'{-s,--sign}'[create an signed and annotated tag]' \
+ '(-a --annotate -s --sign -u --local-user)'{-s,--sign}'[create a signed and annotated tag]' \
'(-a --annotate -s --sign)'{-u+,--local-user=}'[create a tag, annotated and signed with the given key]: :__git_gpg_secret_keys' \
'(-f --force)'{-f,--force}'[replace existing tag]' \
'--create-reflog[create a reflog]' \
@@ -4452,7 +4448,7 @@ _git-index-pack () {
'--stdin[read pack from stdin and instead write to specified file]' \
$stdin_opts \
'--strict[die if the pack contains broken objects or links]' \
- '--threads=[specify number of threads to use]:threads' \
+ '--threads=[specify number of threads to use]:number of threads' \
':pack file:_files -g "*.pack(-.)"'
}
next reply other threads:[~2016-08-19 16:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 16:49 Oliver Kiddle [this message]
2016-08-19 22:46 ` Mikael Magnusson
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=70414.1471625341@hydra.kiddle.eu \
--to=okiddle@yahoo.co.uk \
--cc=zsh-workers@zsh.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).