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

Merge branch 'git-untracked-dir' of https://github.com/jab416171/liquidprompt into develop

Browse Source
This commit is contained in:
nojhan 2013-04-22 20:35:35 +02:00
commit 554c155afb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liquidprompt
View File

@ -688,7 +688,7 @@ _lp_git_branch()
{ {
[[ "$LP_ENABLE_GIT" != 1 ]] && return [[ "$LP_ENABLE_GIT" != 1 ]] && return
local gitdir local gitdir
gitdir="$(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="$(git symbolic-ref HEAD 2>/dev/null)"
if [[ $? -ne 0 || -z "$branch" ]] ; then if [[ $? -ne 0 || -z "$branch" ]] ; then