Merge branch 'jc/mktree' into sb/opt-filename

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ba13c4948cffe9df31d2d6d5a223a29e23b4817a..0c8bb536c84f04627e78f251f51aea11b2048ce5 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -132,7 +132,7 @@ __git_ps1 ()
                local c
 
                if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
-                       if [ "true" = "$(git config --bool core.bare 2>/dev/null)" ]; then
+                       if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
                                c="BARE:"
                        else
                                b="GIT_DIR!"