linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the agnoster git branch status added in #7209 optional

Browse source
This commit is contained in:
Stephen Gelman 2024-06-13 19:44:57 -05:00
parent 51d999651d
commit fbccfe80fd
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
themes/agnoster.zsh-theme
View file

@ -80,6 +80,8 @@ esac
: ${AGNOSTER_STATUS_RETVAL_NUMERIC:=false} : ${AGNOSTER_STATUS_RETVAL_NUMERIC:=false}
# Show git working dir in the style "/git/root   master  relative/dir" instead of "/git/root/relative/dir   master" # Show git working dir in the style "/git/root   master  relative/dir" instead of "/git/root/relative/dir   master"
: ${AGNOSTER_GIT_INLINE:=false} : ${AGNOSTER_GIT_INLINE:=false}
# Show the git branch status in the prompt rather than the generic branch symbol
: ${AGNOSTER_GIT_BRANCH_STATUS:=true}
# Special Powerline characters # Special Powerline characters
@ -181,15 +183,17 @@ prompt_git() {
prompt_segment "$AGNOSTER_GIT_CLEAN_BG" "$AGNOSTER_GIT_CLEAN_FG" prompt_segment "$AGNOSTER_GIT_CLEAN_BG" "$AGNOSTER_GIT_CLEAN_FG"
fi fi
local ahead behind if [[ $AGNOSTER_GIT_BRANCH_STATUS == 'true' ]]; then
ahead=$(command git log --oneline @{upstream}.. 2>/dev/null) local ahead behind
behind=$(command git log --oneline ..@{upstream} 2>/dev/null) ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
PL_BRANCH_CHAR=$'\u21c5' if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
elif [[ -n "$ahead" ]]; then PL_BRANCH_CHAR=$'\u21c5'
PL_BRANCH_CHAR=$'\u21b1' elif [[ -n "$ahead" ]]; then
elif [[ -n "$behind" ]]; then PL_BRANCH_CHAR=$'\u21b1'
PL_BRANCH_CHAR=$'\u21b0' elif [[ -n "$behind" ]]; then
PL_BRANCH_CHAR=$'\u21b0'
fi
fi fi
if [[ -e "${repo_path}/BISECT_LOG" ]]; then if [[ -e "${repo_path}/BISECT_LOG" ]]; then