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

support git bare repositories

Browse Source
This commit is contained in:
Frederic Lepied 2012-08-20 14:36:12 +02:00
parent 05defce9d2
commit 1d3b935bb1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
liquidprompt
View File

@ -555,7 +555,8 @@ _lp_git_branch()
{
[[ "$LP_ENABLE_GIT" != 1 ]] && return
if git rev-parse --git-dir >/dev/null 2>&1 && [[ ! -z "$(git branch)" ]] ; then
topdir="$(git rev-parse --git-dir 2>/dev/null)"
if [[ -n "$topdir" ]] && [[ "$(basename $topdir)" == '.git' ]] && [[ ! -z "$(git branch)" ]] ; then
echo -n "$(git branch 2>/dev/null | sed -n '/^\*/s/^\* //p;')"
fi
}
@ -597,7 +598,7 @@ _lp_git_branch_color()
fi
if [[ "$GD" -eq 1 || "$GDC" -eq "1" ]] ; then
local has_line
has_lines=$(git diff --numstat | awk 'NF==3 {plus+=$1; minus+=$2} END {printf("+%d/-%d\n", plus, minus)}')
has_lines=$(git diff --numstat 2>/dev/null | awk 'NF==3 {plus+=$1; minus+=$2} END {printf("+%d/-%d\n", plus, minus)}')
if [[ "$has_commit" -gt "0" ]] ; then
# Changes to commit and commits to push
ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$has_lines${NO_COL},${LP_COLOR_COMMITS}$has_commit${NO_COL})${LP_COLOR_CHANGES}${has_untracked}${NO_COL}"