From ffd439b69b49c2762eaee888d622d7e843103c62 Mon Sep 17 00:00:00 2001 From: Marc Finet Date: Fri, 12 Sep 2014 23:30:36 +0200 Subject: 33151: completion git: support aliases when \n exist 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(-) (limited to 'Completion') diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index b1f411a5e..d941aac0f 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 -- cgit 1.4.1