X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4605cb5190771d1a93e164e525f202efb62e3875..bccff5a0e15cd16d28cfb5e0d9fc2b0c4687e55d:/zsh/lib/prompt.zsh diff --git a/zsh/lib/prompt.zsh b/zsh/lib/prompt.zsh index 56d702b..fa894be 100644 --- a/zsh/lib/prompt.zsh +++ b/zsh/lib/prompt.zsh @@ -51,6 +51,7 @@ git_prompt_status() { if [[ "$line" == \#\ * ]]; then [[ "$line" =~ '# branch.oid ([0-9a-f]+)' ]] && oid=$match[1] [[ "$line" =~ '# branch.head (.*)' ]] && head=$match[1] + [[ "$line" =~ '# branch.upstream (.*)' ]] && upstream=$match[1] [[ "$line" =~ '# branch.ab \+([0-9]+) -([0-9]+)' ]] && ahead=$match[1] && behind=$match[2] else # Count added, deleted, modified, renamed, unmerged, untracked, dirty. @@ -69,6 +70,8 @@ git_prompt_status() { # merge conflicts [[ "$line" == u\ (AA|DD|U?|?U)\ * ]] && (( unmerged++ )) + + #TODO more info for submodules? fi done < <(${(z)status_cmd} 2> /dev/null) @@ -79,6 +82,7 @@ git_prompt_status() { # Format upstream local upstream_str + [[ -z "$upstream" ]] && upstream_str+="%{$fg[blue]%} Ɇ" (( ahead > 0 )) && upstream_str+="%{$fg[blue]%} >$ahead" (( behind > 0 )) && upstream_str+="%{$fg[blue]%} <$behind" git_status+="$upstream_str"