completion: zsh: simplify compadd functions
We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f). Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Oct 27, 2020 at 20:06 UTC
2f459b0060948299be4bfa00c21f574140dcbe63
1 file changed
+5
-10
contrib/completion/git-completion.zsh
+5
-10
@@ -100,9 +100,8 @@ __gitcomp_direct ()
100
{
101
emulate -L zsh
102
103
- local IFS=$'\n'
103
compset -P '*[=:]'
105
- compadd -Q -- ${${=1}% } && _ret=0
104
+ compadd -Q -- ${${(f)1}% } && _ret=0
105
}
106
107
__gitcomp_direct_append ()
@@ -114,34 +113,30 @@ __gitcomp_nl ()
113
{
114
emulate -L zsh
115
117
- local IFS=$'\n'
116
compset -P '*[=:]'
119
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
117
+ compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
118
}
119
120
__gitcomp_nl_append ()
121
{
122
emulate -L zsh
123
126
- local IFS=$'\n'
124
compset -P '*[=:]'
128
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
125
+ compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
126
}
127
128
__gitcomp_file_direct ()
129
{
130
emulate -L zsh
131
135
- local IFS=$'\n'
136
- compadd -f -- ${=1} && _ret=0
132
+ compadd -f -- ${(f)1} && _ret=0
133
}
134
135
__gitcomp_file ()
136
{
137
emulate -L zsh
138
143
- local IFS=$'\n'
144
- compadd -p "${2-}" -f -- ${=1} && _ret=0
139
+ compadd -p "${2-}" -f -- ${(f)1} && _ret=0
140
}
141
142
__git_zsh_bash_func ()