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

Fix showupstream behavior in __fish_git_prompt

Browse source 
The __fish_git_prompt_show_upstream helper function was inadvertently
looking at the misnamed variable __fish_git_prompt_show_upstream in some
cases, including when implementing the bash.showUpstream override.
Fixing the script to use __fish_git_prompt_showupstream triggered an
infinite loop because the --on-variable hook does not distinguish
between local and global variables.

Update the script to set a completely different local variable to
__fish_git_prompt_showupstream and to override this local variable for
bash.showUpstream.

Also update the code that looks at bash.showUpstream to also read
bash.showupstream, because the bash script appears to have a bug where
it looks for bash.showupstream despite documenting bash.showUpstream.
This commit is contained in:
Kevin Ballard 2012-07-26 15:32:27 -07:00
parent 62c49f13ce
commit b604321169
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
share/functions/__fish_git_prompt.fish
View file

@ -83,12 +83,12 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
set -l legacy
set -l verbose
set -l svn_url_pattern
set -l __fish_git_prompt_show_upstream $__fish_git_prompt_show_upstream
git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' ^/dev/null | tr '\0\n' '\n ' | while read -l key value
set -l show_upstream $__fish_git_prompt_showupstream
git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showUpstream)$' ^/dev/null | tr '\0\n' '\n ' | while read -l key value
switch $key
case bash.showUpstream
set __fish_git_prompt_show_upstream $value
test -n "$__fish_git_prompt_showupstream"; or return
case bash.showUpstream bash.showupstream
set show_upstream $value
test -n "$show_upstream"; or return
case svn-remote.'*'.url
set svn_remote $svn_remote $value
set -l remote_prefix (/bin/sh -c 'echo "${1%.url}"' -- $key)
@ -103,7 +103,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
end
# parse configuration variables
for option in $__fish_git_prompt_showupstream
for option in $show_upstream
switch $option
case git svn
set upstream $option