diff options
| author |  Vladimir Rudnyh <rudnyh@corp.mail.ru> | 2015-07-12 06:58:52 +0300 |
|---|---|---|
| committer |  ridiculousfish <corydoras@ridiculousfish.com> | 2015-07-12 14:53:52 -0700 |
| commit | d49f6e1b29a7124133531a9f562cdc2a27922d8e (patch) | |
| tree | fb25ffe6655fe72c482db1b25bd3c3c4b3cf65b1 /share/functions/__fish_git_prompt.fish | |
| parent | 1e32f9431db86db6b34693a76a7fa2d80320df84 (diff) | |
__fish_git_prompt: fix stateseparator color in informative_status
In informative_status mode stateseparator did not use
fish_git_prompt_color settings.
Diffstat (limited to 'share/functions/__fish_git_prompt.fish')
| -rw-r--r-- | share/functions/__fish_git_prompt.fish | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 0117894f..dc3f1112 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -2,7 +2,7 @@ # # Written by Kevin Ballard <kevin@sb.org> # Updated by Brian Gernhardt <brian@gernhardtsoftware.com> -# +# # This is heavily based off of the git-prompt.bash script that ships with # git, which is Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>. # The act of porting the code, along with any new code, are Copyright (C) 2012 @@ -373,9 +373,11 @@ function __fish_git_prompt --description "Prompt function for Git" __fish_git_prompt_validate_chars __fish_git_prompt_validate_colors + set -l space "$___fish_git_prompt_color$___fish_git_prompt_char_stateseparator$___fish_git_prompt_color_done" + if test "true" = $inside_worktree if test -n "$__fish_git_prompt_show_informative_status" - set informative_status "$___fish_git_prompt_char_stateseparator"(__fish_git_prompt_informative_status) + set informative_status "$space"(__fish_git_prompt_informative_status) else if test -n "$__fish_git_prompt_showdirtystate" set -l config (command git config --bool bash.showDirtyState) @@ -440,7 +442,6 @@ function __fish_git_prompt --description "Prompt function for Git" end # Formatting - set -l space "$___fish_git_prompt_color$___fish_git_prompt_char_stateseparator$___fish_git_prompt_color_done" set -l f "$w$i$s$u" if test -n "$f" set f "$space$f" |