From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11061 invoked by alias); 13 Jul 2016 04:34:32 -0000 Mailing-List: contact zsh-users-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Users List List-Post: List-Help: X-Seq: 21750 Received: (qmail 12099 invoked from network); 13 Jul 2016 04:34:32 -0000 X-Qmail-Scanner-Diagnostics: from out5-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.29):SA:0(0.0/5.0):. Processed in 0.124956 secs); 13 Jul 2016 04:34:32 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=aFCHYtFQG/XKsrf4kdwqqsy2g1s=; b=bz/uO0 GApbssPrUNoOkihK2sxL1DvYHYfk7GdD8q2FFa5fl72X2N0MDgWPkcNrxCm6sA6B 8OWJO0h3F2LhTHH8PjvwscmrsNMDBkim18PbY9LofElY1u9UfesGGOZIebdUfR8S B6DgQ15dznmY5Jc0gG286fbQlk651RT2X+X5w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=aFCHYtFQG/XKsrf4kdwqqsy2g1s=; b=J0sXR uPTrNCdmN/nQOEKTLk7cG7aEVayTLM83xyA98bAX6q0dcgY3wUw/BuTkEf6MhRgz iI+DQLBke5FMAuqqbLtj3h8W/2SmjLvJm/T+r/FNhsDXpiW3HBqgbTZy1sFipu1O LTM3EQgsU8uVwzgK1iVj0+qej666HDUZ5CDBa0= X-Sasl-enc: 7mw87vctnwDYjpIs393YX8UAMWfLNt+nv52FtWM7roPz 1468383853 Date: Wed, 13 Jul 2016 04:24:08 +0000 From: Daniel Shahaf To: Oliver Kiddle Cc: Jordan Klassen , zsh-users@zsh.org Subject: Re: git-subtree completions Message-ID: <20160713042354.GA3279@tarsus.local2> References: <27621.1463140958__28965.9567446963$1463141465$gmane$org@thecus.kiddle.eu> <20160707020010.GA25225@tarsus.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160707020010.GA25225@tarsus.local2> User-Agent: Mutt/1.5.21 (2010-09-15) Daniel Shahaf wrote on Thu, Jul 07, 2016 at 02:00:10 +0000: > I see this has been committed now; reviewing the committed patch: > > > +++ b/Completion/Unix/Command/_git > > @@ -1747,6 +1747,91 @@ > > + '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ > > -m takes an argument, but this spec doesn't reflect that. I assume it should be > > '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ > ^^^ ^^^^^^^^^^ ^^^^^^^^ > (three changes) > > > + '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ > > s/-P,/-P+,/ I'll push a patch for these two in a minute (once I have the X-Seq of this). > > + '--squash[import only a single commit from the subproject]' \ > > + ': :__git_any_repositories_or_references' \ > > + ':: :__git_ref_specs' && ret=0 > > __git_ref_specs doesn't seem appropriate here: > . > % git subtree add -P foo ../other-repository/ master:target > 'master:target' does not look like a ref This issue is outstanding. Cheers, Daniel