From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22714 invoked from network); 1 Jul 2007 16:53:07 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.1 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 1 Jul 2007 16:53:07 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 99891 invoked from network); 1 Jul 2007 16:52:59 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 1 Jul 2007 16:52:59 -0000 Received: (qmail 19947 invoked by alias); 1 Jul 2007 16:52:57 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23627 Received: (qmail 19938 invoked from network); 1 Jul 2007 16:52:56 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 1 Jul 2007 16:52:56 -0000 Received: (qmail 99603 invoked from network); 1 Jul 2007 16:52:56 -0000 Received: from acolyte.scowler.net (216.254.112.45) by a.mx.sunsite.dk with SMTP; 1 Jul 2007 16:52:53 -0000 Received: by acolyte.scowler.net (Postfix, from userid 1000) id 466DD5C3C6; Sun, 1 Jul 2007 12:52:51 -0400 (EDT) Date: Sun, 1 Jul 2007 12:52:52 -0400 From: Clint Adams To: zsh-workers@sunsite.dk Subject: PATCH: _git fixes for hash-object, index-pack, merge-index Message-ID: <20070701165252.GA17232@scowler.net> Mail-Followup-To: zsh-workers@sunsite.dk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) More from Nikolai Weibull's repo. Index: Completion/Unix/Command/_git =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v retrieving revision 1.9 diff -u -r1.9 _git --- Completion/Unix/Command/_git 28 Jun 2007 15:24:16 -0000 1.9 +++ Completion/Unix/Command/_git 1 Jul 2007 16:51:30 -0000 @@ -271,17 +271,18 @@ _git-hash-object () { _arguments \ + '(:)--stdin[read object from standard input]' \ '-t[the type of object to create]:object type:((blob\:"a blob of data" commit\:"a tree with parent commits" tag\:"a symbolic name for another object" tree\:"a recursive tree of blobs"))' \ '-w[write the object to the object database]' \ - ':file:_files' && ret=0 + '(--stdin):file:_files' && ret=0 } _git-index-pack () { _arguments \ - '-o[write generated pack index into specified file]' \ + '-o[write generated pack index into specified file]:file:_files' \ ':pack file:_files -g "*.pack"' && ret=0 } @@ -294,7 +295,7 @@ if (( CURRENT > 2 )) && [[ $words[CURRENT-1] != -[oq] ]]; then _arguments -S \ '(:)-a[run merge against all files in the index that need merging]' \ - '*:index file:__git_files' && ret=0 + '*:index file:__git_cached_files' && ret=0 else typeset -a arguments