From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26027 invoked by alias); 10 May 2015 16:13:36 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 35072 Received: (qmail 29961 invoked from network); 10 May 2015 16:13:34 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=bmyAxda7sVDB+QUh GJwI5ffqEjA=; b=HlnRL7ZJXbKrVvn35zhMo2+b7vMmdja4vPHfGvAoCF6IDI9+ cFBRQu1KlMSCR1vaqjfGp0JuYiqcWvLbLft8B5pz5Wms6z12aVdYbW9TGxwXM41U P/gkK4pYL44afusdCGjX7l6fUYhfYLIM8vp7cv3rr7qclDDsLPv5LgFsQ5U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=bmyAxda7sVDB+QU hGJwI5ffqEjA=; b=RK0mmtYGXTSLkENpXX75lIXo/Kzrh09LC66i8Veef2GnMZI atUmHfwX8JDrLaISCBFlWvZElhqsvwe2qsqlowBvDGnPUoVp02IdDtxyoMSayVvV tUNcN1tO2xfApU4dI5Ov5Ux/QXDDJDv9lO4CrLHcpUn6hdoyCK/Xqn3x9K/0= X-Sasl-enc: 5iUd/53LwrLvAN5AuULvsW4Ma9xS6K03j0Rbv6V++ZlM 1431274412 Date: Sun, 10 May 2015 16:13:30 +0000 From: Daniel Shahaf To: Daniel Hahler Cc: zsh-workers@zsh.org Subject: Re: [PATCH] completion: git: split __git_heads into local and remote Message-ID: <20150510161330.GD1971@tarsus.local2> References: <1431092461-24031-1-git-send-email-genml+zsh-workers@thequod.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1431092461-24031-1-git-send-email-genml+zsh-workers@thequod.de> User-Agent: Mutt/1.5.21 (2010-09-15) Daniel Hahler wrote on Fri, May 08, 2015 at 15:41:01 +0200: > From: Daniel Hahler > > It is useful to have this distinction visually. Thanks, I think this is a good change. I have one concern, however. The 'heads' tag is split into two new tags: > - _wanted heads expl head compadd "$@" -a - heads > + _wanted heads-local expl "local head" compadd "$@" -a - heads > + _wanted heads-remote expl "remote head" compadd "$@" -a - heads That's a backwards-incompatible change. (If people have "heads" in their tag-order styles, their setup will be silently broken.) I'm not sure how this should be handled. I spoke with Daniel on IRC and we both preferred to keep the change and mention it in NEWS as an incompatibility. (I went ahead and drafted this; patch enclosed.) Personally, I'm a little torn on this: I keep thinking there might be a way to split the 'heads' tag without breaking existing setups that refer to it. So far, I haven't found any. I'd still vote for merging the patch, though, backwards incompatibility notwithstanding. (Since the breakage — heads not being offered as completions — would be easily noticeable by the user, harmless, and would not affect the default setup.) Cheers, Daniel P.S. Peter — are you waiting on this for 5.0.8? Normally I'd assume we can take our time getting the patch right, but I wouldn't want to be the late-boarding passenger whom everyone waits for. --- [[[ diff --git a/README b/README index 142daad..73190a5 100644 --- a/README +++ b/README @@ -117,6 +117,12 @@ New behaviour: 0.5 +4) The _git completion used to offer both local and remote heads under the +tag 'heads'. The tag has now been split into 'heads-local' and +'heads-remote' in all contexts that existed in 5.0.7. The --fixup/--squash +context still uses the tag 'heads' (but this may change in a future release). + + Incompatibilities between 5.0.2 and 5.0.5 ----------------------------------------- ]]] > This also uses `--format=%(refname:short)` directly with `git > for-each-ref`.