stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Count merge commits in git when checking differences with tracking remote branch

Browse Source
This commit is contained in:
Panayiotis Kkolos 2014-03-08 23:38:50 +02:00 committed by Olivier Mengué
parent 0e0cc870c2
commit 7e7734e624
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
liquidprompt
View File

@ -762,14 +762,12 @@ _lp_git_branch_color()
local -i has_commit
has_commit=0
if [[ -n "$remote" ]] ; then
if [[ -n "$remote" ]]; then
local remote_branch
remote_branch="$(\git config --get branch.${branch}.merge)"
if [[ -n "$remote_branch" ]] ; then
has_commit="$(\git rev-list --no-merges --count ${remote_branch/refs\/heads/refs\/remotes\/$remote}..HEAD 2>/dev/null)"
if [[ -z "$has_commit" ]] ; then
has_commit=0
fi
if [[ -n "$remote_branch" ]]; then
has_commit="$(\git rev-list --count ${remote_branch/refs\/heads/refs\/remotes\/$remote}..HEAD 2>/dev/null)"
[[ -z "$has_commit" ]] && has_commit=0
fi
fi