diff options
| author |  Kevin Ballard <kevin@sb.org> | 2014-03-26 10:22:12 -0700 |
|---|---|---|
| committer |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-03-31 09:59:41 -0700 |
| commit | fe3b439e31ce893d9345112e95a031aa5ec11183 (patch) | |
| tree | 35ff3c5563f64bfec51c4639d8ef831ca6135314 /share/functions/__fish_git_prompt.fish | |
| parent | 6c987d6708d90ecad89363251750b2c43c52f480 (diff) | |
Fix non-verbose, non-informative __fish_git_prompt
At some point the non-verbose, non-informative variant of the prompt
(e.g. the variant that looks like the bash prompt) was modified to try
and show the behind/ahead counts the same way the informative prompt
does. Besides being wrong, it also didn't work because behind/ahead
weren't defined.
Diffstat (limited to 'share/functions/__fish_git_prompt.fish')
| -rw-r--r-- | share/functions/__fish_git_prompt.fish | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 0619a097..bc08871c 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -336,11 +336,11 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi case "0 0" # equal to upstream echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_equal" case "0 *" # ahead of upstream - echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_ahead$ahead" + echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_ahead" case "* 0" # behind upstream - echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_behind$behind" + echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_behind" case '*' # diverged from upstream - echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_diverged$ahead-$behind" + echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_diverged" end end end |