diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-28 15:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-28 15:46:36 -0700 |
| commit | 12188a82990da099e2f3cf3d37aa4e0362122478 (patch) | |
| tree | 5755d7852670ac63c51298c4d35aa6893d64aeb3 /t | |
| parent | 64d8c31ebe25496c3e5b10b7786a6c4d2a21e15c (diff) | |
| parent | 1e4119c81b3e203e1729e03be6e4a53eb9207f5c (diff) | |
| download | git-12188a82990da099e2f3cf3d37aa4e0362122478.tar.gz git-12188a82990da099e2f3cf3d37aa4e0362122478.tar.xz | |
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint
* rh/prompt-pcmode-avoid-eval-on-refname:
git-prompt.sh: don't assume the shell expands the value of PS1
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 6efd0d9c7..915098418 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" ' |