Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: minor git completion tweaks
- X-seq: zsh-workers 39072
- From: Oliver Kiddle <okiddle@xxxxxxxxxxx>
- To: Zsh workers <zsh-workers@xxxxxxx>
- Subject: PATCH: minor git completion tweaks
- Date: Fri, 19 Aug 2016 18:49:01 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1471625342; bh=xNCfmUXCIoj0F9ldVxQXEn/z8jM9lY45FN4jpSJjYao=; h=From:To:Subject:Date:From:Subject; b=Sd/e+J3sB0/81Scm4KUkZ629iXVNgRyjHeCb+J9lOawEDanCs/erC2jRsbOOPwZMaGtD1ODBN71WQw38yNV35Ueb+2s4P85js9OyaGri9Un7pnH9wtDa7G88i7J/BOdVOqkX5eQIqII1r8/IeLJWOgVK2rhD8I0Sulo7WsEjYeZiU4iUwrbTUDoGqm9Hq8N0wGGSeH/roDBZ3CcmhmbgwKZcrtvVGxOz9iBvAg7JVNrCTTKaeQCKXvtXQh0jgwaNDM3HNBw6mtP3e/29TOt2uTIH/MXv6ibKA9ccHsbfNeFwAIsCq1J3he7YyzIrUl1ZHp5RH0uhEVaUvJnEBA6Kdg==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
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(-.)"'
}
Messages sorted by:
Reverse Date,
Date,
Thread,
Author