From: "Benjamin R. Haskell" <zsh@benizi.com>
To: Zsh Workers <zsh-workers@zsh.org>
Subject: Re: [PATCH] _git: Also complete FETCH_HEAD, ORIG_HEAD and MERGE_HEAD.
Date: Sun, 21 Mar 2010 15:48:06 -0400 (EDT) [thread overview]
Message-ID: <alpine.LNX.2.01.1003211540430.19615@hp.internal> (raw)
In-Reply-To: <20100321172336.GA4151@ruderich.org>
On Sun, 21 Mar 2010, Simon Ruderich wrote:
> Hi,
>
> Maybe it should be checked if FETCH_HEAD, ORIG_HEAD and
> MERGE_HEAD exist before completing them, but I'm not sure how to
> that.
>
> Simon
This version checks that rev-parse returns something valid for each of
those three 'symbolic ref names' (as git-rev-parse(1) calls them), plus
'HEAD' itself (which isn't a valid name on a newly-init'ed repository).
It could probably be improved via the use of _call_program rather than
calling 'git rev-parse' directly (the same way branch_names uses
'headrefs' to allow for zstyle niceness, I think), but I don't fully
grok that yet.
Best,
Ben
---
Completion/Unix/Command/_git | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d7570cc..730a952 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3119,13 +3119,18 @@ __git_tag_ids () {
(( $+functions[__git_heads] )) ||
__git_heads () {
- local expl
+ local expl head symbolic_heads
declare -a branch_names
branch_names=(${${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname)"' refs/heads refs/remotes 2>/dev/null)"}#refs/(heads|remotes)/})
__git_command_successful || return
- _wanted heads expl branch-name compadd $* - $branch_names HEAD
+ symbolic_heads=()
+ for head in HEAD ORIG_HEAD FETCH_HEAD MERGE_HEAD ; do
+ git rev-parse $head &>/dev/null && symbolic_heads+=( $head )
+ done
+
+ _wanted heads expl branch-name compadd $* - $branch_names $symbolic_heads
}
(( $+functions[__git_tags] )) ||
--
1.7.0
next prev parent reply other threads:[~2010-03-21 19:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-21 17:23 Simon Ruderich
2010-03-21 19:48 ` Benjamin R. Haskell [this message]
2010-03-21 20:17 ` Nikolai Weibull
2010-03-22 1:25 ` Simon Ruderich
2010-03-22 2:30 ` Benjamin R. Haskell
2010-03-22 9:27 ` Nikolai Weibull
2010-03-29 0:07 ` Simon Ruderich
2010-05-01 8:28 ` Simon Ruderich
2010-05-01 10:46 ` Frank Terbeck
2010-05-01 12:12 ` Simon Ruderich
2010-05-01 12:17 ` Frank Terbeck
2010-05-01 20:32 ` Simon Ruderich
2010-05-02 9:04 ` Frank Terbeck
2010-05-03 14:51 ` Benjamin R. Haskell
2010-03-29 13:56 ` Benjamin R. Haskell
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=alpine.LNX.2.01.1003211540430.19615@hp.internal \
--to=zsh@benizi.com \
--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).