VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-10 22:11:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Older versions of cat-file do not accept --

Browse Source
This commit is contained in:
Tim Pope
2018-09-12 12:06:19 -04:00
parent d4fb2a2f5c
commit 144b73946e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/fugitive.vim
View File

@@ -885,7 +885,7 @@ function! fugitive#getfsize(url) abort
let entry = s:PathInfo(a:url) let entry = s:PathInfo(a:url)
if entry[4] == -2 && entry[2] ==# 'blob' && len(entry[3]) if entry[4] == -2 && entry[2] ==# 'blob' && len(entry[3])
let dir = s:DirCommitFile(a:url)[0] let dir = s:DirCommitFile(a:url)[0]
let size = +system(s:Prepare(dir, 'cat-file', '-s', entry[3], '--')) let size = +system(s:Prepare(dir, 'cat-file', '-s', entry[3]))
let entry[4] = v:shell_error ? -1 : size let entry[4] = v:shell_error ? -1 : size
endif endif
return entry[4] return entry[4]
@@ -977,7 +977,7 @@ function! s:BlobTemp(url) abort
endif endif
if commit =~# '^\d$' || !filereadable(tempfile) if commit =~# '^\d$' || !filereadable(tempfile)
let rev = s:DirRev(a:url)[1] let rev = s:DirRev(a:url)[1]
let command = s:Prepare(dir, 'cat-file', 'blob', rev, '--') let command = s:Prepare(dir, 'cat-file', 'blob', rev)
call s:TempCmd(tempfile, command) call s:TempCmd(tempfile, command)
if v:shell_error if v:shell_error
call delete(tempfile) call delete(tempfile)
@@ -1384,7 +1384,7 @@ function! fugitive#FileReadCmd(...) abort
if rev !~# ':' if rev !~# ':'
let cmd = s:Prepare(dir, 'log', '--pretty=format:%B', '-1', rev, '--') let cmd = s:Prepare(dir, 'log', '--pretty=format:%B', '-1', rev, '--')
else else
let cmd = s:Prepare(dir, 'cat-file', '-p', rev, '--') let cmd = s:Prepare(dir, 'cat-file', '-p', rev)
endif endif
return line . 'read !' . escape(cmd, '!#%') return line . 'read !' . escape(cmd, '!#%')
endfunction endfunction
@@ -1434,7 +1434,7 @@ function! fugitive#BufReadCmd(...) abort
if rev =~# '^:\d$' if rev =~# '^:\d$'
let b:fugitive_type = 'stage' let b:fugitive_type = 'stage'
else else
let b:fugitive_type = system(s:Prepare(dir, 'cat-file', '-t', rev, '--'))[0:-2] let b:fugitive_type = system(s:Prepare(dir, 'cat-file', '-t', rev))[0:-2]
if v:shell_error && rev =~# '^:0' if v:shell_error && rev =~# '^:0'
let sha = system(s:Prepare(dir, 'write-tree', '--prefix=' . rev[3:-1]))[0:-2] let sha = system(s:Prepare(dir, 'write-tree', '--prefix=' . rev[3:-1]))[0:-2]
let b:fugitive_type = 'tree' let b:fugitive_type = 'tree'