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

[PATCH v3 22/29] completion: zsh: improve command tags

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 28, 2020, 02:07 UTC
Message-ID
<20201028020712.442623-23-felipe.contreras@gmail.com>
In-Reply-To
<20201028020712.442623-1-felipe.contreras@gmail.com>
There's no need to use _alternative and repeat a lot of the code.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 858864f3fb..22d8e58fcc 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -235,10 +235,13 @@ __git_zsh_main ()
 
 	case $state in
 	(command)
-		_alternative \
-                         'alias-commands:alias:__git_zsh_cmd_alias' \
-                         'common-commands:common:__git_zsh_cmd_common' \
-                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		_tags common-commands alias-commands all-commands
+		while _tags; do
+			_requested common-commands && __git_zsh_cmd_common
+			_requested alias-commands && __git_zsh_cmd_alias
+			_requested all-commands && __git_zsh_cmd_all
+			let _ret || break
+		done
 		;;
 	(arg)
 		local command="${words[1]}" __git_dir

-- 
2.29.1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 29 of 31 in “completion: zsh: latest patches”
  1. 00/29 completion: zsh: latest patchesFelipe Contreras, Oct 28, 2020
  2. 13/29 completion: zsh: add missing direct_appendFelipe Contreras, Oct 28, 2020
  3. 10/29 completion: bash: remove zsh wrapperFelipe Contreras, Oct 28, 2020
  4. 23/29 completion: zsh: add alias descriptionsFelipe Contreras, Oct 28, 2020
  5. 25/29 completion: zsh: add simple version checkFelipe Contreras, Oct 28, 2020
  6. 09/29 completion: bash: synchronize zsh wrapperFelipe Contreras, Oct 28, 2020
  7. 14/29 completion: zsh: fix splitting of wordsFelipe Contreras, Oct 28, 2020
  8. 29/29 Update copyright noticesFelipe Contreras, Oct 28, 2020
  9. 02/29 completion: zsh: fix name due to broken autoloadingFelipe Contreras, Oct 28, 2020
  10. 11/29 completion: zsh: fix completion for --no-.. optionsFelipe Contreras, Oct 28, 2020
  11. 12/29 completion: fix conflict with bashcompFelipe Contreras, Oct 28, 2020
  12. 17/29 completion: zsh: trivial cleanupFelipe Contreras, Oct 28, 2020
  13. 16/29 completion: zsh: simplify direct compaddFelipe Contreras, Oct 28, 2020
  14. 07/29 completion: prompt: fix color for ZshFelipe Contreras, Oct 28, 2020
  15. 28/29 completion: bash: remove old compat wrappersFelipe Contreras, Oct 28, 2020
  16. 01/29 completion: zsh: fix __gitcomp_direct()Felipe Contreras, Oct 28, 2020
  17. 20/29 completion: zsh: shuffle functions aroundFelipe Contreras, Oct 28, 2020
  18. 21/29 completion: zsh: refactor command completionFelipe Contreras, Oct 28, 2020
  19. 08/29 completion: zsh: fix for command aliasingFelipe Contreras, Oct 28, 2020
  20. 03/29 completion: zsh: fix bash script extensionFelipe Contreras, Oct 28, 2020
  21. 24/29 completion: zsh: trivial simplificationFelipe Contreras, Oct 28, 2020
  22. 18/29 completion: zsh: simplify nl_appendFelipe Contreras, Oct 28, 2020
  23. 27/29 completion: bash: cleanup cygwin checkFelipe Contreras, Oct 28, 2020
  24. 26/29 completion: bash: trivial cleanupFelipe Contreras, Oct 28, 2020
  25. 06/29 completion: zsh: update slave script locationsFelipe Contreras, Oct 28, 2020
  26. 05/29 completion: zsh: fix for directories with spacesFelipe Contreras, Oct 28, 2020
  27. 04/29 completion: zsh: reorganize install instructionsFelipe Contreras, Oct 28, 2020
  28. 15/29 completion: zsh: simplify compadd functionsFelipe Contreras, Oct 28, 2020
  29. 22/29 completion: zsh: improve command tagsFelipe Contreras, Oct 28, 2020
  30. 19/29 completion: zsh: simplify file_directFelipe Contreras, Oct 28, 2020
  31. Junio C HamanoOct 29, 2020

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.