git-prompt.sh: do not print duplicate clean color code
Do not print a duplicate clean color code when there is no other indicators other than the current branch in colored prompt. Acked-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Eduardo R. D'Avila <erdavila@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
f3bd62d02f
commit
15981f4eec
|
@ -253,8 +253,8 @@ __git_ps1_colorize_gitstring ()
|
||||||
branch_color="$bad_color"
|
branch_color="$bad_color"
|
||||||
fi
|
fi
|
||||||
c="$branch_color$c"
|
c="$branch_color$c"
|
||||||
b="$b$c_clear"
|
|
||||||
|
|
||||||
|
z="$c_clear$z"
|
||||||
if [ "$w" = "*" ]; then
|
if [ "$w" = "*" ]; then
|
||||||
w="$bad_color$w"
|
w="$bad_color$w"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -551,7 +551,7 @@ test_expect_success 'prompt - pc mode' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - branch name' '
|
test_expect_success 'prompt - bash color pc mode - branch name' '
|
||||||
printf "BEFORE: (${c_green}master${c_clear}${c_clear}):AFTER" >expected &&
|
printf "BEFORE: (${c_green}master${c_clear}):AFTER" >expected &&
|
||||||
(
|
(
|
||||||
GIT_PS1_SHOWCOLORHINTS=y &&
|
GIT_PS1_SHOWCOLORHINTS=y &&
|
||||||
__git_ps1 "BEFORE:" ":AFTER" >"$actual"
|
__git_ps1 "BEFORE:" ":AFTER" >"$actual"
|
||||||
|
@ -561,7 +561,7 @@ test_expect_success 'prompt - bash color pc mode - branch name' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - detached head' '
|
test_expect_success 'prompt - bash color pc mode - detached head' '
|
||||||
printf "BEFORE: (${c_red}(%s...)${c_clear}${c_clear}):AFTER" $(git log -1 --format="%h" b1^) >expected &&
|
printf "BEFORE: (${c_red}(%s...)${c_clear}):AFTER" $(git log -1 --format="%h" b1^) >expected &&
|
||||||
git checkout b1^ &&
|
git checkout b1^ &&
|
||||||
test_when_finished "git checkout master" &&
|
test_when_finished "git checkout master" &&
|
||||||
(
|
(
|
||||||
|
@ -627,7 +627,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - befo
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - inside .git directory' '
|
test_expect_success 'prompt - bash color pc mode - inside .git directory' '
|
||||||
printf "BEFORE: (${c_green}GIT_DIR!${c_clear}${c_clear}):AFTER" >expected &&
|
printf "BEFORE: (${c_green}GIT_DIR!${c_clear}):AFTER" >expected &&
|
||||||
echo "dirty" >file &&
|
echo "dirty" >file &&
|
||||||
test_when_finished "git reset --hard" &&
|
test_when_finished "git reset --hard" &&
|
||||||
(
|
(
|
||||||
|
@ -666,7 +666,7 @@ test_expect_success 'prompt - bash color pc mode - untracked files status indica
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - zsh color pc mode' '
|
test_expect_success 'prompt - zsh color pc mode' '
|
||||||
printf "BEFORE: (%%F{green}master%%f%%f):AFTER" >expected &&
|
printf "BEFORE: (%%F{green}master%%f):AFTER" >expected &&
|
||||||
(
|
(
|
||||||
ZSH_VERSION=5.0.0 &&
|
ZSH_VERSION=5.0.0 &&
|
||||||
GIT_PS1_SHOWCOLORHINTS=y &&
|
GIT_PS1_SHOWCOLORHINTS=y &&
|
||||||
|
|
Loading…
Reference in New Issue