Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix var name in __fish_git_prompt

Browse source 
Var `___git_ps_color_suffix_done` is supposed to be
`___fish_git_prompt_color_suffix_done`. This bug was found by an
experimental change to detect the use of undefined variables (#4163).

Similarly, we should simply test whether `__fish_git_prompt_showcolorhints`
is set rather than set to a non-empty string.
This commit is contained in:
Kurtis Rader 2017-07-02 15:08:30 -07:00
parent 85b42b22f4
commit ea38519a12
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
share/functions/__fish_git_prompt.fish
View file

@ -73,7 +73,7 @@
# default exactly matching tag # default exactly matching tag
# #
# If you would like a colored hint about the current dirty state, set # If you would like a colored hint about the current dirty state, set
# __fish_git_prompt_showcolorhints to a nonempty value. The default colors are # __fish_git_prompt_showcolorhints. The default colors are
# based on the colored output of "git status -sb" # based on the colored output of "git status -sb"
@ -169,6 +169,8 @@
# flags Defaults to --bold blue # flags Defaults to --bold blue
function __fish_git_prompt_show_upstream --description "Helper function for __fish_git_prompt" function __fish_git_prompt_show_upstream --description "Helper function for __fish_git_prompt"
set -q __fish_git_prompt_showupstream
or set -l __fish_git_prompt_showupstream
set -l show_upstream $__fish_git_prompt_showupstream set -l show_upstream $__fish_git_prompt_showupstream
set -l svn_prefix # For better SVN upstream information set -l svn_prefix # For better SVN upstream information
set -l informative set -l informative
@ -180,7 +182,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
set -l name set -l name
# Default to informative if __fish_git_prompt_show_informative_status is set # Default to informative if __fish_git_prompt_show_informative_status is set
if test -n "$__fish_git_prompt_show_informative_status" if set -q __fish_git_prompt_show_informative_status
set informative 1 set informative 1
end end
@ -362,10 +364,10 @@ function __fish_git_prompt --description "Prompt function for Git"
set -l space "$___fish_git_prompt_color$___fish_git_prompt_char_stateseparator$___fish_git_prompt_color_done" set -l space "$___fish_git_prompt_color$___fish_git_prompt_char_stateseparator$___fish_git_prompt_color_done"
if test "true" = $inside_worktree if test "true" = $inside_worktree
if test -n "$__fish_git_prompt_show_informative_status" if set -q __fish_git_prompt_show_informative_status
set informative_status "$space"(__fish_git_prompt_informative_status) set informative_status "$space"(__fish_git_prompt_informative_status)
else else
if test -n "$__fish_git_prompt_showdirtystate" if set -q __fish_git_prompt_showdirtystate
set -l config (command git config --bool bash.showDirtyState) set -l config (command git config --bool bash.showDirtyState)
if test "$config" != "false" if test "$config" != "false"
set w (__fish_git_prompt_dirty) set w (__fish_git_prompt_dirty)
@ -373,11 +375,12 @@ function __fish_git_prompt --description "Prompt function for Git"
end end
end end
if test -n "$__fish_git_prompt_showstashstate" -a -r $git_dir/refs/stash if set -q __fish_git_prompt_showstashstate
and test -r $git_dir/refs/stash
set s $___fish_git_prompt_char_stashstate set s $___fish_git_prompt_char_stashstate
end end
if test -n "$__fish_git_prompt_showuntrackedfiles" if set -q __fish_git_prompt_showuntrackedfiles
set -l config (command git config --bool bash.showUntrackedFiles) set -l config (command git config --bool bash.showUntrackedFiles)
if test "$config" != false if test "$config" != false
if command git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null ^/dev/null if command git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null ^/dev/null
@ -387,14 +390,15 @@ function __fish_git_prompt --description "Prompt function for Git"
end end
end end
if test -n "$__fish_git_prompt_showupstream" -o "$__fish_git_prompt_show_informative_status" if set -q __fish_git_prompt_showupstream
or set -q __fish_git_prompt_show_informative_status
set p (__fish_git_prompt_show_upstream) set p (__fish_git_prompt_show_upstream)
end end
end end
set -l branch_color $___fish_git_prompt_color_branch set -l branch_color $___fish_git_prompt_color_branch
set -l branch_done $___fish_git_prompt_color_branch_done set -l branch_done $___fish_git_prompt_color_branch_done
if test -n "$__fish_git_prompt_showcolorhints" if set -q __fish_git_prompt_showcolorhints
if test $detached = yes if test $detached = yes
set branch_color $___fish_git_prompt_color_branch_detached set branch_color $___fish_git_prompt_color_branch_detached
set branch_done $___fish_git_prompt_color_branch_detached_done set branch_done $___fish_git_prompt_color_branch_detached_done
@ -437,7 +441,7 @@ function __fish_git_prompt --description "Prompt function for Git"
set format " (%s)" set format " (%s)"
end end
printf "%s$format%s" "$___fish_git_prompt_color_prefix" "$___fish_git_prompt_color_prefix_done$c$b$f$r$p$informative_status$___fish_git_prompt_color_suffix" "$___git_ps_color_suffix_done" printf "%s$format%s" "$___fish_git_prompt_color_prefix" "$___fish_git_prompt_color_prefix_done$c$b$f$r$p$informative_status$___fish_git_prompt_color_suffix" "$___fish_git_prompt_color_suffix_done"
end end
### helper functions ### helper functions
@ -611,12 +615,14 @@ end
function __fish_git_prompt_set_char function __fish_git_prompt_set_char
set -l user_variable_name "$argv[1]" set -l user_variable_name "$argv[1]"
set -l char $argv[2] set -l char $argv[2]
set -l user_variable $$user_variable_name set -l user_variable
if set -q $user_variable_name
set user_variable $$user_variable_name
end
if test (count $argv) -ge 3 if set -q argv[3]
if test -n "$__fish_git_prompt_show_informative_status" and set -q __fish_git_prompt_show_informative_status
set char $argv[3] set char $argv[3]
end
end end
set -l variable _$user_variable_name set -l variable _$user_variable_name
@ -646,7 +652,10 @@ end
function __fish_git_prompt_set_color function __fish_git_prompt_set_color
set -l user_variable_name "$argv[1]" set -l user_variable_name "$argv[1]"
set -l user_variable $$user_variable_name set -l user_variable
if set -q $user_variable_name
set user_variable $$user_variable_name
end
set -l user_variable_bright set -l user_variable_bright
set -l default default_done set -l default default_done
@ -693,7 +702,7 @@ function __fish_git_prompt_validate_colors --description "__fish_git_prompt help
__fish_git_prompt_set_color __fish_git_prompt_color_upstream __fish_git_prompt_set_color __fish_git_prompt_color_upstream
# Colors with defaults with showcolorhints # Colors with defaults with showcolorhints
if test -n "$__fish_git_prompt_showcolorhints" if set -q __fish_git_prompt_showcolorhints
__fish_git_prompt_set_color __fish_git_prompt_color_flags (set_color --bold blue) __fish_git_prompt_set_color __fish_git_prompt_color_flags (set_color --bold blue)
__fish_git_prompt_set_color __fish_git_prompt_color_branch (set_color green) __fish_git_prompt_set_color __fish_git_prompt_color_branch (set_color green)
__fish_git_prompt_set_color __fish_git_prompt_color_dirtystate (set_color red) __fish_git_prompt_set_color __fish_git_prompt_color_dirtystate (set_color red)