From 4ce8646410939f6b19c11e3a632ca9977d160a9e Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 27 Jul 2018 01:30:41 -0400
Subject: [PATCH] Remove s:repo().aliases()

---
 autoload/fugitive.vim | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index a408153..30a1a1c 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -488,17 +488,7 @@ function! s:repo_user() dict abort
   return username.' <'.useremail.'>'
 endfunction
 
-function! s:repo_aliases() dict abort
-  if !has_key(self,'_aliases')
-    let self._aliases = {}
-    for line in split(self.git_chomp('config','-z','--get-regexp','^alias[.]'),"\1")
-      let self._aliases[matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*')
-    endfor
-  endif
-  return self._aliases
-endfunction
-
-call s:add_methods('repo',['config', 'user', 'aliases'])
+call s:add_methods('repo',['config', 'user'])
 
 " Section: Buffer
 
@@ -935,17 +925,31 @@ function! s:Git(bang, mods, args) abort
   endif
 endfunction
 
+let s:exec_paths = {}
 function! s:Subcommands() abort
-  if !exists('s:exec_path')
-    let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
+  if !has_key(s:exec_paths, g:fugitive_git_executable)
+    let s:exec_paths[g:fugitive_git_executable] = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
   endif
-  return map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")')
+  let exec_path = s:exec_paths[g:fugitive_git_executable]
+  return map(split(glob(exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(exec_path)+5 : -1],"\\.exe$","")')
+endfunction
+
+let s:aliases = {}
+function! s:Aliases() abort
+  if !has_key(s:aliases, b:git_dir)
+    let s:aliases[b:git_dir] = {}
+    let lines = split(s:TreeChomp('config','-z','--get-regexp','^alias[.]'),"\1")
+    for line in v:shell_error ? [] : lines
+      let s:aliases[b:git_dir][matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*')
+    endfor
+  endif
+  return s:aliases[b:git_dir]
 endfunction
 
 function! s:GitComplete(A, L, P) abort
   if strpart(a:L, 0, a:P) !~# ' [[:alnum:]-]\+ '
     let cmds = s:Subcommands()
-    return filter(sort(cmds+keys(s:repo().aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A')
+    return filter(sort(cmds+keys(s:Aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A')
   else
     return s:repo().superglob(a:A)
   endif