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>

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index d9ce5e1742e8436b829400a999e57fe22712d651..1ef02f936c73d52816670510bb83b4370e25052e 100644 (file)
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -100,9 +100,8 @@ __gitcomp_direct ()
 {
        emulate -L zsh
 
-       local IFS=$'\n'
        compset -P '*[=:]'
-       compadd -Q -- ${${=1}% } && _ret=0
+       compadd -Q -- ${${(f)1}% } && _ret=0
 }
 
 __gitcomp_direct_append ()
@@ -114,34 +113,30 @@ __gitcomp_nl ()
 {
        emulate -L zsh
 
-       local IFS=$'\n'
        compset -P '*[=:]'
-       compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+       compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
 __gitcomp_nl_append ()
 {
        emulate -L zsh
 
-       local IFS=$'\n'
        compset -P '*[=:]'
-       compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+       compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
 __gitcomp_file_direct ()
 {
        emulate -L zsh
 
-       local IFS=$'\n'
-       compadd -f -- ${=1} && _ret=0
+       compadd -f -- ${(f)1} && _ret=0
 }
 
 __gitcomp_file ()
 {
        emulate -L zsh
 
-       local IFS=$'\n'
-       compadd -p "${2-}" -f -- ${=1} && _ret=0
+       compadd -p "${2-}" -f -- ${(f)1} && _ret=0
 }
 
 __git_zsh_bash_func ()