Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

git_prompt: optionally show upstream branch name

Browse source 
Adds a "name" option to __fish_git_prompt_showupstream that shows an
abbreviated branch name when the upstream type is verbose.

Based on git.git 1f6806c: git-prompt.sh: optionally show upstream
branch name
This commit is contained in:
Brian Gernhardt 2013-10-21 12:08:43 -04:00
parent fd25a6425c
commit b652920500
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
share/functions/__fish_git_prompt.fish
View file

@ -51,6 +51,7 @@
# __fish_git_prompt_showupstream to a space-separated list of values: # __fish_git_prompt_showupstream to a space-separated list of values:
# #
# verbose show number of commits ahead/behind (+/-) upstream # verbose show number of commits ahead/behind (+/-) upstream
# name if verbose, then also show the upstream abbrev name
# informative similar to verbose, but shows nothing when equal (fish only) # informative similar to verbose, but shows nothing when equal (fish only)
# legacy don't use the '--count' option available in recent versions # legacy don't use the '--count' option available in recent versions
# of git-rev-list # of git-rev-list
@ -178,6 +179,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
set -l upstream git set -l upstream git
set -l legacy set -l legacy
set -l verbose set -l verbose
set -l name
# Default to informative if show_informative_status is set # Default to informative if show_informative_status is set
if test -n "$__fish_git_prompt_show_informative_status" if test -n "$__fish_git_prompt_show_informative_status"
@ -222,6 +224,8 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
case legacy case legacy
set legacy 1 set legacy 1
set -e informative set -e informative
case name
set name 1
case none case none
return return
end end
@ -303,6 +307,9 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
case '*' # diverged from upstream 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$ahead-$behind"
end end
if test -n "$count" -a -n "$name"
echo " "(command git rev-parse --abbrev-ref "$upstream" ^/dev/null)
end
else if test -n "$informative" else if test -n "$informative"
echo $count | read -l behind ahead echo $count | read -l behind ahead
switch "$count" switch "$count"