From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-users@zsh.org
Subject: Add matchspec for foo/bar branch names in git completion
Date: Thu, 14 May 2015 14:37:47 +0000 [thread overview]
Message-ID: <20150514143747.GF1932@tarsus.local2> (raw)
I'd like to add a matchspec to git heads completion, such that
'git checkout o/m<TAB>' would complete to 'origin/master'.
However, I can't seem to get the matchspec right. I tried this:
[[[
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9304fbb..fe03439 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5585,7 +5585,7 @@ __git_remote_branch_names () {
branch_names=(${${(f)"$(_call_program remote-branch-refs git for-each-ref --format='"%(refname)"' refs/remotes 2>/dev/null)"}#refs/remotes/})
__git_command_successful $pipestatus || return 1
- _wanted remote-branch-names expl 'remote branch name' compadd "$@" -a - branch_names
+ _wanted remote-branch-names expl 'remote branch name' compadd -M 'r:|/=*' "$@" -a - branch_names
}
(( $+functions[__git_remote_branch_names_noprefix] )) ||
@@ -5596,7 +5596,7 @@ __git_remote_branch_names_noprefix () {
branch_names=(${${${(f)"$(_call_program remote-branch-refs-noprefix git for-each-ref --format='"%(refname)"' refs/remotes 2>/dev/null)"}##*/}:#HEAD})
__git_command_successful $pipestatus || return 1
- _wanted remote-branch-names-noprefix expl 'remote branch name' compadd "$@" -a - branch_names
+ _wanted remote-branch-names-noprefix expl 'remote branch name' compadd -M 'r:|/=*' "$@" -a - branch_names
}
(( $+functions[__git_commit_objects_prefer_recent] )) ||
@@ -5637,7 +5637,7 @@ __git_heads_local () {
[[ -f $gitdir/refs/stash ]] && heads+=stash
fi
- _wanted heads-local expl "local head" compadd "$@" -a - heads
+ _wanted heads-local expl "local head" compadd -M 'r:|/=*' "$@" -a - heads
}
(( $+functions[__git_heads_remote] )) ||
@@ -5647,7 +5647,7 @@ __git_heads_remote () {
heads=(${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname:short)" refs/remotes' 2>/dev/null)"})
- _wanted heads-remote expl "remote head" compadd "$@" -a - heads
+ _wanted heads-remote expl "remote head" compadd -M 'r:|/=*' "$@" -a - heads
}
(( $+functions[__git_commit_objects] )) ||
]]]
Now, it does complete 'o/m' to 'origin/master', but when I type just
'or<TAB>', it completes to 'origin', without the trailing slash:
[[[
% git branch -l
foo/a
foo/b
foo/c
* master
% git co fo<TAB>
% git co foo
]]]
How could I get 'fo<TAB>' to become 'foo/', with the slash?
This is both in my usual config and in 'zsh -f'+compinit.
Cheers,
Daniel
next reply other threads:[~2015-05-14 14:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 14:37 Daniel Shahaf [this message]
2015-05-14 17:35 ` Bart Schaefer
2015-05-16 22:53 ` Daniel Shahaf
2015-05-17 4:16 ` Bart Schaefer
2015-05-17 23:42 ` Daniel Shahaf
2015-05-19 1:52 ` Daniel Shahaf
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=20150514143747.GF1932@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-users@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).