Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: PATCH: _git (large)
- X-seq: zsh-workers 23832
- From: "Mikael Magnusson" <mikachu@xxxxxxxxx>
- To: zsh-workers@xxxxxxxxxx
- Subject: Re: PATCH: _git (large)
- Date: Tue, 25 Sep 2007 20:44:03 +0200
- 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=
- In-reply-to: <20070925175434.GA25244@xxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <20070925155927.GA22272@xxxxxxxxxxx> <237967ef0709251034u4f1edc29i4ecadbed57bee1d4@xxxxxxxxxxxxxx> <20070925175434.GA25244@xxxxxxxxxxx>
On 25/09/2007, Clint Adams <clint@xxxxxxx> wrote:
> On Tue, Sep 25, 2007 at 07:34:07PM +0200, Mikael Magnusson wrote:
> > When I do git-merge <tab>, 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 <tab>
---- merge message
and
% git-merge a <tab>
---- heads
---- tags
dot-zsh-199905041932 etc
merge message is only supposed to be completed after -m.
Additionally,
% git-merge -<tab>
does not offer -m :). (Nor goes git-merge a -<tab>)
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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author