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

_lp_git_branch: minor optimization

Browse Source
This commit is contained in:
Olivier Mengué 2013-08-20 20:09:26 +02:00
parent aeb0a6afed
commit bc4450e3ec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
liquidprompt
View File

@ -710,13 +710,15 @@ _lp_git_branch()
local gitdir local gitdir
gitdir="$([ $(\git ls-files . 2>/dev/null | wc -l) -gt 0 ] && \git rev-parse --git-dir 2>/dev/null)" gitdir="$([ $(\git ls-files . 2>/dev/null | wc -l) -gt 0 ] && \git rev-parse --git-dir 2>/dev/null)"
[[ $? -ne 0 || ! $gitdir =~ (.*\/)?\.git.* ]] && return [[ $? -ne 0 || ! $gitdir =~ (.*\/)?\.git.* ]] && return
local branch="$(\git symbolic-ref HEAD 2>/dev/null)" local branch
if [[ $? -ne 0 || -z "$branch" ]] ; then # Recent versions of Git support the --short option for symbolic-ref, but
# not 1.7.9 (Ubuntu 12.04)
if branch="$(\git symbolic-ref -q HEAD)"; then
_lp_escape "${branch#refs/heads/}"
else
# In detached head state, use commit instead # In detached head state, use commit instead
# No escape needed # No escape needed
\git rev-parse --short HEAD 2>/dev/null \git rev-parse --short -q HEAD
else
_lp_escape "${branch#refs/heads/}"
fi fi
} }