From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27680 invoked from network); 19 Aug 2008 01:52:27 -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 autolearn=ham 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 01:52:27 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 17405 invoked from network); 19 Aug 2008 01:52:19 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 19 Aug 2008 01:52:19 -0000 Received: (qmail 19313 invoked by alias); 19 Aug 2008 01:52:10 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25489 Received: (qmail 19296 invoked from network); 19 Aug 2008 01:52:08 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 19 Aug 2008 01:52:08 -0000 Received: from cork.scru.org (cork.scru.org [209.20.67.2]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 8862A8058F39 for ; Tue, 19 Aug 2008 03:52:03 +0200 (CEST) Received: by cork.scru.org (Postfix, from userid 1000) id 5562A10408A; Tue, 19 Aug 2008 01:52:02 +0000 (UTC) Date: Tue, 19 Aug 2008 01:52:02 +0000 From: Clint Adams To: zsh-workers@sunsite.dk Subject: PATCH: _git octopus/octupus Message-ID: <20080819015202.GB14537@scru.org> Mail-Followup-To: zsh-workers@sunsite.dk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 I don't think this was doing much, especially with the misspelling. Index: Completion/Unix/Command/_git =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v retrieving revision 1.83 diff -u -r1.83 _git --- Completion/Unix/Command/_git 19 Aug 2008 01:44:46 -0000 1.83 +++ Completion/Unix/Command/_git 19 Aug 2008 01:49:47 -0000 @@ -1,4 +1,4 @@ -#compdef git git-add git-am git-annotate git-apply git-applymbox git-apply= patch git-archimport git-archive git-bisect git-blame git-branch git-cat-fi= le git-check-attr git-check-ref-format git-checkout git-checkout-index git-= cherry git-cherry-pick git-clean git-clone git-clone-pack git-commit git-co= mmit-tree git-convert-objects git-count-objects git-cvsexportcommit git-cvs= import git-cvsserver git-daemon git-describe git-diff git-diff-files git-di= ff-index git-diff-stages git-diff-tree git-fast-import git-fetch git-fetch-= pack git-fmt-merge-msg git-for-each-ref git-format-patch git-fsck git-gc gi= t-get-tar-commit-id git-grep git-hash-object git-http-fetch git-http-push g= it-imap-send git-index-pack git-init git-instaweb git-local-fetch git-log g= it-lost-found git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mails= plit git-merge git-merge-base git-merge-file git-merge-index git-merge-one-= file git-merge-tree git-mergetool git-mktag git-mktree git-mv git-name-rev = git-octopus git-pack-objects git-pack-redundant git-pack-refs git-patch-id = git-peek-remote git-prune git-prune-packed git-pull git-push git-quiltimpor= t git-read-tree git-rebase git-receive-pack git-reflog git-relink git-remot= e git-repack gut-runstatus git-config git-request-pull git-rerere git-reset= git-rev-list git-rev-parse git-revert git-rm git-send-email git-send-pack = git-sh-setup git-shell git-shortlog git-show git-show-branch git-show-index= git-show-ref git-ssh-fetch git-ssh-upload git-status git-stripspace git-sv= n git-svnimport git-symbolic-ref git-tag git-tar-tree git-unpack-file git-u= npack-objects git-update-index git-update-ref git-update-server-info git-up= load-archive git-upload-pack git-var git-verify-pack git-verify-tag git-wha= tchanged git-write-tree +#compdef git git-add git-am git-annotate git-apply git-applymbox git-apply= patch git-archimport git-archive git-bisect git-blame git-branch git-cat-fi= le git-check-attr git-check-ref-format git-checkout git-checkout-index git-= cherry git-cherry-pick git-clean git-clone git-clone-pack git-commit git-co= mmit-tree git-convert-objects git-count-objects git-cvsexportcommit git-cvs= import git-cvsserver git-daemon git-describe git-diff git-diff-files git-di= ff-index git-diff-stages git-diff-tree git-fast-import git-fetch git-fetch-= pack git-fmt-merge-msg git-for-each-ref git-format-patch git-fsck git-gc gi= t-get-tar-commit-id git-grep git-hash-object git-http-fetch git-http-push g= it-imap-send git-index-pack git-init git-instaweb git-local-fetch git-log g= it-lost-found git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mails= plit git-merge git-merge-base git-merge-file git-merge-index git-merge-one-= file git-merge-tree git-mergetool git-mktag git-mktree git-mv git-name-rev = git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-peek-rem= ote git-prune git-prune-packed git-pull git-push git-quiltimport git-read-t= ree git-rebase git-receive-pack git-reflog git-relink git-remote git-repack= gut-runstatus git-config git-request-pull git-rerere git-reset git-rev-lis= t git-rev-parse git-revert git-rm git-send-email git-send-pack git-sh-setup= git-shell git-shortlog git-show git-show-branch git-show-index git-show-re= f git-ssh-fetch git-ssh-upload git-status git-stripspace git-svn git-svnimp= ort git-symbolic-ref git-tag git-tar-tree git-unpack-file git-unpack-object= s git-update-index git-update-ref git-update-server-info git-upload-archive= git-upload-pack git-var git-verify-pack git-verify-tag git-whatchanged git= -write-tree =20 # TODO: All if (( words[(I)-option] )) should be turned into # if (( words[(I)-option] > 0 && words[(I)-option] < CURRENT )), as the us= er @@ -220,7 +220,6 @@ 'mktag:create tag object' 'mktree:build tree-object from ls-tree formatted text' 'name-rev:find symbolic names for given revisions' - 'octopus:merge more than two commits' 'pack-objects:create packed archive of objects' 'pack-redundant:find redundant pack files' 'pack-refs:pack heads and tags for efficient repository access' @@ -1820,11 +1819,6 @@ ':destination:_files' && ret=3D0 } =20 -(( $+functions[_git-octupus] )) || -_git-octupus () { - _nothing -} - (( $+functions[_git-pull] )) || _git-pull () { _arguments \