aboutsummaryrefslogtreecommitdiffhomepage
path: root/share
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2013-12-02 20:09:15 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2013-12-02 20:09:15 +0800
commitf0946baeaaf75abcad3e0f7db939e98881560d18 (patch)
treef4894da976af1fa5ef824e68ade248d8bb90c04e /share
parent7db755dd68f3e8091460f51aad19f845dbb7b982 (diff)
__fish_git_prompt: initialise colors early
Otherwise __fish_git_prompt_informative_status tries to expand an unset variable. Closes #1157.
Diffstat (limited to 'share')
-rw-r--r--share/functions/__fish_git_prompt.fish3
1 files changed, 1 insertions, 2 deletions
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish
index ba59c5fa..0619a097 100644
--- a/share/functions/__fish_git_prompt.fish
+++ b/share/functions/__fish_git_prompt.fish
@@ -371,6 +371,7 @@ function __fish_git_prompt --description "Prompt function for Git"
set -l informative_status
__fish_git_prompt_validate_chars
+ __fish_git_prompt_validate_colors
if test "true" = $inside_worktree
if test -n "$__fish_git_prompt_show_informative_status"
@@ -403,8 +404,6 @@ function __fish_git_prompt --description "Prompt function for Git"
end
end
- __fish_git_prompt_validate_colors
-
set -l branch_color $___fish_git_prompt_color_branch
set -l branch_done $___fish_git_prompt_color_branch_done
if test -n "$__fish_git_prompt_showcolorhints"