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

Git prompt: Remove legacy option

Browse source 
Git has supported `rev-list --count` for years, so this shouldn't be
needed anymore.
This commit is contained in:
Fabian Homborg 2016-05-29 14:07:15 +02:00
parent 763c620d0b
commit 0882e0cb95
1 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
share/functions/__fish_git_prompt.fish
View file

@ -53,8 +53,6 @@
# 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 # 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
# of git-rev-list
# git always compare HEAD to @{upstream} # git always compare HEAD to @{upstream}
# svn always compare HEAD to your SVN upstream # svn always compare HEAD to your SVN upstream
# none disables (fish only, useful with show_informative_status) # none disables (fish only, useful with show_informative_status)
@ -178,7 +176,6 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
set -l svn_url_pattern set -l svn_url_pattern
set -l count set -l count
set -l upstream git set -l upstream git
set -l legacy
set -l verbose set -l verbose
set -l name set -l name
@ -222,9 +219,6 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
set -e informative set -e informative
case informative case informative
set informative 1 set informative 1
case legacy
set legacy 1
set -e informative
case name case name
set name 1 set name 1
case none case none
@ -279,20 +273,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
end end
# Find how many commits we are ahead/behind our upstream # Find how many commits we are ahead/behind our upstream
if test -z "$legacy" set count (command git rev-list --count --left-right $upstream...HEAD ^/dev/null)
set count (command git rev-list --count --left-right $upstream...HEAD ^/dev/null)
else
# produce equivalent output to --count for older versions of git
set -l os
set -l commits (command git rev-list --left-right $upstream...HEAD ^/dev/null; set os $status)
if test $os -eq 0
set -l behind (count (for arg in $commits; echo $arg; end | string match -r '^<'))
set -l ahead (count (for arg in $commits; echo $arg; end | string match -r -v '^<'))
set count "$behind $ahead"
else
set count
end
end
# calculate the result # calculate the result
if test -n "$verbose" if test -n "$verbose"