Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

[bobthefish] much cleaner git "ahead" flag.

Browse Source
This commit is contained in:
Justin Hileman 2014-11-23 10:20:54 -08:00 committed by Bruno Pinto
parent b67fde9a33
commit 37a0679dda
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
themes/bobthefish/fish_prompt.fish
View File

@ -267,12 +267,11 @@ function __bobthefish_prompt_hg -d 'Display the actual hg state'
end end
end end
# TODO: clean up the fugly $ahead business
function __bobthefish_prompt_git -d 'Display the actual git state' function __bobthefish_prompt_git -d 'Display the actual git state'
set -l dirty (command git diff --no-ext-diff --quiet --exit-code; or echo -n '*') set -l dirty (command git diff --no-ext-diff --quiet --exit-code; or echo -n '*')
set -l staged (command git diff --cached --no-ext-diff --quiet --exit-code; or echo -n '~') set -l staged (command git diff --cached --no-ext-diff --quiet --exit-code; or echo -n '~')
set -l stashed (command git rev-parse --verify refs/stash > /dev/null 2>&1; and echo -n '$') set -l stashed (command git rev-parse --verify refs/stash > /dev/null 2>&1; and echo -n '$')
set -l ahead (command git branch -v 2> /dev/null | grep -Eo '^\* [^ ]* *[^ ]* *\[[^]]*\]' | grep -Eo '\[[^]]*\]$' | awk 'ORS="";/ahead/ {print "+"} /behind/ {print "-"}' | sed -e 's/+-/±/') set -l ahead (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 "±"; else if (a > 0) print "+"; else if (b > 0) print "-"}')
set -l new (command git ls-files --other --exclude-standard); set -l new (command git ls-files --other --exclude-standard);
test "$new"; and set new '…' test "$new"; and set new '…'