@matheusbsbs / matheus-bagliano / commits / 3bee6a4733
Fork 0

completion: don't declare 'local words' to make zsh happy

The "_get_comp_words_by_ref -n := words" command from the bash_completion library reassembles a modified version of COMP_WORDS with ':' and '=' no longer treated as word separators and stores it in the ${words[@]} array. Git's programmable tab completion script uses this to abstract away the difference between bash v3's and bash v4's definitions of COMP_WORDS (bash v3 used shell words, while bash v4 breaks at separator characters); see v1.7.4-rc0~11^2~2 (bash: get --pretty=m<tab> completion to work with bash v4, 2010-12-02). zsh has (or rather its completion functions have) another idea about what ${words[@]} should contain: the array is prepopulated with the words from the command it is completing. For reasons that are not well understood, when git-completion.bash reserves its own "words" variable with "local words", the variable becomes empty and cannot be changed from then on. So the completion script neglects the arguments it has seen, and words complete like git subcommand names. For example, typing "git log origi<TAB>" gives no completions because there are no "git origi..." commands. However, when this words variable is not declared as local but is just populated by _get_comp_words_by_ref() and then read in various completion functions, then zsh seems to be happy about it and our completion script works as expected. So, to get our completion script working again under zsh and to prevent the words variable from leaking into the shell environment under bash, we will only declare words as local when using bash. Reported-by: Stefan Haller <lists@haller-berlin.de> Suggested-by: Felipe Contreras <felipe.contreras@gmail.com> Explained-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Apr 28, 2011 at 18:01 UTC 3bee6a4733a1ff03b9cc659ea026c6dc17567d4d
1 file changed +6 -2
contrib/completion/git-completion.bash
+6 -2
@@ -2608,9 +2608,11 @@ _git ()
2608 if [[ -n ${ZSH_VERSION-} ]]; then
2609 emulate -L bash
2610 setopt KSH_TYPESET
2611 + else
2612 + local words
2613 fi
2614
2613 - local cur words cword prev
2615 + local cur cword prev
2616 _get_comp_words_by_ref -n =: cur words cword prev
2617 while [ $c -lt $cword ]; do
2618 i="${words[c]}"
@@ -2659,9 +2661,11 @@ _gitk ()
2661 if [[ -n ${ZSH_VERSION-} ]]; then
2662 emulate -L bash
2663 setopt KSH_TYPESET
2664 + else
2665 + local words
2666 fi
2667
2664 - local cur words cword prev
2668 + local cur cword prev
2669 _get_comp_words_by_ref -n =: cur words cword prev
2670
2671 __git_has_doubledash && return