completion: zsh: simplify compadd functions

felipec · gitster · commit 2f459b006094 · 2020-10-28T14:30:59.000-07:00
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 &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 ()

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,8 @@ __gitcomp_direct ()`
`100`	`100`	`{`
`101`	`101`	`emulate -L zsh`
`102`	`102`
`103`		`- local IFS=$'\n'`
`104`	`103`	`compset -P '*[=:]'`
`105`		`- compadd -Q -- ${${=1}% } && _ret=0`
	`104`	`+ compadd -Q -- ${${(f)1}% } && _ret=0`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`__gitcomp_direct_append ()`
`@@ -114,34 +113,30 @@ __gitcomp_nl ()`
`114`	`113`	`{`
`115`	`114`	`emulate -L zsh`
`116`	`115`
`117`		`- local IFS=$'\n'`
`118`	`116`	`compset -P '*[=:]'`
`119`		`- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0`
	`117`	`+ compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0`
`120`	`118`	`}`
`121`	`119`
`122`	`120`	`__gitcomp_nl_append ()`
`123`	`121`	`{`
`124`	`122`	`emulate -L zsh`
`125`	`123`
`126`		`- local IFS=$'\n'`
`127`	`124`	`compset -P '*[=:]'`
`128`		`- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0`
	`125`	`+ compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0`
`129`	`126`	`}`
`130`	`127`
`131`	`128`	`__gitcomp_file_direct ()`
`132`	`129`	`{`
`133`	`130`	`emulate -L zsh`
`134`	`131`
`135`		`- local IFS=$'\n'`
`136`		`- compadd -f -- ${=1} && _ret=0`
	`132`	`+ compadd -f -- ${(f)1} && _ret=0`
`137`	`133`	`}`
`138`	`134`
`139`	`135`	`__gitcomp_file ()`
`140`	`136`	`{`
`141`	`137`	`emulate -L zsh`
`142`	`138`
`143`		`- local IFS=$'\n'`
`144`		`- compadd -p "${2-}" -f -- ${=1} && _ret=0`
	`139`	`+ compadd -p "${2-}" -f -- ${(f)1} && _ret=0`
`145`	`140`	`}`
`146`	`141`
`147`	`142`	`__git_zsh_bash_func ()`