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] Standardize stderr redirects.

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

10
themes/bobthefish/fish_prompt.fish
View File

@ -76,9 +76,9 @@ set __bobthefish_lt_brown BF5E00
# end
function __bobthefish_git_branch -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD 2> /dev/null)
set -l ref (command git symbolic-ref HEAD ^/dev/null)
if [ $status -gt 0 ]
set -l branch (command git show-ref --head -s --abbrev |head -n1 2> /dev/null)
set -l branch (command git show-ref --head -s --abbrev | head -n1 ^/dev/null)
set ref "$__bobthefish_detached_glyph $branch"
end
echo $ref | sed "s-refs/heads/-$__bobthefish_branch_glyph -"
@ -95,11 +95,11 @@ function __bobthefish_pretty_parent -d 'Print a parent directory, shortened to f
end
function __bobthefish_git_project_dir -d 'Print the current git project base directory'
command git rev-parse --show-toplevel 2>/dev/null
command git rev-parse --show-toplevel ^/dev/null
end
function __bobthefish_hg_project_dir -d 'Print the current hg project base directory'
command hg root 2>/dev/null
command hg root ^/dev/null
end
function __bobthefish_project_pwd -d 'Print the working directory relative to project root'
@ -270,7 +270,7 @@ end
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 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 --quiet refs/stash >/dev/null; and echo -n '$')
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);