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

2013-04-22 20:35:35 +02:00 · 2013-04-22 20:35:35 +02:00 · 554c155afb
commit 554c155afb
parent d367976932 0c57f27bba
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -688,7 +688,7 @@ _lp_git_branch()
 {
    [[ "$LP_ENABLE_GIT" != 1 ]] && return
    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
    local branch="$(git symbolic-ref HEAD 2>/dev/null)"
    if [[ $? -ne 0 || -z "$branch" ]] ; then