motiejus/dotfiles

commit a615172b14c130401f64d73fc86ed0fa632aa032 (tree)
parent caee67c7483e6d958595f7c38e925a4542b57c99
Author: Tim Pope <code@tpope.net>
Date:   Thu,  2 Aug 2018 18:22:19 -0400

Edit index file when no work tree present

Life gets simpler if this function never fails.

Diffstat:
M
autoload/fugitive.vim
 | 
20
+++++++++-----------

1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -329,14 +329,12 @@ function! s:repo_bare() dict abort
   endif
 endfunction
 
-function! s:repo_translate(spec, ...) dict abort
-  let rev = substitute(a:spec, '//\+', '/', 'g')
-  let rev = substitute(rev, '[:/]\zs\.\%(/\|$\)', '', 'g')
+function! s:repo_translate(object, ...) dict abort
+  let rev = substitute(a:object, '[:/]\zs\.\%(/\+\|$\)', '', 'g')
   let dir = self.git_dir
   let tree = s:Tree(dir)
-  if rev ==# '.'
-    let f = empty(tree) ? dir : tree
-  elseif rev =~# '^/\=\.git$' && empty(tree)
+  let base = len(tree) ? tree : 'fugitive://' . dir . '//0'
+  if rev =~# '^/\=\.git$' && empty(tree)
     let f = dir
   elseif rev =~# '^/\=\.git/'
     let f = s:sub(rev, '^/=\.git', '')
@@ -346,10 +344,10 @@ function! s:repo_translate(spec, ...) dict abort
     else
       let f = dir . f
     endif
-  elseif empty(rev) || rev ==# '/.'
-    return self.tree()
-  elseif rev =~# '^\.\=/'
-    let f = self.tree(substitute(rev, '^\.\=/', '', ''))
+  elseif rev ==# '^/\=\.$'
+    return base
+  elseif rev =~# '^\.\=\%(/\|$\)'
+    let f = base . substitute(rev, '^\.', '', '')
   elseif rev =~# '^:[0-3]:/\@!'
     let f = 'fugitive://' . dir . '//' . rev[1] . '/' . rev[3:-1]
   elseif rev ==# ':'
@@ -377,7 +375,7 @@ function! s:repo_translate(spec, ...) dict abort
       if len(commit)
         let f = 'fugitive://' . dir . '//' . commit . file
       else
-        let f = self.tree(rev)
+        let f = base . '/' . rev
       endif
     endif
   endif