aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-20 18:59:09 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-20 18:59:09 -0700
commit065b0702f748b50e69d67609ace2632ce04b79a1 (patch)
tree6a78474d618eb083713429dc064c1c8e07e6382c /contrib
parentd00e364de99d51bb76e437820e23cfa820417ec5 (diff)
parente701fadb9e0e51a6811690d95a53bd1f5b6fad86 (diff)
downloadgit-065b0702f748b50e69d67609ace2632ce04b79a1.tar.gz
git-065b0702f748b50e69d67609ace2632ce04b79a1.tar.xz
Merge branch 'maint'
* maint: grep: fix word-regexp colouring completion: use git rev-parse to detect bare repos Cope better with a _lot_ of packs for-each-ref: fix segfault in copy_email
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ba13c4948..0c8bb536c 100755
--- 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!"