From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5542 invoked from network); 16 Aug 2008 00:46:32 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,WEIRD_PORT autolearn=no version=3.2.5 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 16 Aug 2008 00:46:32 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 89737 invoked from network); 16 Aug 2008 00:46:18 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 16 Aug 2008 00:46:18 -0000 Received: (qmail 23934 invoked by alias); 16 Aug 2008 00:46:01 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25457 Received: (qmail 23898 invoked from network); 16 Aug 2008 00:45:56 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 16 Aug 2008 00:45:56 -0000 Received: from cork.scru.org (cork.scru.org [209.20.67.2]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 7B8FA805A425 for ; Sat, 16 Aug 2008 02:45:52 +0200 (CEST) Received: by cork.scru.org (Postfix, from userid 1000) id 7FDD6104087; Sat, 16 Aug 2008 00:45:50 +0000 (UTC) Date: Sat, 16 Aug 2008 00:45:50 +0000 From: Clint Adams To: Mikael Magnusson Cc: zsh-workers Subject: Re: Fix a typo in _git. Message-ID: <20080816004550.GA23551@scru.org> Mail-Followup-To: Mikael Magnusson , zsh-workers References: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/8049/Fri Aug 15 22:57:07 2008 on bifrost X-Virus-Status: Clean On Sat, Aug 16, 2008 at 01:56:36AM +0200, Mikael Magnusson wrote: > I have some other _git patches too, but they're sort of jumbled up and have > some XXXes, but if anyone is curious they can look here: > http://git.mika.l3ib.org/?p=zsh-cvs.git;a=history;f=Completion/Unix/Command/_git;h=mika Committing this one: From: Mikael Magnusson Date: Sun, 17 Feb 2008 18:08:01 +0000 (+0100) Subject: make git diff and git log completion better. X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=0a58b71d897896262f91cfe0bfa1c99d7761a179 make git diff and git log completion better. --- diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 20e8d1d..4592c66 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1596,9 +1596,10 @@ _git-diff () { _arguments -S \ $diff_args \ '--cached[show diff between index and named commit]' \ - '::original revision:__git_commits' \ - '::new revision:__git_commits' \ - '*::index file:__git_modified_files' && ret=0 + '::commit range:__git_commit_ranges' \ + '::original revision:__git_objects' \ + '::new revision:__git_objects' \ + '*::index file:__git_files' && ret=0 } (( $+functions[_git-fetch] )) || @@ -1726,9 +1727,9 @@ _git-log () { case $state in (files) - _alternative \ - 'files:index file:__git_cached_files' \ - 'branches:branch:__git_branch_names' && ret=0 + _arguments -S \ + '::index file:__git_cached_files' \ + '*::branch:__git_commit_ranges' && ret=0 ;; esac }