From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-24622-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 16630 invoked from network); 28 Feb 2008 17:12:41 -0000
X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) 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.4
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 28 Feb 2008 17:12:41 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 38003 invoked from network); 28 Feb 2008 17:12:26 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 28 Feb 2008 17:12:26 -0000
Received: (qmail 3736 invoked by alias); 28 Feb 2008 17:12:24 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 24622
Received: (qmail 3721 invoked from network); 28 Feb 2008 17:12:23 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 28 Feb 2008 17:12:23 -0000
Received: from acolyte.scowler.net (acolyte.scowler.net [216.254.112.45])
	by bifrost.dotsrc.org (Postfix) with ESMTP id 1E4158026E0B
	for <zsh-workers@sunsite.dk>; Thu, 28 Feb 2008 18:12:16 +0100 (CET)
Received: by acolyte.scowler.net (Postfix, from userid 1000)
	id 46B565C1A4; Thu, 28 Feb 2008 12:12:13 -0500 (EST)
Date: Thu, 28 Feb 2008 12:12:14 -0500
From: Clint Adams <schizo@debian.org>
To: Romain Francoise <rfrancoise@debian.org>, 468384@bugs.debian.org
Cc: zsh-workers@sunsite.dk
Subject: Re: Bug#468384: zsh-beta: 'git bisect' completion incomplete
Message-ID: <20080228171214.GA11511@scowler.net>
Mail-Followup-To: Romain Francoise <rfrancoise@debian.org>,
	468384@bugs.debian.org, zsh-workers@sunsite.dk
References: <874pbtf295.fsf@elegiac.orebokech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <874pbtf295.fsf@elegiac.orebokech.com>
User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
X-Virus-Scanned: ClamAV 0.91.2/6027/Thu Feb 28 17:20:09 2008 on bifrost
X-Virus-Status: Clean

On Thu, Feb 28, 2008 at 05:56:54PM +0100, Romain Francoise wrote:
> zsh-beta's git completion code doesn't know about 'git bisect skip'
> and 'git bisect run'.

I think this whole case block should be cleaned up to not use
_arguments.

Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.59
diff -u -r1.59 _git
--- Completion/Unix/Command/_git	25 Jan 2008 13:56:04 -0000	1.59
+++ Completion/Unix/Command/_git	28 Feb 2008 17:11:17 -0000
@@ -1395,6 +1395,8 @@
     reset:"finish bisection search and return to the given branch (or master)"
     start:"reset bisection state and start a new bisection"
     visualize:"show the remaining revisions in gitk"
+    skip:"choose a nearby commit"
+    run:"run evaluation script"
   )
 
   if (( CURRENT == 2 )); then
@@ -1405,7 +1407,7 @@
         _arguments \
           '2:revision:__git_commits' && ret=0
         ;;
-      (good)
+      (good|skip)
         _arguments \
           '*:revision:__git_commits' && ret=0
         ;;
@@ -1417,6 +1419,11 @@
         _arguments \
           '2:branch:__git_heads' && ret=0
         ;;
+      (run)
+        _arguments \
+          '*::arguments: _normal' && ret=0
+        ;;
+
       (*)
         _nothing
         ;;