github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-22 13:48:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #221 from oranja/alt-git_ahead

Browse Source 
git_ahead: Rewrite code, fix ahead being reported as behind
This commit is contained in:
Derek Willian Stavis 2016-01-19 11:58:02 -02:00
commit fd40ddb033
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/git/git_ahead.fish
View File

@ -1,15 +1,22 @@
function git_ahead -a ahead behind diverged none
git_is_repo; and begin
test -z "$ahead"; and set ahead "+"
test -z "$behind"; and set behind "-"
test -z "$diverged"; and set diverged "±"
test -z "$none"; and set none ""
command git rev-list --left-right "@{upstream}...HEAD" ^/dev/null \
| awk "/>/ {a += 1} /</ {b += 1} \
{if (a > 0) nextfile} END \
{if (a > 0 && b > 0) print \"$diverged\"; \
else if (a > 0) print \"$ahead\"; \
else if (b > 0) print \"$behind\";
else printf \"$none\"}"
not git_is_repo; and return
set -l commit_count (command git rev-list --count --left-right "@{upstream}...HEAD" ^/dev/null)
switch "$commit_count"
case ""
# no upstream
case "0"\t"0"
test -z "$ahead"; and echo "$ahead"
or echo ""
case "*"\t"0"
test -z "$behind"; and echo "$behind"
or echo "-"
case "0"\t"*"
test -z "$ahead"; and echo "$ahead"
or echo "+"
case "*"
test -z "$diverged"; and echo "$diverged"
or echo "±"
end
end