From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21644 invoked from network); 25 Sep 2007 18:44:29 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.3 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 25 Sep 2007 18:44:29 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 32549 invoked from network); 25 Sep 2007 18:44:16 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 18:44:16 -0000 Received: (qmail 294 invoked by alias); 25 Sep 2007 18:44:14 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23832 Received: (qmail 278 invoked from network); 25 Sep 2007 18:44:13 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 25 Sep 2007 18:44:13 -0000 Received: (qmail 32256 invoked from network); 25 Sep 2007 18:44:13 -0000 Received: from an-out-0708.google.com (209.85.132.245) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 18:44:05 -0000 Received: by an-out-0708.google.com with SMTP id c14so481959anc for ; Tue, 25 Sep 2007 11:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=nSSODPvwFQfTSKFIwv4iOph1aDrQVHPLrA8fSfKweqA=; b=V/KKOmQKSTqvpB5ahDGr/usM5b7Grwr8egcP8UUt071L/m03G1NXtK7apa0WZt/rSfMIOGrtVa3P0jJuj5wKrJw/nambwTE9PvqdhUYUDMI68HyA67fZJeYGPDrib85klXqX2ZPkeR0ugeH2qq6Et6hFGASGOBGvner3lJwR+oI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=sx0+HEa6VRsPZirvq7nRBDZBI7jZZ8nyeKZH+CP2NrtBgPAardVxQd8j0io2m0S3nX0xUt1S3sMRvN6Dh+Zs99E5a79hf6iCEwiqERwl1texEwIKPRzZWsrY3ZWWqJBPtgzc6pesDAyip0YqGnJvnbyDDthMuf+yfwYO4HVl4H4= Received: by 10.142.240.9 with SMTP id n9mr1906966wfh.1190745843386; Tue, 25 Sep 2007 11:44:03 -0700 (PDT) Received: by 10.142.86.21 with HTTP; Tue, 25 Sep 2007 11:44:03 -0700 (PDT) Message-ID: <237967ef0709251144t4b553b5dla9ff570de41bbed4@mail.gmail.com> Date: Tue, 25 Sep 2007 20:44:03 +0200 From: "Mikael Magnusson" To: zsh-workers@sunsite.dk Subject: Re: PATCH: _git (large) In-Reply-To: <20070925175434.GA25244@scowler.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20070925155927.GA22272@scowler.net> <237967ef0709251034u4f1edc29i4ecadbed57bee1d4@mail.gmail.com> <20070925175434.GA25244@scowler.net> On 25/09/2007, Clint Adams wrote: > On Tue, Sep 25, 2007 at 07:34:07PM +0200, Mikael Magnusson wrote: > > When I do git-merge , I get the following (which I also get when > > I use _git straight from Nikolai's repo): > > _arguments:comparguments:303: invalid rest argument definition: > > *{-s,--strategy=-}[use given merge strategy]:merge > > strategy:__git_merge_strategies > > and nothing is completed. > > See if this does the right thing. > > Index: Completion/Unix/Command/_git Now it doesn't bomb out, but it does the wrong thing: % git-merge ---- merge message and % git-merge a ---- heads ---- tags dot-zsh-199905041932 etc merge message is only supposed to be completed after -m. Additionally, % git-merge - does not offer -m :). (Nor goes git-merge a -) Suspect following patch will fix it: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 62b2361..b89b0c9 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1663,7 +1663,7 @@ _git-ls-remote () { _git-merge () { _arguments \ "$merge_args[@]" \ - ':merge message' \ + '-m:merge message' \ '*:remote:__git_commits' && ret=0 } -- Mikael Magnusson