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

[PATCH v3 07/29] completion: prompt: fix color for Zsh

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 28, 2020, 02:06 UTC
Message-ID
<20201028020712.442623-8-felipe.contreras@gmail.com>
In-Reply-To
<20201028020712.442623-1-felipe.contreras@gmail.com>

We don't need PROMPT_COMMAND in Zsh; we are already using %F{color} %f, which in turn use %{ and %}, which are the equivalent of Bash's \[ and \].

We can use as many colors as we want and output directly into PS1 (or RPS1) without the risk of buffer wrapping issues.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-prompt.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 16260bab73..54e123d632 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -97,7 +97,8 @@
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
 # the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
+# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
+# but always available in Zsh.
 #
 # If you would like __git_ps1 to do nothing in the case when the current
 # directory is set up to be ignored by git, then set
@@ -553,9 +554,11 @@ __git_ps1 ()
 
 	local z="${GIT_PS1_STATESEPARATOR-" "}"
 
-	# NO color option unless in PROMPT_COMMAND mode
-	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		__git_ps1_colorize_gitstring
+	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
+	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
+			__git_ps1_colorize_gitstring
+		fi
 	fi
 
 	b=${b##refs/heads/}

-- 
2.29.1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 14 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.