From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14680 invoked from network); 19 Aug 2008 00:59:04 -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; 19 Aug 2008 00:59:04 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 93577 invoked from network); 19 Aug 2008 00:58:53 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 19 Aug 2008 00:58:53 -0000 Received: (qmail 2705 invoked by alias); 19 Aug 2008 00:58:43 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25485 Received: (qmail 2695 invoked from network); 19 Aug 2008 00:58:41 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 19 Aug 2008 00:58:41 -0000 Received: from cork.scru.org (cork.scru.org [209.20.67.2]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 05ECE8058F38 for ; Tue, 19 Aug 2008 02:58:35 +0200 (CEST) Received: by cork.scru.org (Postfix, from userid 1000) id 9A82910408A; Tue, 19 Aug 2008 00:58:34 +0000 (UTC) Date: Tue, 19 Aug 2008 00:58:34 +0000 From: Clint Adams To: zsh-workers Subject: Re: Fix a typo in _git. Message-ID: <20080819005834.GA13979@scru.org> Mail-Followup-To: zsh-workers References: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com> <20080817171321.GA24334@scru.org> <237967ef0808171027t4773ff36nb1cfe08942b63a5f@mail.gmail.com> <20080818014613.GA30193@scru.org> <237967ef0808180247l7b0ed485ob72df0a0637c57e9@mail.gmail.com> <237967ef0808181310kfa7128bt2e0321e77ad96d8f@mail.gmail.com> <20080818224510.GA12825@scru.org> <237967ef0808181709m1f6d6c5ao2311d960284f5c3f@mail.gmail.com> <20080819002511.GA13736@scru.org> <237967ef0808181737i29029b0kb170942152ff57fd@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <237967ef0808181737i29029b0kb170942152ff57fd@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/8056/Mon Aug 18 16:33:41 2008 on bifrost X-Virus-Status: Clean On Tue, Aug 19, 2008 at 02:37:34AM +0200, Mikael Magnusson wrote: > Hmm yes, but what if you want to type --no-abbrev -v in that order? Good point. In that case, the my_abbrev bit seems like more trouble than it's worth. From: Mikael Magnusson Date: Fri, 6 Jun 2008 02:07:03 +0000 (+0200) Subject: _git: What is my_abbrev about? X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=6d178b4a0ad761e2e996dd8ee4de82604b6ee129 _git: What is my_abbrev about? --- diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 9236e0b..860cc94 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1475,11 +1475,6 @@ _git-bisect () { # TODO: complete branch names? (( $+functions[_git-branch] )) || _git-branch () { - local my_abbrev_arg - if (( words[(I)-v] > 0 && words[(I)-v] < CURRENT )); then - my_abbrev_arg=$abbrev_arg - fi - declare -a dependent_deletion_args if (( words[(I)-d] || words[(I)-D] )); then dependent_deletion_args=( @@ -1502,7 +1497,8 @@ _git-branch () { '( -a)-r[list only the remote-tracking branches]' \ '(-r )-a[list both remote-tracking branches and local branches]' \ '-v[show SHA1 and commit subject line for each head]' \ - $my_abbrev_arg \ + $abbrev_arg \ + '--no-abbrev[do not abbreviate sha1s]' \ - create \ '-l[create the branch'\''s reflog]' \ '-f[force the creation of a new branch]' \