From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Daniel Hahler <genml+zsh-workers@thequod.de>
Cc: zsh-workers@zsh.org
Subject: Re: [PATCH] completion: git: split __git_heads into local and remote
Date: Sun, 10 May 2015 16:13:30 +0000 [thread overview]
Message-ID: <20150510161330.GD1971@tarsus.local2> (raw)
In-Reply-To: <1431092461-24031-1-git-send-email-genml+zsh-workers@thequod.de>
Daniel Hahler wrote on Fri, May 08, 2015 at 15:41:01 +0200:
> From: Daniel Hahler <git@thequod.de>
>
> 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`.
prev parent reply other threads:[~2015-05-10 16:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 13:41 Daniel Hahler
2015-05-10 16:13 ` Daniel Shahaf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150510161330.GD1971@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=genml+zsh-workers@thequod.de \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).