mirror of
https://github.com/git/git
synced 2024-09-20 17:01:35 +00:00
git-prompt: fix expansion of branch colour codes
Because of the wrapping of the branch name variable $b, the colour codes in the variable don't get applied, but are instead printed directly in the output. Move the wrapping of $b to before colour codes are inserted to correct this. Revert move of branch name colour codes in tests, as the branch name is now coloured after the wrapping instead of before. Signed-off-by: Joakim Petersen <joak-pet@online.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9470605a1b
commit
0e5d9ef395
|
@ -556,9 +556,14 @@ __git_ps1 ()
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
b=${b##refs/heads/}
|
|
||||||
local z="${GIT_PS1_STATESEPARATOR-" "}"
|
local z="${GIT_PS1_STATESEPARATOR-" "}"
|
||||||
|
|
||||||
|
b=${b##refs/heads/}
|
||||||
|
if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
|
||||||
|
__git_ps1_branch_name=$b
|
||||||
|
b="\${__git_ps1_branch_name}"
|
||||||
|
fi
|
||||||
|
|
||||||
# NO color option unless in PROMPT_COMMAND mode or it's Zsh
|
# NO color option unless in PROMPT_COMMAND mode or it's Zsh
|
||||||
if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
|
if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
|
||||||
if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
|
if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
|
||||||
|
@ -566,11 +571,6 @@ __git_ps1 ()
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
|
|
||||||
__git_ps1_branch_name=$b
|
|
||||||
b="\${__git_ps1_branch_name}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local f="$h$w$i$s$u$p"
|
local f="$h$w$i$s$u$p"
|
||||||
local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
|
local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
|
||||||
|
|
||||||
|
|
|
@ -541,7 +541,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: (\${__git_ps1_branch_name}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmain" >expected &&
|
||||||
(
|
(
|
||||||
GIT_PS1_SHOWCOLORHINTS=y &&
|
GIT_PS1_SHOWCOLORHINTS=y &&
|
||||||
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
|
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
|
||||||
|
@ -551,7 +551,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: (\${__git_ps1_branch_name}):AFTER\\n${c_red}(%s...)"${c_clear} $(git log -1 --format="%h" b1^) >expected &&
|
printf "BEFORE: (${c_red}\${__git_ps1_branch_name}${c_clear}):AFTER\\n(%s...)" $(git log -1 --format="%h" b1^) >expected &&
|
||||||
git checkout b1^ &&
|
git checkout b1^ &&
|
||||||
test_when_finished "git checkout main" &&
|
test_when_finished "git checkout main" &&
|
||||||
(
|
(
|
||||||
|
@ -563,7 +563,7 @@ test_expect_success 'prompt - bash color pc mode - detached head' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' '
|
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_red}*${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmain" >expected &&
|
||||||
echo "dirty" >file &&
|
echo "dirty" >file &&
|
||||||
test_when_finished "git reset --hard" &&
|
test_when_finished "git reset --hard" &&
|
||||||
(
|
(
|
||||||
|
@ -576,7 +576,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' '
|
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_green}+${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmain" >expected &&
|
||||||
echo "dirty" >file &&
|
echo "dirty" >file &&
|
||||||
test_when_finished "git reset --hard" &&
|
test_when_finished "git reset --hard" &&
|
||||||
git add -u &&
|
git add -u &&
|
||||||
|
@ -590,7 +590,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
|
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_red}*${c_clear}${c_green}+${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}${c_green}+${c_clear}):AFTER\\nmain" >expected &&
|
||||||
echo "dirty index" >file &&
|
echo "dirty index" >file &&
|
||||||
test_when_finished "git reset --hard" &&
|
test_when_finished "git reset --hard" &&
|
||||||
git add -u &&
|
git add -u &&
|
||||||
|
@ -605,7 +605,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' '
|
test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_green}#${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmain" >expected &&
|
||||||
(
|
(
|
||||||
GIT_PS1_SHOWDIRTYSTATE=y &&
|
GIT_PS1_SHOWDIRTYSTATE=y &&
|
||||||
GIT_PS1_SHOWCOLORHINTS=y &&
|
GIT_PS1_SHOWCOLORHINTS=y &&
|
||||||
|
@ -617,7 +617,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: (\${__git_ps1_branch_name}):AFTER\\n${c_green}GIT_DIR!${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nGIT_DIR!" >expected &&
|
||||||
echo "dirty" >file &&
|
echo "dirty" >file &&
|
||||||
test_when_finished "git reset --hard" &&
|
test_when_finished "git reset --hard" &&
|
||||||
(
|
(
|
||||||
|
@ -631,7 +631,7 @@ test_expect_success 'prompt - bash color pc mode - inside .git directory' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - stash status indicator' '
|
test_expect_success 'prompt - bash color pc mode - stash status indicator' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_lblue}\$${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmain" >expected &&
|
||||||
echo 2 >file &&
|
echo 2 >file &&
|
||||||
git stash &&
|
git stash &&
|
||||||
test_when_finished "git stash drop" &&
|
test_when_finished "git stash drop" &&
|
||||||
|
@ -645,7 +645,7 @@ test_expect_success 'prompt - bash color pc mode - stash status indicator' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'prompt - bash color pc mode - untracked files status indicator' '
|
test_expect_success 'prompt - bash color pc mode - untracked files status indicator' '
|
||||||
printf "BEFORE: (\${__git_ps1_branch_name} ${c_red}%%${c_clear}):AFTER\\n${c_green}main${c_clear}" >expected &&
|
printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmain" >expected &&
|
||||||
(
|
(
|
||||||
GIT_PS1_SHOWUNTRACKEDFILES=y &&
|
GIT_PS1_SHOWUNTRACKEDFILES=y &&
|
||||||
GIT_PS1_SHOWCOLORHINTS=y &&
|
GIT_PS1_SHOWCOLORHINTS=y &&
|
||||||
|
|
Loading…
Reference in a new issue