From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4032 invoked by alias); 19 Aug 2016 16:55:46 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 39072 Received: (qmail 21285 invoked from network); 19 Aug 2016 16:55:46 -0000 X-Qmail-Scanner-Diagnostics: from nm20-vm5.bullet.mail.ir2.yahoo.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(212.82.96.247):SA:0(0.0/5.0):. Processed in 0.179104 secs); 19 Aug 2016 16:55:46 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM,SPF_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: okiddle@yahoo.co.uk X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.mail.yahoo.com designates 212.82.96.247 as permitted sender) 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== X-Yahoo-Newman-Id: 474594.39238.bm@smtp106.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 0C9jRxoVM1lFzCdQj5ld3V2n4fJBycWZLWfCgNkxs7PqKC0 MDnGxnPvXW17ot.X7yxZzOFsS5wZ5OvJvtx9PeQMh8OyQ3h2HriWfQMFeiRi jvfBhswBaBkt_KBIh9ouhGrO3mDPVqTuUnfMzRGsTIj0KznYMIQApMjfJ.Cm Z9rt3XqCNDtmN9Yjgtt8TfPGdLjb6B3T38uRpYH3.ujfPxztiZC7dk_9qNvO gCEy3mfPzHgrpKX719E3gUctXqld2HBZPVDgpeS3QH656hia1FCNS2kt0dIb 1ZklaukyBwHq3zNAAX62iVxrKuuLZ_asxzBpG2T6FzU1MuslLi6eUublmB1L HimoEbs.QcKBbiZpBBspOHQDzHj2KUlCnTxehoj6OScMBtvsgWdMD0pzBKdV ffSTVEU7Ens8XSZlbHlYuapAIz.ior7RqfoI5akeITGwZH_Y.xgTt2VNKW.Q Slwhx3o.NMZNDjWeXjo_UW4k0GKcUT5CFrM7Ef7f2yggih0BDS7oRuYBgkVB SXHuso9l8lfRxzOwEzts.XHlZBp2OhDwylbr1nYR16Xs- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- From: Oliver Kiddle To: Zsh workers Subject: PATCH: minor git completion tweaks MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <70413.1471625341.1@hydra.kiddle.eu> Date: Fri, 19 Aug 2016 18:49:01 +0200 Message-ID: <70414.1471625341@hydra.kiddle.eu> 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 trailing lines, and separate groups of matches]: :__git_guard_number lines' \ '(-B --before-context)'{-B+,--before-context=}'[show leading lines, and separate groups of matches]: :__git_guard_number lines' \ '(-A --after-context -B --before-context -C --context)'{-C+,--context=}'[show 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(-.)"' }