completion: zsh: fix splitting of words

felipec · gitster · commit 94b2901cfe23 · 2020-10-28T14:30:59.000-07:00
Files don't need to be split by '=:', words do.

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
@@ -124,6 +124,7 @@ __gitcomp_nl_append ()
 	emulate -L zsh
 
 	local IFS=$'\n'
+	compset -P '*[=:]'
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
@@ -132,7 +133,6 @@ __gitcomp_file_direct ()
 	emulate -L zsh
 
 	local IFS=$'\n'
-	compset -P '*[=:]'
 	compadd -f -- ${=1} && _ret=0
 }
 
@@ -141,7 +141,6 @@ __gitcomp_file ()
 	emulate -L zsh
 
 	local IFS=$'\n'
-	compset -P '*[=:]'
 	compadd -p "${2-}" -f -- ${=1} && _ret=0
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ __gitcomp_nl_append ()`
`124`	`124`	`emulate -L zsh`
`125`	`125`
`126`	`126`	`local IFS=$'\n'`
	`127`	`+ compset -P '*[=:]'`
`127`	`128`	`compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0`
`128`	`129`	`}`
`129`	`130`
`@@ -132,7 +133,6 @@ __gitcomp_file_direct ()`
`132`	`133`	`emulate -L zsh`
`133`	`134`
`134`	`135`	`local IFS=$'\n'`
`135`		`- compset -P '*[=:]'`
`136`	`136`	`compadd -f -- ${=1} && _ret=0`
`137`	`137`	`}`
`138`	`138`
`@@ -141,7 +141,6 @@ __gitcomp_file ()`
`141`	`141`	`emulate -L zsh`
`142`	`142`
`143`	`143`	`local IFS=$'\n'`
`144`		`- compset -P '*[=:]'`
`145`	`144`	`compadd -p "${2-}" -f -- ${=1} && _ret=0`
`146`	`145`	`}`
`147`	`146`