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

[PATCH v2 08/29] completion: zsh: fix for command aliasing

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 25, 2020, 03:13 UTC
Message-ID
<20201025031343.346913-9-felipe.contreras@gmail.com>
In-Reply-To
<20201025031343.346913-1-felipe.contreras@gmail.com>

A lot of people want to define aliases like gc='git commit', and zsh allows that (when not using 'complete_aliases'), but we need to handle services that call a function other than the main one.

With this patch we can do:
  compdef _git gc=git_commit

Additionally, add compatibility for Zsh Git functions which have the form git-commit (with dash, not underscore).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index ba41525373..17041d0b23 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -240,8 +240,12 @@ _git ()
 
 	if (( $+functions[__${service}_zsh_main] )); then
 		__${service}_zsh_main
-	else
+	elif (( $+functions[__${service}_main] )); then
 		emulate ksh -c __${service}_main
+	elif (( $+functions[_${service}] )); then
+		emulate ksh -c _${service}
+	elif ((	$+functions[_${service//-/_}] )); then
+		emulate ksh -c _${service//-/_}
 	fi
 
 	let _ret && _default && _ret=0

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