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

[PATCH 10/11] completion: prompt: fix for Zsh

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 20, 2016, 04:58 UTC
Message-ID
<1463720325-8853-11-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1463720325-8853-1-git-send-email-felipe.contreras@gmail.com>
We can add colour in Zsh without the need of pcmode.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-prompt.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 64219e6..0da14ee 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -502,9 +502,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.8.0+fc1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 11 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.