From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20884 invoked from network); 25 Sep 2007 17:54:53 -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=AWL,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 17:54:53 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 84460 invoked from network); 25 Sep 2007 17:54:46 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 17:54:46 -0000 Received: (qmail 13189 invoked by alias); 25 Sep 2007 17:54:44 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23831 Received: (qmail 13175 invoked from network); 25 Sep 2007 17:54:44 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 25 Sep 2007 17:54:44 -0000 Received: (qmail 84228 invoked from network); 25 Sep 2007 17:54:44 -0000 Received: from acolyte.scowler.net (216.254.112.45) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 17:54:37 -0000 Received: by acolyte.scowler.net (Postfix, from userid 1000) id 49E655C285; Tue, 25 Sep 2007 13:54:34 -0400 (EDT) Date: Tue, 25 Sep 2007 13:54:34 -0400 From: Clint Adams To: Mikael Magnusson Cc: zsh-workers@sunsite.dk Subject: Re: PATCH: _git (large) Message-ID: <20070925175434.GA25244@scowler.net> Mail-Followup-To: Mikael Magnusson , zsh-workers@sunsite.dk References: <20070925155927.GA22272@scowler.net> <237967ef0709251034u4f1edc29i4ecadbed57bee1d4@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <237967ef0709251034u4f1edc29i4ecadbed57bee1d4@mail.gmail.com> User-Agent: Mutt/1.5.16 (2007-06-11) 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 =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v retrieving revision 1.24 diff -u -r1.24 _git --- Completion/Unix/Command/_git 25 Sep 2007 16:35:44 -0000 1.24 +++ Completion/Unix/Command/_git 25 Sep 2007 17:53:00 -0000 @@ -92,10 +92,6 @@ '-w[write commit-id into the filename under "$GIT_DIR/refs/"]:filename' ) -declare -g merge_strategy_arg - -merge_strategy_arg='*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' - declare -ga merge_args # TODO: Add descriptions to strategies (stupid is undocumented). @@ -103,7 +99,7 @@ '(-n --no-summary)'{-n,--no-summary}'[do not show diffstat at the end of the merge]' '--no-commit[perform the merge but do not autocommit]' '--squash[merge, but do not make a commit]' - $merge_strategy_arg + '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' ) declare -ga force_ref_arg @@ -1666,7 +1662,7 @@ (( $+functions[_git-merge] )) || _git-merge () { _arguments \ - $merge_args \ + "$merge_args[@]" \ ':merge message' \ '*:remote:__git_commits' && ret=0 } @@ -1689,7 +1685,7 @@ (( $+functions[_git-pull] )) || _git-pull () { _arguments \ - $merge_args \ + "$merge_args[@]" \ $common_fetch_args \ ':repository:__git_any_repositories' \ '*:refspec:__git_ref_specs' && ret=0 @@ -1725,7 +1721,7 @@ '--abort[abort current rebase]' \ '--skip[skip the current patch]' \ '--merge[use merging strategies to rebase]' \ - $merge_strategy_arg \ + '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \ $verbose_arg \ '-C-[ensure that given lines of surrounding context match]: :_guard "[[\:digit\:]]##" "lines of context"' \ ':upstream branch:__git_revisions' \ @@ -2310,7 +2306,7 @@ if [[ $line[1] == (dcommit|rebase) ]]; then arguments+=( - $merge_strategy_arg) + '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies') fi if [[ $line[1] == (dcommit|log|rebase) ]]; then