diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-19 23:10:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 23:10:10 (GMT) |
| commit | df43b41afcc9bf5e4b8751dc9a53b068b33f52a8 (patch) | |
| tree | d4cfa3e6743445805364bbe13fa36138a48e4185 /t | |
| parent | 7dde48ea7aa18de1174628e21510967b0ad71d7c (diff) | |
| parent | 1e4119c81b3e203e1729e03be6e4a53eb9207f5c (diff) | |
| download | git-df43b41afcc9bf5e4b8751dc9a53b068b33f52a8.zip git-df43b41afcc9bf5e4b8751dc9a53b068b33f52a8.tar.gz git-df43b41afcc9bf5e4b8751dc9a53b068b33f52a8.tar.bz2 | |
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
* 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 6efd0d9..9150984 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" ' |