From 4ac7f3c5d7ff9f75546c8382297622345e819ea6 Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Wed, 21 Mar 2018 06:38:08 -0700 Subject: [PATCH] Switch "hide git master branch" logic from opt-in to opt-out This is a better default. --- README.md | 1 + fish_prompt.fish | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad042b8..db0de0f 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ set -g theme_display_git_dirty no set -g theme_display_git_untracked no set -g theme_display_git_ahead_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_display_vagrant yes set -g theme_display_docker_machine no diff --git a/fish_prompt.fish b/fish_prompt.fish index 040c5c6..fd09763 100644 --- a/fish_prompt.fish +++ b/fish_prompt.fish @@ -22,7 +22,7 @@ # set -g theme_display_git_untracked no # set -g theme_display_git_ahead_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_display_vagrant yes # 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)' 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 return