completion: zsh: fix __gitcomp_direct()

felipec · gitster · commit 4ce2b5167bb6 · 2020-10-26T15:23:26.000-07:00
Many callers append a space suffix, but zsh automatically appends a
space, making the completion add two spaces, for example:

  git log ma&lt;tab&gt;

Will complete 'master  '.

Let's remove that extra space.

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.bash b/contrib/completion/git-completion.bash
@@ -3498,7 +3498,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -Q -- ${=1} && _ret=0
+		compadd -Q -- ${${=1}% } && _ret=0
 	}
 
 	__gitcomp_nl ()
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
@@ -74,7 +74,7 @@ __gitcomp_direct ()
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -- ${=1} && _ret=0
+	compadd -Q -- ${${=1}% } && _ret=0
 }
 
 __gitcomp_nl ()

Original file line number	Diff line number	Diff line change
`@@ -3498,7 +3498,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&`
`3498`	`3498`
`3499`	`3499`	`local IFS=$'\n'`
`3500`	`3500`	`compset -P '*[=:]'`
`3501`		`- compadd -Q -- ${=1} && _ret=0`
	`3501`	`+ compadd -Q -- ${${=1}% } && _ret=0`
`3502`	`3502`	`}`
`3503`	`3503`
`3504`	`3504`	`__gitcomp_nl ()`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ __gitcomp_direct ()`
`74`	`74`
`75`	`75`	`local IFS=$'\n'`
`76`	`76`	`compset -P '*[=:]'`
`77`		`- compadd -Q -- ${=1} && _ret=0`
	`77`	`+ compadd -Q -- ${${=1}% } && _ret=0`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`__gitcomp_nl ()`