summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-20 18:59:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-20 18:59:09 -0700
commit065b0702f748b50e69d67609ace2632ce04b79a1 (patch)
tree6a78474d618eb083713429dc064c1c8e07e6382c /contrib/completion/git-completion.bash
parentExtend sample pre-commit hook to check for non ascii filenames (diff)
parentgrep: fix word-regexp colouring (diff)
downloadtgif-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/completion/git-completion.bash')
-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 ba13c4948c..0c8bb536c8 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!"