github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 22:26:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't assume $__fish_git_prompt_char_cleanstate is non-empty

Browse Source 
This fixes the case where an empty "clean state" character
can cause a spurious space character at the end of the git prompt.
This commit is contained in:
Shawn LeMaster 2020-11-08 23:08:24 -06:00 committed by Fabian Homborg
parent eed70d719a
commit e4b64448fa
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/functions/fish_git_prompt.fish
View File

@ -403,7 +403,10 @@ function fish_git_prompt --description "Prompt function for Git"
and test "$dirty" != false
and test "$untracked" != false
end
set informative_status "$space"(__fish_git_prompt_informative_status $git_dir)
set informative_status (__fish_git_prompt_informative_status $git_dir)
if test -n "$informative_status"
set informative_status "$space$informative_status"
end
else
# This has to be set explicitly.
if test "$dirty" = true
@ -533,7 +536,9 @@ function __fish_git_prompt_informative_status
set -l state (math $dirtystate + $invalidstate + $stagedstate + $untrackedfiles + $stashstate 2>/dev/null)
if test -z "$state"
or test "$state" = 0
set info $___fish_git_prompt_color_cleanstate$___fish_git_prompt_char_cleanstate$___fish_git_prompt_color_cleanstate_done
if test -n "$___fish_git_prompt_char_cleanstate"
set info $___fish_git_prompt_color_cleanstate$___fish_git_prompt_char_cleanstate$___fish_git_prompt_color_cleanstate_done
end
else
for i in $___fish_git_prompt_status_order
if [ $$i != 0 ]