Archives/oh-my-fish_theme-bobthefish
1
0
Fork 0
mirror of https://github.com/oh-my-fish/theme-bobthefish.git synced 2024-10-27 20:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Switch "hide git master branch" logic from opt-in to opt-out

Browse Source 
This is a better default.
This commit is contained in:
Justin Hileman 2018-03-21 06:38:08 -07:00
parent e57a8f344c
commit 4ac7f3c5d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -72,6 +72,7 @@ set -g theme_display_git_dirty no
set -g theme_display_git_untracked no set -g theme_display_git_untracked no
set -g theme_display_git_ahead_verbose yes set -g theme_display_git_ahead_verbose yes
set -g theme_display_git_dirty_verbose yes set -g theme_display_git_dirty_verbose yes
set -g theme_display_git_master_branch yes
set -g theme_git_worktree_support yes set -g theme_git_worktree_support yes
set -g theme_display_vagrant yes set -g theme_display_vagrant yes
set -g theme_display_docker_machine no set -g theme_display_docker_machine no

4
fish_prompt.fish
View File

@ -22,7 +22,7 @@
# set -g theme_display_git_untracked no # set -g theme_display_git_untracked no
# set -g theme_display_git_ahead_verbose yes # set -g theme_display_git_ahead_verbose yes
# set -g theme_display_git_dirty_verbose yes # set -g theme_display_git_dirty_verbose yes
# set -g theme_display_git_master_branch no # set -g theme_display_git_master_branch yes
# set -g theme_git_worktree_support yes # set -g theme_git_worktree_support yes
# set -g theme_display_vagrant yes # set -g theme_display_vagrant yes
# set -g theme_display_docker_machine no # set -g theme_display_docker_machine no
@ -58,7 +58,7 @@ end
function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)' function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD ^/dev/null); and begin set -l ref (command git symbolic-ref HEAD ^/dev/null); and begin
[ "$theme_display_git_master_branch" = 'no' -a "$ref" = 'refs/heads/master' ] [ "$theme_display_git_master_branch" != 'yes' -a "$ref" = 'refs/heads/master' ]
and echo $__bobthefish_branch_glyph and echo $__bobthefish_branch_glyph
and return and return