|
@@ -54,11 +54,19 @@ git_remote_status() {
|
|
|
|
|
|
# Checks if there are commits ahead from remote
|
|
|
function git_prompt_ahead() {
|
|
|
- if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
|
|
+ if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
|
|
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
+# Gets the number of commits ahead from remote
|
|
|
+function git_commits_ahead() {
|
|
|
+ if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
|
|
|
+ COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
|
|
|
+ echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
|
|
|
+ fi
|
|
|
+}
|
|
|
+
|
|
|
# Formats prompt string for current git commit short SHA
|
|
|
function git_prompt_short_sha() {
|
|
|
SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
|