git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 06/11] completion: zsh: trivial cleanups

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 20, 2016, 04:58 UTC
Message-ID
<1463720325-8853-7-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1463720325-8853-1-git-send-email-felipe.contreras@gmail.com>

We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f).

Also, we don't need to split files by ':' or '='; that's only for words.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.zsh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index e10df7d..317b8eb 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -65,26 +65,22 @@ __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'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
 __gitcomp_file ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -Q -p "${2-}" -f -- ${(f)1} && _ret=0
 }
 
 __git_zsh_bash_func ()
-- 
2.8.0+fc1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 7 of 12 in “Completion fixes and improvements”
  1. 00/11 Completion fixes and improvementsFelipe Contreras, May 20, 2016
  2. 01/11 completion: add missing fetch optionsFelipe Contreras, May 20, 2016
  3. 02/11 completion: bash: remove old wrappersFelipe Contreras, May 20, 2016
  4. 03/11 completion: bash: remove zsh wrapperFelipe Contreras, May 20, 2016
  5. 04/11 completion: zsh: don't hide ourselvesFelipe Contreras, May 20, 2016
  6. 05/11 completion: remove zsh hackFelipe Contreras, May 20, 2016
  7. 06/11 completion: zsh: trivial cleanupsFelipe Contreras, May 20, 2016
  8. 07/11 completion: bash: cleanup cygwin checkFelipe Contreras, May 20, 2016
  9. 08/11 completion: zsh: improve main function selectionFelipe Contreras, May 20, 2016
  10. 09/11 completion: zsh: fix for directories with spacesFelipe Contreras, May 20, 2016
  11. 10/11 completion: prompt: fix for ZshFelipe Contreras, May 20, 2016
  12. 11/11 Revert "Update documentation occurrences of filename .sh"Felipe Contreras, May 20, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.