vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix trailing slash issues

Browse Source
This commit is contained in:
Tim Pope 2010-09-09 11:51:04 -04:00
parent 64ead8ea1c
commit 882597d17e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/fugitive.vim
View File

@ -398,7 +398,7 @@ function! s:buffer_path(...) dict abort
else else
let rev = self.spec()[strlen(self.repo().tree()) : -1] let rev = self.spec()[strlen(self.repo().tree()) : -1]
endif endif
return s:sub(rev,'^/',a:0 ? a:1 : '') return s:sub(s:sub(rev,'.\zs/$',''),'^/',a:0 ? a:1 : '')
endfunction endfunction
function! s:buffer_rev() dict abort function! s:buffer_rev() dict abort
@ -437,7 +437,7 @@ function! s:buffer_expand(rev) dict abort
else else
let file = a:rev let file = a:rev
endif endif
return s:sub(file,'\%$',self.path()) return s:sub(s:sub(file,'\%$',self.path()),'/$','')
endfunction endfunction
function! s:buffer_containing_commit() dict abort function! s:buffer_containing_commit() dict abort
@ -1602,9 +1602,9 @@ function! s:GF(mode) abort
if showtree && line('.') == 1 if showtree && line('.') == 1
return "" return ""
elseif showtree && line('.') > 2 elseif showtree && line('.') > 2
return s:Edit(a:mode,buffer.commit().':'.(buffer.path() == '' ? '' : buffer.path().'/').s:sub(getline('.'),'/$','')) return s:Edit(a:mode,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$',''))
elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t' elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t'
return s:Edit(a:mode,buffer.commit().':'.(buffer.path() == '' ? '' : buffer.path().'/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')) return s:Edit(a:mode,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$',''))
endif endif
elseif buffer.type('blob') elseif buffer.type('blob')