From 322dd5e05fe5cda5906a62fee419950a7ac0c454 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 27 Jul 2018 02:02:52 -0400
Subject: [PATCH] Make config file check more robust

---
 plugin/rhubarb.vim | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugin/rhubarb.vim b/plugin/rhubarb.vim
index 15584eb..e326e27 100644
--- a/plugin/rhubarb.vim
+++ b/plugin/rhubarb.vim
@@ -16,11 +16,16 @@ if get(g:, 'fugitive_git_command', 'git') ==# 'git' && executable('hub')
 endif
 
 function! s:config() abort
-  let common_dir = fugitive#buffer().repo().dir('commondir')
-  if filereadable(common_dir)
-    return fugitive#buffer().repo().dir(readfile(common_dir)[0] . '/config')
+  if exists('*FugitiveCommonDir')
+    let dir = FugitiveCommonDir()
+  else
+    let dir = get(b:, 'git_dir', '')
+    let common_dir = b:git_dir . '/commondir'
+    if filereadable(dir . '/commondir')
+      let dir .= '/' . readfile(common_dir)[0]
+    endif
   endif
-  return fugitive#buffer().repo().dir('config')
+  return filereadable(dir . '/config') ? readfile(dir . '/config') : []
 endfunction
 
 augroup rhubarb
@@ -29,7 +34,7 @@ augroup rhubarb
         \ if expand('%:p') =~# '\.git[\/].*MSG$' &&
         \   exists('+omnifunc') &&
         \   &omnifunc =~# '^\%(syntaxcomplete#Complete\)\=$' &&
-        \   !empty(filter(readfile(s:config()),
+        \   !empty(filter(s:config(),
         \     '!empty(rhubarb#homepage_for_url(matchstr(v:val, ''^\s*url\s*=\s*"\=\zs\S*'')))')) |
         \   setlocal omnifunc=rhubarb#omnifunc |
         \ endif