From: Marc Finet <m.dreadlock@gmail.com>
To: zsh-workers@zsh.org
Cc: Marc Finet <m.dreadlock@gmail.com>
Subject: [PATCH 2/9] completion git: support aliases when \n exist
Date: Fri, 12 Sep 2014 23:30:36 +0200 [thread overview]
Message-ID: <1410557443-24178-3-git-send-email-m.dreadlock@gmail.com> (raw)
In-Reply-To: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com>
The git completion for aliases (i.e. completing with aliased verb)
was broken whem some \n exist in aliases.
---
Completion/Unix/Command/_git | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b1f411a..d941aac 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6560,9 +6560,13 @@ _git() {
if (( CURRENT > 2 )); then
local -a aliases
local -A git_aliases
- # TODO: Should use -z here, but I couldn't get it to work.
- aliases=(${(f)${${${(f)"$(_call_program aliases git config --get-regexp '\^alias\.')"}#alias.}/ /$'\n'}/(#e)/$'\n'})
- (( $#aliases % 2 == 0 )) && git_aliases=($aliases)
+ local k v
+ aliases=(${(0)"$(_call_program aliases git config -z --get-regexp '\^alias\.')"})
+ for a in ${aliases}; do
+ k="${${a/$'\n'*}/alias.}"
+ v="${a#*$'\n'}"
+ git_aliases[$k]="$v"
+ done
if (( $+git_aliases[$words[2]] && !$+commands[git-$words[2]] && !$+functions[_git-$words[2]] )); then
local -a tmpwords expalias
--
2.1.0
next prev parent reply other threads:[~2014-09-12 21:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 21:30 Misc patches for git completion and vcs_info Marc Finet
2014-09-12 21:30 ` [PATCH 1/9] vcs_info examples: fix typo Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-12 21:30 ` Marc Finet [this message]
2014-09-12 21:30 ` [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits Marc Finet
2014-09-14 9:36 ` Frank Terbeck
2014-09-15 6:22 ` Phil Pennock
2014-09-12 21:30 ` [PATCH 4/9] vcs_info git: set rrn before using it Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-16 20:41 ` Frank Terbeck
2014-09-16 20:57 ` Marc Finet
2014-09-16 21:23 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 5/9] vcs_info quilt: fix standalone detection Marc Finet
2014-09-14 9:42 ` Frank Terbeck
2014-09-16 20:19 ` Marc Finet
2014-09-12 21:30 ` [PATCH 6/9] vcs_info quilt: fix unapplied detection on sub-directory Marc Finet
2014-09-14 9:47 ` Frank Terbeck
2014-09-16 20:25 ` Marc Finet
2014-10-08 22:36 ` Marc Finet
2014-10-09 16:03 ` Frank Terbeck
2014-10-16 4:59 ` Marc Finet
2014-10-16 8:17 ` Frank Terbeck
2014-11-08 10:46 ` Marc Finet
2014-11-11 10:07 ` Marc Finet
2015-01-02 11:03 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 7/9] vcs_info git: fix applied-string name Marc Finet
2014-09-14 9:49 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 8/9] vcs_info git: consider patches for rebase Marc Finet
2014-09-14 10:08 ` Frank Terbeck
2014-09-14 10:13 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-12 21:30 ` [PATCH 9/9] completion git: fix send-email --confirm values Marc Finet
2014-09-14 10:11 ` Frank Terbeck
2014-09-12 23:50 ` Misc patches for git completion and vcs_info Bart Schaefer
2014-09-13 7:35 ` Marc Finet
2014-09-13 12:23 ` Frank Terbeck
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=1410557443-24178-3-git-send-email-m.dreadlock@gmail.com \
--to=m.dreadlock@gmail.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).