From f0946baeaaf75abcad3e0f7db939e98881560d18 Mon Sep 17 00:00:00 2001 From: David Adam Date: Mon, 2 Dec 2013 20:09:15 +0800 Subject: __fish_git_prompt: initialise colors early Otherwise __fish_git_prompt_informative_status tries to expand an unset variable. Closes #1157. --- share/functions/__fish_git_prompt.fish | 3 +-- 1 file changed, 1 insertion(+), 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" -- cgit v1.2.3