From 1e4119c81b3e203e1729e03be6e4a53eb9207f5c Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Mon, 19 May 2014 18:55:37 -0400 Subject: git-prompt.sh: don't assume the shell expands the value of PS1 Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500 ("git-prompt.sh: don't put unsanitized branch names in $PS1"): zsh does not expand PS1 by default, but that commit assumed it did. The bug resulted in prompts containing the literal string '${__git_ps1_branch_name}' instead of the actual branch name. Reported-by: Caleb Thompson Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano --- t/t9903-bash-prompt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't') diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 6efd0d9c78..9150984184 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -578,12 +578,12 @@ test_expect_success 'prompt - bash color pc mode - untracked files status indica ' test_expect_success 'prompt - zsh color pc mode' ' - printf "BEFORE: (%%F{green}\${__git_ps1_branch_name}%%f):AFTER\\nmaster" >expected && + printf "BEFORE: (%%F{green}master%%f):AFTER" >expected && ( ZSH_VERSION=5.0.0 && GIT_PS1_SHOWCOLORHINTS=y && - __git_ps1 "BEFORE:" ":AFTER" >"$actual" - printf "%s\\n%s" "$PS1" "${__git_ps1_branch_name}" >"$actual" + __git_ps1 "BEFORE:" ":AFTER" && + printf "%s" "$PS1" >"$actual" ) && test_cmp expected "$actual" ' -- cgit v1.2.3