From 78cac07d3cd2a1064d92bd0cf7f1d29ccdeed9a1 Mon Sep 17 00:00:00 2001 From: Maximilien Mellen Date: Fri, 3 Aug 2018 16:06:56 +0200 Subject: [PATCH] Fix Informative VCS sample prompt invalid state The Informative VCS sample prompt currently sets the `__fish_git_prompt_char_conflictedstate` variable which is unused. It should instead set the `__fish_git_prompt_char_invalidstate` variable. --- share/tools/web_config/sample_prompts/informative_vcs.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish index ac46c4496..c643d8b96 100644 --- a/share/tools/web_config/sample_prompts/informative_vcs.fish +++ b/share/tools/web_config/sample_prompts/informative_vcs.fish @@ -38,8 +38,8 @@ function fish_prompt --description 'Write out the prompt' if not set -q __fish_git_prompt_char_untrackedfiles set -g __fish_git_prompt_char_untrackedfiles "…" end - if not set -q __fish_git_prompt_char_conflictedstate - set -g __fish_git_prompt_char_conflictedstate "✖" + if not set -q __fish_git_prompt_char_invalidstate + set -g __fish_git_prompt_char_invalidstate "✖" end if not set -q __fish_git_prompt_char_cleanstate set -g __fish_git_prompt_char_cleanstate "✔"