Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
O
oh-my-fish
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
oh-my-fish
Commits
83f5e52a
Commit
83f5e52a
authored
Nov 23, 2014
by
Justin Hileman
Committed by
Bruno Pinto
Nov 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bobthefish] Standardize stderr redirects.
parent
37a0679d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
themes/bobthefish/fish_prompt.fish
themes/bobthefish/fish_prompt.fish
+5
-5
No files found.
themes/bobthefish/fish_prompt.fish
View file @
83f5e52a
...
...
@@ -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);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment