Compare commits

..

No commits in common. "a2b0771c286a8bf8119e9a700c4ac732da63fc2d" and "67b2f6ed2528620153abb6658030d89c699b86dc" have entirely different histories.

1 changed files with 9 additions and 10 deletions

View File

@ -13,8 +13,7 @@ function my_gitstatus_prompt_update() {
[[ "$VCS_STATUS_RESULT" == ok-sync ]] || return 0 # not a git repo [[ "$VCS_STATUS_RESULT" == ok-sync ]] || return 0 # not a git repo
local reset=$'\001\e[0m\002' # no color local reset=$'\001\e[0m\002' # no color
local bright_green=$'\001\e[01;32m\002' # bright green - branch name (matches hostname) local bright_white=$'\001\e[1;37m\002' # bright white - branch name and modified/untracked
local bright_white=$'\001\e[1;37m\002' # bright white - modified/untracked
local red=$'\001\e[38;5;196m\002' # red - urgent attention (conflicts, merge) local red=$'\001\e[38;5;196m\002' # red - urgent attention (conflicts, merge)
local p local p
@ -33,17 +32,17 @@ function my_gitstatus_prompt_update() {
# Truncate long branch names and tags # Truncate long branch names and tags
(( ${#where} > 32 )) && where="${where:0:12}${where: -12}" (( ${#where} > 32 )) && where="${where:0:12}${where: -12}"
p+="${bright_green}${where}" p+="${bright_white}${where}"
# Remote tracking status (bright white - important sync info) # Remote tracking status (no color - less distracting)
(( VCS_STATUS_COMMITS_BEHIND )) && p+=" ${bright_white}behind:${VCS_STATUS_COMMITS_BEHIND}" (( VCS_STATUS_COMMITS_BEHIND )) && p+=" ${reset}behind:${VCS_STATUS_COMMITS_BEHIND}"
(( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && p+=" " (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && p+=" "
(( VCS_STATUS_COMMITS_AHEAD )) && p+="${bright_white}ahead:${VCS_STATUS_COMMITS_AHEAD}" (( VCS_STATUS_COMMITS_AHEAD )) && p+="${reset}ahead:${VCS_STATUS_COMMITS_AHEAD}"
# Push remote status (bright white - important sync info) # Push remote status (no color - less distracting)
(( VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" ${bright_white}push-behind:${VCS_STATUS_PUSH_COMMITS_BEHIND}" (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" ${reset}push-behind:${VCS_STATUS_PUSH_COMMITS_BEHIND}"
(( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" " (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && p+=" "
(( VCS_STATUS_PUSH_COMMITS_AHEAD )) && p+="${bright_white}push-ahead:${VCS_STATUS_PUSH_COMMITS_AHEAD}" (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && p+="${reset}push-ahead:${VCS_STATUS_PUSH_COMMITS_AHEAD}"
# CUSTOM: Stashes with "stash:" prefix instead of "*" # CUSTOM: Stashes with "stash:" prefix instead of "*"
(( VCS_STATUS_STASHES )) && p+=" ${reset}stashed:${VCS_STATUS_STASHES}" (( VCS_STATUS_STASHES )) && p+=" ${reset}stashed:${VCS_STATUS_STASHES}"